X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=6f7de985d519bccf1ad4e8aab959386bcad2cf5c;hb=25c6e03f716fc4b580c86f05ce8430fe74994d21;hp=a56e3cbb3e10e2ce128cef7c2ca61e6d9bc265e7;hpb=63307bebd92bd14c468cb1f1f003fdfc65f37eda;p=pve-http-server.git

diff --git a/Makefile b/Makefile
index a56e3cb..6f7de98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE=libpve-http-server-perl
-PKGVER=1.0
-PKGREL=1
+PKGVER=2.0
+PKGREL=9
 
 DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
 
@@ -9,17 +9,51 @@ DESTDIR=
 PERL5DIR=${DESTDIR}/usr/share/perl5
 DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
 
-all: ${DEB}
+WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE}
+WWWCSSDIR=${WWWBASEDIR}/css
+WWWFONTSDIR=${WWWBASEDIR}/fonts
+WWWJSDIR=${WWWBASEDIR}/js
+
+# bootstrap library
+BTVER=3.3.7
+BTDIR=bootstrap-${BTVER}-dist
+BTSRC=${BTDIR}.zip
+
+BTDATA = 							\
+	${BTDIR}/css/bootstrap.min.css				\
+	${BTDIR}/css/bootstrap-theme.min.css			\
+	${BTDIR}/js/bootstrap.min.js				\
+	${BTDIR}/fonts/glyphicons-halflings-regular.ttf
+
+JQVER=3.3.1
+JQSRC=jquery-${JQVER}.min.js
+
+all:
 
 .PHONY: deb
-deb ${DEB}:
+deb: ${DEB}
+${DEB}:
 	rm -rf build
-	rsync -a debian build
-	make DESTDIR=./build install
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
+	rsync -a * build
+	cd build; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
-install:
+download_bootstrap:
+	rm -f ${BTSRC}$ ${BTSRC}.tmp
+	wget https://github.com/twbs/bootstrap/releases/download/v${BTVER}/${BTSRC} -O ${BTSRC}.tmp
+	mv ${BTSRC}.tmp ${BTSRC}
+
+download_jquery:
+	rm -f ${JQSRC} ${JQSRC}.tmp
+	wget https://code.jquery.com/jquery-3.1.1.min.js -O ${JQSRC}.tmp
+	mv ${JQSRC}.tmp ${JQSRC}
+
+${BTDATA}: ${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
@@ -27,16 +61,27 @@ install:
 	install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
 	install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
 	install -m 0644 PVE/APIServer/Formatter/HTML.pm ${PERL5DIR}/PVE/APIServer/Formatter
+	# install bootstrap and jquery
+	install -d -m 755 ${WWWBASEDIR}
+	install -d -m 755 ${WWWCSSDIR}
+	install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap.min.css ${WWWCSSDIR}
+	install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap-theme.min.css ${WWWCSSDIR}
+	install -d -m 755 ${WWWJSDIR}
+	install -m 0644 -o www-data -g www-data ${BTDIR}/js/bootstrap.min.js ${WWWJSDIR}
+	install -m 0644 -o www-data -g www-data ${JQSRC} ${WWWJSDIR}
+	install -d -m 755 ${WWWFONTSDIR}
+	install -m 0644 ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${WWWFONTSDIR}
 
 
 .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
 
 distclean: clean
+	rm -f examples/simple-demo.pem
 
 clean:
-	rm -rf ./build *.deb *.changes
+	rm -rf ./build *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall