X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=bfd440a70ae5d2d2134c632ca10f220629e2be96;hb=db22e6b270a8b6c42314f89056af4aef37d2dc28;hp=fa75b3676dede2f6818dd99efd6e5f79c01d8d83;hpb=dc04ce7fe5f61095b6c67addcdd35524baaf274b;p=proxmox-backup.git

diff --git a/Makefile b/Makefile
index fa75b367..bfd440a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,24 @@
+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
 
 # Binaries usable by users
 USR_BIN := \
 	proxmox-backup-client \
-	catar
+	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)
@@ -25,18 +28,26 @@ else
 COMPILEDIR := target/debug
 endif
 
+ifeq ($(valgrind), yes)
+CARGO_BUILD_ARGS += --features valgrind
+endif
+
+CARGO ?= cargo
+
 COMPILED_BINS := \
 	$(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN))
 
-export PROXMOX_PKG_VERSION=${PKGVER}
-export PROXMOX_PKG_RELEASE=${PKGREL}
-export PROXMOX_PKG_REPOID=${GITVERSION}
+export DEB_VERSION DEB_VERSION_UPSTREAM
 
-export PROXMOX_JSDIR := $(JSDIR)
-export PROXMOX_CONFIGDIR := $(SYSCONFDIR)/proxmox-backup
+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
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
-DSC=${PACKAGE}_${PKGVER}-${PKGREL}.dsc
+DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
+
+DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
 
 DESTDIR=
 
@@ -46,29 +57,45 @@ all: cargo-build $(SUBDIRS)
 $(SUBDIRS):
 	$(MAKE) -C $@
 
-test: | dependencies
-	cargo test $(CARGO_BUILD_ARGS)
+test:
+	#cargo test test_broadcast_future
+	#cargo test $(CARGO_BUILD_ARGS)
+	$(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
 
-doc: | dependencies
-	cargo doc --no-deps $(CARGO_BUILD_ARGS)
+doc:
+	$(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
-	rsync -a debian Makefile defines.mk Cargo.toml Cargo.lock \
-	    src proxmox-protocol $(SUBDIRS) \
-	    target build/
+	rm debian/control
+	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
+	cp build/debian/control debian/control
+	rm build/Cargo.lock
+	find build/debian -name "*.hint" -delete
 	$(foreach i,$(SUBDIRS), \
 	    $(MAKE) -C build/$(i) clean ;)
 
-.PHONY: deb
-deb: $(DEB)
-$(DEB): build
+
+.PHONY: proxmox-backup-docs
+$(DOC_DEB) $(DEBS): proxmox-backup-docs
+proxmox-backup-docs: build
 	cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
-	lintian $(DEB)
+	lintian $(DOC_DEB)
+
+# copy the local target/ dir as a build-cache
+.PHONY: deb
+$(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)
@@ -81,46 +108,46 @@ 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 {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB}
+dinstall: ${DEBS}
+	dpkg -i ${DEBS}
 
 # make sure we build binaries before docs
 docs: cargo-build
 
 .PHONY: cargo-build
-cargo-build: | dependencies
-	cargo build $(CARGO_BUILD_ARGS)
+cargo-build:
+	$(CARGO) build $(CARGO_BUILD_ARGS)
 
 $(COMPILED_BINS): cargo-build
 
+.PHONY: lint
+lint:
+	cargo clippy -- -A clippy::all -D clippy::correctness
+
 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/ ;)
 	$(MAKE) -C www install
 	$(MAKE) -C docs install
 
-#
-# External dependency patching:
-#
-
-dependencies: lz4-rs
-
-# We want to dynamically link against the system's liblz4!
-# The lz4-sys crate provides some more helpers in addition to the 'extern "C"' block so we still
-# need to use its rust code directly in order for the `lz4` crate to be happy.
-lz4-rs:
-	git clone https://github.com/bozaro/lz4-rs
-	echo 'fn main() { println!("cargo:rustc-link-lib=lz4"); }' \
-		>lz4-rs/lz4-sys/build.rs
+.PHONY: upload
+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 - ${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