ui: add GroupSelector

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index 684d1f6e819e9f06592618217c86bb05fa0a0ef5..6a38931f6a3f1e205134ec78383846f8178441ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ USR_BIN := \
 
 # Binaries usable by admins
 USR_SBIN := \
-       proxmox-backup-manager
+       proxmox-backup-manager \
+       proxmox-backup-debug \
 
 # Binaries for services:
 SERVICE_BIN := \
@@ -31,9 +32,21 @@ RESTORE_BIN := \
        proxmox-restore-daemon
 
 SUBCRATES := \
+       pbs-api-types \
        pbs-buildcfg \
-       pbs-runtime \
-       pbs-tools
+       pbs-client \
+       pbs-config \
+       pbs-datastore \
+       pbs-fuse-loop \
+       proxmox-rest-server \
+       proxmox-rrd \
+       pbs-tape \
+       pbs-tools \
+       proxmox-backup-banner \
+       proxmox-backup-client \
+       proxmox-file-restore \
+       proxmox-restore-daemon \
+       pxar-bin
 
 ifeq ($(BUILD_MODE), release)
 CARGO_BUILD_ARGS += --release
@@ -62,13 +75,15 @@ RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_${DEB_VERSION}_${ARCH}.deb
 DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
 
 DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
-     ${RESTORE_DEB} ${RESTORE_DBG_DEB}
+     ${RESTORE_DEB} ${RESTORE_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB}
 
 DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
 
 DESTDIR=
 
-all: cargo-build $(SUBDIRS)
+tests ?= --workspace
+
+all: $(SUBDIRS)
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS):
@@ -80,15 +95,18 @@ test:
        $(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
 
 doc:
-       $(CARGO) doc --no-deps $(CARGO_BUILD_ARGS)
+       $(CARGO) doc --workspace --no-deps $(CARGO_BUILD_ARGS)
 
 # always re-create this dir
 .PHONY: build
 build:
+       @echo "Setting pkg-buildcfg version to: $(DEB_VERSION_UPSTREAM)"
+       sed -i -e 's/^version =.*$$/version = "$(DEB_VERSION_UPSTREAM)"/' \
+         pbs-buildcfg/Cargo.toml
        rm -rf build
        mkdir build
        cp -a debian \
-         Cargo.toml build.rs src \
+         Cargo.toml src \
          $(SUBCRATES) \
          docs etc examples tests www zsh-completions \
          defines.mk Makefile \
@@ -123,27 +141,61 @@ $(DSC): build
        cd build; dpkg-buildpackage -S -us -uc -d -nc
        lintian $(DSC)
 
+.PHONY: clean distclean deb clean
 distclean: clean
-
-clean:
+clean: clean-deb
        $(foreach i,$(SUBDIRS), \
            $(MAKE) -C $(i) clean ;)
        $(CARGO) clean
-       rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build
+       rm -f .do-cargo-build
        find . -name '*~' -exec rm {} ';'
 
+# allows one to avoid running cargo clean when one just wants to tidy up after a packgae build
+clean-deb:
+       rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build/
+
 .PHONY: dinstall
-dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
+dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
+  ${DEBUG_DEB} ${DEBUG_DBG_DEB}
        dpkg -i $^
 
 # make sure we build binaries before docs
-docs: cargo-build
+docs: $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen
 
 .PHONY: cargo-build
 cargo-build:
-       $(CARGO) build $(CARGO_BUILD_ARGS)
+       rm -f .do-cargo-build
+       $(MAKE) $(COMPILED_BINS)
+
+$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
+.do-cargo-build:
+       $(CARGO) build $(CARGO_BUILD_ARGS) \
+           --package proxmox-backup-banner \
+           --bin proxmox-backup-banner \
+           --package proxmox-backup-client \
+           --bin proxmox-backup-client \
+           --bin dump-catalog-shell-cli \
+           --bin proxmox-backup-debug \
+           --package proxmox-file-restore \
+           --bin proxmox-file-restore \
+           --package pxar-bin \
+           --bin pxar \
+           --package pbs-tape \
+           --bin pmt \
+           --bin pmtx \
+           --package proxmox-restore-daemon \
+           --bin proxmox-restore-daemon \
+           --package proxmox-backup \
+           --bin docgen \
+           --bin proxmox-backup-api \
+           --bin proxmox-backup-manager \
+           --bin proxmox-backup-proxy \
+           --bin proxmox-daily-update \
+           --bin proxmox-file-restore \
+           --bin proxmox-tape \
+           --bin sg-tape-cmd
+       touch "$@"
 
-$(COMPILED_BINS): cargo-build
 
 .PHONY: lint
 lint:
@@ -169,12 +221,16 @@ install: $(COMPILED_BINS)
            install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
        $(MAKE) -C www install
        $(MAKE) -C docs install
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+       $(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config
+endif
 
 .PHONY: upload
-upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB}
+upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_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} ${CLIENT_DEB} ${CLIENT_DBG_DEB} | \
-           ssh -X repoman@repo.proxmox.com upload --product pbs --dist bullseye
+       tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} ${CLIENT_DEB} \
+           ${CLIENT_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB} \
+         | ssh -X repoman@repo.proxmox.com upload --product pbs --dist bullseye
        tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve,pmg,pbs-client" --dist bullseye
        tar cf - ${RESTORE_DEB} ${RESTORE_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve" --dist bullseye