buildsys: fix targets to not run dpkg-buildpackage 4 times

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index 15210c2d665b838c06ac38b10c29aafa04569232..40c1186d76da537765260843fca30952a5469895 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
+include /usr/share/dpkg/default.mk
 include defines.mk
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell git rev-parse HEAD)
+PACKAGE := proxmox-backup
+ARCH := $(DEB_BUILD_ARCH)
 
 SUBDIRS := etc www docs
 
@@ -11,11 +12,13 @@ USR_BIN := \
        pxar
 
 # Binaries usable by admins
-USR_SBIN := proxmox-backup-manager
+USR_SBIN := \
+       proxmox-backup-manager
 
 # Binaries for services:
 SERVICE_BIN := \
        proxmox-backup-api \
+       proxmox-backup-banner \
        proxmox-backup-proxy
 
 ifeq ($(BUILD_MODE), release)
@@ -29,12 +32,22 @@ ifeq ($(valgrind), yes)
 CARGO_BUILD_ARGS += --features valgrind
 endif
 
+CARGO ?= cargo
+
 COMPILED_BINS := \
        $(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN))
 
-DEBS= ${PACKAGE}-server_${PKGVER}-${PKGREL}_${ARCH}.deb ${PACKAGE}-client_${PKGVER}-${PKGREL}_${ARCH}.deb
+export DEB_VERSION DEB_VERSION_UPSTREAM
+
+SERVER_DEB=${PACKAGE}-server_${DEB_VERSION}_${ARCH}.deb
+SERVER_DBG_DEB=${PACKAGE}-server-dbgsym_${DEB_VERSION}_${ARCH}.deb
+CLIENT_DEB=${PACKAGE}-client_${DEB_VERSION}_${ARCH}.deb
+CLIENT_DBG_DEB=${PACKAGE}-client-dbgsym_${DEB_VERSION}_${ARCH}.deb
+DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
+
+DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
 
-DOC_DEB=${PACKAGE}-docs_${PKGVER}-${PKGREL}_all.deb
+DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
 
 DESTDIR=
 
@@ -47,35 +60,41 @@ $(SUBDIRS):
 test:
        #cargo test test_broadcast_future
        #cargo test $(CARGO_BUILD_ARGS)
-       cargo test $(tests) $(CARGO_BUILD_ARGS)
+       #$(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
 
 doc:
-       cargo doc --no-deps $(CARGO_BUILD_ARGS)
+       $(CARGO) doc --no-deps $(CARGO_BUILD_ARGS)
 
 # always re-create this dir
-# but also copy the local target/ dir as a build-cache
 .PHONY: build
 build:
        rm -rf build
-       cargo build --release --lib
-       rsync -a debian Makefile defines.mk Cargo.toml Cargo.lock \
-           src $(SUBDIRS) \
-           target tests build/
+       debcargo package --config debian/debcargo.toml --changelog-ready --no-overlay-write-back --directory build proxmox-backup $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//')
+       sed -e '1,/^$$/ ! d' build/debian/control > build/debian/control.src
+       cat build/debian/control.src build/debian/control.in > build/debian/control
+       rm build/debian/control.in build/debian/control.src
+       rm build/Cargo.lock
+       find build/debian -name "*.hint" -delete
        $(foreach i,$(SUBDIRS), \
            $(MAKE) -C build/$(i) clean ;)
 
+
 .PHONY: proxmox-backup-docs
-proxmox-backup-docs: $(DOC_DEB)
-$(DOC_DEB): build
+$(DOC_DEB) $(DEBS): proxmox-backup-docs
+proxmox-backup-docs: build
        cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
        lintian $(DOC_DEB)
 
+# copy the local target/ dir as a build-cache
 .PHONY: deb
-deb: $(DEBS)
-$(DEBS): build
+$(DEBS): deb
+deb: build
        cd build; dpkg-buildpackage -b -us -uc --no-pre-clean --build-profiles=nodoc
        lintian $(DEBS)
 
+.PHONY: deb-all
+deb-all: $(DOC_DEB) $(DEBS)
+
 .PHONY: dsc
 dsc: $(DSC)
 $(DSC): build
@@ -87,7 +106,7 @@ distclean: clean
 clean:
        $(foreach i,$(SUBDIRS), \
            $(MAKE) -C $(i) clean ;)
-       cargo clean
+       $(CARGO) clean
        rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build
        find . -name '*~' -exec rm {} ';'
 
@@ -100,7 +119,7 @@ docs: cargo-build
 
 .PHONY: cargo-build
 cargo-build:
-       cargo build $(CARGO_BUILD_ARGS)
+       $(CARGO) build $(CARGO_BUILD_ARGS)
 
 $(COMPILED_BINS): cargo-build
 
@@ -110,11 +129,14 @@ lint:
 
 install: $(COMPILED_BINS)
        install -dm755 $(DESTDIR)$(BINDIR)
+       install -dm755 $(DESTDIR)$(ZSH_COMPL_DEST)
        $(foreach i,$(USR_BIN), \
-           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(BINDIR)/ ;)
+           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(BINDIR)/ ; \
+           install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
        install -dm755 $(DESTDIR)$(SBINDIR)
        $(foreach i,$(USR_SBIN), \
-           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ;)
+           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \
+           install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
        install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
        $(foreach i,$(SERVICE_BIN), \
            install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
@@ -122,7 +144,8 @@ install: $(COMPILED_BINS)
        $(MAKE) -C docs install
 
 .PHONY: upload
-upload: ${DEBS}
+upload: ${SERVER_DEB} ${CLIENT_DEB} ${DOC_DEB}
        # check if working directory is clean
        git diff --exit-code --stat && git diff --exit-code --stat --staged
-       tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com upload --product pbs --dist buster
+       tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} | ssh -X repoman@repo.proxmox.com upload --product pbs --dist buster
+       tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pbs,pve" --dist buster