X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=blobdiff_plain;f=Makefile;h=20c6cc76c344a0188236619f82aa19ee8a148cdb;hp=5595c50a784a51d8a6cc05d3d190c92dd9be86f7;hb=90ba8cf67b9fd2abcb3f640d8dbd876f95e8cdd0;hpb=802fe47e6fa83b0b6639aaf54a8e75f1869b54c8

diff --git a/Makefile b/Makefile
index 5595c50..20c6cc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,29 @@
-RELEASE=2.1
-
 PACKAGE=vncterm
-VERSION=1.0
-PACKAGERELEASE=3
+# Note: also change version in debian/control and debian/changelog
+VERSION=1.4
+PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
-VNCVER=0.9.7
-VNCDIR=LibVNCServer-${VNCVER}
-VNCSRC=${VNCDIR}.tar.gz
+VNCVER=0.9.11
+VNCREL=LibVNCServer-${VNCVER}
+VNCDIR=libvncserver-${VNCREL}
+VNCSRC=${VNCREL}.tar.gz
 VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 
 TIGERVNCSRC=tigervnc-1.1.0.tgz
+#TIGERVNCSRC=tigervnc-1.2.0.tgz
 
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
 
-KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/proxmox-java.keystore
+KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/comodo-for-java.keystore
 
 all: vncterm
 
 glyphs.h: genfont
-	./genfont > glyphs.h
+	./genfont > glyphs.h.tmp
+	mv glyphs.h.tmp glyphs.h
 
 genfont: genfont.c
 	gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
@@ -32,25 +34,31 @@ ${VNCLIB} vnc: ${VNCSRC}
 	tar xf ${VNCSRC}
 	ln -s ../vncpatches ${VNCDIR}/patches
 	cd ${VNCDIR}; quilt push -a
-	cd ${VNCDIR}; ./configure; 
+	cd ${VNCDIR}; ./autogen.sh --without-ssl --without-websockets --without-tightvnc-filetransfer;
 	cd ${VNCDIR}; make
 
 vncterm: vncterm.c glyphs.h ${VNCLIB}
-	gcc -O2 -g -o $@ vncterm.c -Wall -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
+	gcc -O2 -g -o $@ vncterm.c -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls -lpng
 
 jar: tigervnc.org
+	if test ! -f /usr/share/icedtea-web/plugin.jar; then echo "please install package icedtea-netx-common"; exit 1; fi
 	rm -rf tigervnc VncViewer.jar
 	rsync -av --exclude .svn --exclude .svnignore  tigervnc.org/ tigervnc
 	ln -s ../tigerpatches tigervnc/patches
 	cd tigervnc; quilt push -a
 	cd tigervnc/java/src/com/tigervnc/vncviewer; make clean; make
-	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.jar proxmox
+	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.jar "dc475d72-124a-11e4-a53f-005056c00008"
+
+# this is for version 1.2
+#	ln -s ../newtigerpatches tigervnc/patches
+#	cd tigervnc/java;cmake -G "Unix Makefiles"; make
+#	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/VncViewer.jar proxmox
 
 tigervnc.org: ${TIGERVNCSRC}
 	rm -rf tigervnc.org
 	tar xf ${TIGERVNCSRC}
 
-downlaod:
+download:
 	rm -rf tigervnc.org
 	svn co https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/tags/1_1_0 tigervnc.org 
 	tar cf ${TIGERVNCSRC} tigervnc.org
@@ -73,7 +81,8 @@ vncterm.1: vncterm.pod
 	pod2man -n $< -s 1 -r ${VERSION} <$< >$@
 
 .PHONY: deb
-${DEB} deb:
+deb: $(DEB)
+${DEB}:
 	make clean
 	rm -rf dest
 	mkdir dest
@@ -85,26 +94,20 @@ ${DEB} deb:
 	install -m 0644 copyright dest/usr/share/doc/${PACKAGE}
 	install -m 0644 vncterm.1 dest/usr/share/man/man1
 	install -m 0644 debian/changelog.Debian dest/usr/share/doc/${PACKAGE}
-	gzip --best dest/usr/share/man/*/*
-	gzip --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
-	dpkg-deb --build dest
+	gzip -n --best dest/usr/share/man/*/*
+	gzip -n --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
+	fakeroot dpkg-deb --build dest
 	mv dest.deb ${DEB}
 	rm -rf dest
 	lintian ${DEB}	
 
 .PHONY: upload
 upload: ${DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist stretch
 
 .PHONY: clean
 clean:
-	rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz
+	rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
 
 .PHONY: distclean
 distclean: clean
@@ -118,4 +121,4 @@ ${SNAP} dist: distclean
 
 .PHONY: uploaddist
 uploaddist: ${SNAP}
-	scp ${SNAP} pve.proxmox.com:/home/ftp/sources/
\ No newline at end of file
+	scp ${SNAP} pve.proxmox.com:/home/ftp/sources/