X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=Makefile;h=77014998adb90f04babcb28a02bf32493948ae51;hp=79fe413bf369af3d017bdb790c7909f75df1534b;hb=dd03bf6e2f7c9e684561e4adf0f48ee31aff413a;hpb=ba0b3a0a1eae4d40ea2cdeeea33b47ad150f4ad1

diff --git a/Makefile b/Makefile
index 79fe413..7701499 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-RELEASE=3.3
-
-VERSION=1.0
-PKGREL=2
+VERSION=3.0
+PKGREL=12
 
 PACKAGE=pve-firewall
 
@@ -13,8 +11,8 @@ DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
-ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 
@@ -26,18 +24,26 @@ dinstall: deb
 
 
 .PHONY: deb
-deb ${DEB}:
+deb: ${DEB}
+${DEB}: src test debian
+	make check
 	rm -rf build
 	rsync -a src/ build
 	rsync -a debian/ build/debian
 	echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
 	# install
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
+	cd build; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
+.PHONY: check
+check: 
+	make -C test check
+
 .PHONY: clean
 clean: 	
-	rm -rf *~ */*~ *.deb *.changes build ${PACKAGE}-*.tar.gz
+	make -C src clean
+	make -C test clean
+	rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo build ${PACKAGE}-*.tar.gz
 
 .PHONY: distclean
 distclean: clean
@@ -45,10 +51,4 @@ distclean: clean
 
 .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 repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}