X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=Makefile;h=ed50f5ba30cfbf983a3da91a41d72ab733ded384;hp=a3bd6519afa1eb73cbb83ae2070405edeb010a21;hb=f4f506b8b6d50681f5eb6834a340496102883339;hpb=28ddf48b469235a894d91aa025a76b4ee07ab282

diff --git a/Makefile b/Makefile
index a3bd651..ed50f5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=4.1
-
-VERSION=4.0
+VERSION=5.1
 PACKAGE=libpve-access-control
-PKGREL=17
+PKGREL=3
 
 DESTDIR=
 PREFIX=/usr
@@ -12,9 +10,12 @@ MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc/${PACKAGE}
 MAN1DIR=${MANDIR}/man1/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
+ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
 
 export PERLDIR=${PREFIX}/share/perl5
 
+export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
+
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
@@ -24,7 +25,7 @@ DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 export NOVIEW=1
 include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
-all: ${DEB}
+all:
 
 .PHONY: dinstall
 dinstall: deb
@@ -34,52 +35,46 @@ pveum.bash-completion: PVE/CLI/pveum.pm
 	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
+pveum.zsh-completion: PVE/CLI/pveum.pm
+	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_zsh_completions();" >$@.tmp
+	mv $@.tmp $@
+
 .PHONY: install
-install: pveum.1 oathkeygen pveum.bash-completion
+install: pveum.1 oathkeygen pveum.bash-completion pveum.zsh-completion
 	install -d ${DESTDIR}${BINDIR}
 	install -d ${DESTDIR}${SBINDIR}
 	install -m 0755 pveum ${DESTDIR}${SBINDIR}
 	install -m 0755 oathkeygen ${DESTDIR}${BINDIR}
 	make -C PVE install
-	perl -I. ./pveum verifyapi
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
 	install -d ${DESTDIR}/${MAN1DIR}
 	install -d ${DESTDIR}/${DOCDIR}
 	install -m 0644 pveum.1 ${DESTDIR}/${MAN1DIR}
-	gzip -9 ${DESTDIR}/${MAN1DIR}/pveum.1
+	gzip -9 -n ${DESTDIR}/${MAN1DIR}/pveum.1
 	install -m 0644 -D pveum.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pveum
+	install -m 0644 -D pveum.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_pveum
+
+.PHONY: test
+test:
+	perl -I. ./pveum verifyapi
+	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
 
-.PHONY: deb ${DEB}
-deb ${DEB}:
+.PHONY: deb
+deb: ${DEB}
+${DEB}:
 	rm -rf build
-	mkdir build
-	make DESTDIR=`pwd`/build install
-	install -d -m 0755 build/DEBIAN
-	sed -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ -e s/@@ARCH@@/${ARCH}/ <control.in >build/DEBIAN/control
-	echo "git clone git://git.proxmox.com/git/pve-access-control.git\\ngit checkout ${GITVERSION}" >  build/${DOCDIR}/SOURCE
-	install -m 0644 triggers build/DEBIAN
-	install -D -m 0644 copyright build/${DOCDIR}/copyright
-	install -m 0644 changelog.Debian build/${DOCDIR}/
-	gzip -9 build/${DOCDIR}/changelog.Debian
-	dpkg-deb --build build	
-	mv build.deb ${DEB}
-	#rm -rf build
+	rsync -a * build
+	echo "git clone git://git.proxmox.com/git/pve-access-control.git\\ngit checkout ${GITVERSION}" >build/debian/SOURCE
+	cd build; dpkg-buildpackage -b -us -uc
 	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 repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 .PHONY: clean
 clean:
 	make cleanup-docgen
-	rm -rf build *~ *.deb ${PACKAGE}-*.tar.gz pveum.1
+	rm -rf build *.deb *.buildinfo *.changes
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean