X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=46573b6f5d070c1ba6ab8bf26535713abda3a08c;hb=e6dc4ff34675b17aa63949987a0a7c66796cfab3;hp=0db018634780f84efee4211b642812c82d35cec6;hpb=8dee83616b588867113a45187db15532e9886948;p=pve-http-server.git

diff --git a/Makefile b/Makefile
index 0db0186..46573b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,11 @@
+include /usr/share/dpkg/pkg-info.mk
+
 PACKAGE=libpve-http-server-perl
-PKGVER=1.0
-PKGREL=3
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
+GITVERSION:=$(shell git rev-parse HEAD)
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
 DESTDIR=
 
@@ -15,7 +18,7 @@ WWWFONTSDIR=${WWWBASEDIR}/fonts
 WWWJSDIR=${WWWBASEDIR}/js
 
 # bootstrap library
-BTVER=3.3.7
+BTVER=3.4.1
 BTDIR=bootstrap-${BTVER}-dist
 BTSRC=${BTDIR}.zip
 
@@ -25,16 +28,18 @@ BTDATA = 							\
 	${BTDIR}/js/bootstrap.min.js				\
 	${BTDIR}/fonts/glyphicons-halflings-regular.ttf
 
-JQVER=3.3.1
+JQVER=3.4.1
 JQSRC=jquery-${JQVER}.min.js
 
 all:
 
 .PHONY: deb
-deb ${DEB}:
-	rm -rf build
-	rsync -a * build
-	cd build; dpkg-buildpackage -b -us -uc
+deb: ${DEB}
+${DEB}:
+	rm -rf ${BUILDDIR}
+	rsync -a * ${BUILDDIR}
+	echo "git clone git://git.proxmox.com/git/pve-http-server\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
+	cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
 download_bootstrap:
@@ -44,18 +49,19 @@ download_bootstrap:
 
 download_jquery:
 	rm -f ${JQSRC} ${JQSRC}.tmp
-	wget https://code.jquery.com/jquery-3.1.1.min.js -O ${JQSRC}.tmp
+	wget https://code.jquery.com/jquery-${JQVER}.min.js -O ${JQSRC}.tmp
 	mv ${JQSRC}.tmp ${JQSRC}
 
-${BTDATA}: ${BTSRC}
+${BTDATA}: ${BTDIR}
+${BTDIR}: ${BTSRC}
 	rm -rf ${BTDIR}
 	unzip -x ${BTSRC}
-	touch $@
 
 install: ${BTDATA}
 	install -d -m 755 ${PERL5DIR}/PVE/APIServer
 	install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
 	install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
+	install -m 0644 PVE/APIServer/Utils.pm ${PERL5DIR}/PVE/APIServer
 	install -d -m 755 ${PERL5DIR}/PVE/APIServer/Formatter
 	install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
 	install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
@@ -74,13 +80,14 @@ install: ${BTDATA}
 
 .PHONY: upload
 upload: ${DEB}
-	tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
 
+.PHONY: clean distclean
 distclean: clean
 	rm -f examples/simple-demo.pem
 
 clean:
-	rm -rf ./build *.deb *.changes ${BTDIR} examples/simple-demo.lck
+	rm -rf ./build *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall