ui: fix typo in error handler

[pve-xtermjs.git] / Makefile

diff --git a/Makefile b/Makefile
index 6512a90f60b4d10619b427ac1518f171564982b7..01488d1ee32c6db6125d0da324c31508e08b7649 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ include /usr/share/dpkg/architecture.mk
 PACKAGE=pve-xtermjs
 CRATENAME=termproxy
 
+BUILDDIR ?= $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)
+ORIG_SRC_TAR=$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+
 export VERSION=$(DEB_VERSION_UPSTREAM_REVISION)
 
 XTERMJSVER=4.16.0
@@ -16,6 +19,7 @@ DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
 DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
 DSC=rust-$(CRATENAME)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
+CARGO ?= cargo
 ifeq ($(BUILD_MODE), release)
 CARGO_BUILD_ARGS += --release
 COMPILEDIR := target/release
@@ -23,46 +27,70 @@ else
 COMPILEDIR := target/debug
 endif
 
-all: cargo-build $(SRCIDR)
+PREFIX = /usr
+BINDIR = $(PREFIX)/bin
+TERMPROXY_BIN := $(addprefix $(COMPILEDIR)/,termproxy)
+
+all:
+
+install: $(TERMPROXY_BIN)
+       install -dm755 $(DESTDIR)$(BINDIR)
+       install -m755 $(TERMPROXY_BIN) $(DESTDIR)$(BINDIR)/
+
+$(TERMPROXY_BIN): .do-cargo-build
+.do-cargo-build:
+       $(CARGO) build $(CARGO_BUILD_ARGS)
+       touch .do-cargo-build
 
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
-       make -C $@
 
 .PHONY: cargo-build
-cargo-build:
-       cargo build $(CARGO_BUILD_ARGS)
-
-.PHONY: build
-build:
-       rm -rf build
-       rm -f debian/control
-       debcargo package \
+cargo-build: .do-cargo-build
+
+update-dcontrol:
+       rm -rf $(BUILDDIR)
+       $(MAKE) $(BUILDDIR)
+       cd $(BUILDDIR); debcargo package \
          --config debian/debcargo.toml \
          --changelog-ready \
          --no-overlay-write-back \
          --directory build \
          $(CRATENAME) \
-         $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//')
-       rm build/Cargo.lock
-       find build/debian -name "*.hint" -delete
-       cp build/debian/control debian/control
+         $(DEB_VERSION_UPSTREAM)
+       cd $(BUILDDIR)/build; wrap-and-sort -tkn
+       cp --remove-destination $(BUILDDIR)/build/debian/control debian/control
+
+$(BUILDDIR):
+       rm -rf $@ $@.tmp
+       mkdir $@.tmp
+       cp -a debian/ src/ Makefile Cargo.toml $@.tmp
        echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout $$(git rev-parse HEAD)" \
            > $@.tmp/debian/SOURCE
+       mv $@.tmp $@
+
+
+$(ORIG_SRC_TAR): $(BUILDDIR)
+       tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
 
 .PHONY: deb
 deb: $(DEB)
-$(DEB) $(DBG_DEB): build
-       cd build; dpkg-buildpackage -b -uc -us
+$(DBG_DEB): $(DEB)
+$(DEB): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
        lintian $(DEB)
        @echo $(DEB)
 
 .PHONY: dsc
-dsc: $(DSC)
-$(DSC): build
-       cd build; dpkg-buildpackage -S -us -uc -d
+dsc:
+       rm -rf $(DSC) $(BUILDDIR)
+       $(MAKE) $(DSC)
        lintian $(DSC)
 
+$(DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+
+sbuild: $(DSC)
+       sbuild $(DSC)
+
 EXCLUDED_ADDONS=attach fullscreen search terminado webLinks zmodem
 X_EXCLUSIONS=$(foreach ADDON,$(EXCLUDED_ADDONS),--exclude=addons/$(ADDON))
 
@@ -77,15 +105,17 @@ download:
        rm $(XTERMJSTGZ) $(FITADDONTGZ)
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEB) $(DBG_DEB)
-       tar cf - $(DEB) $(DBG_DEB) |ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve,pbs --dist bullseye
+       tar cf - $(DEB) $(DBG_DEB) |ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ $(PACKAGE)-*/ build/ *.deb *.changes *.dsc *.tar.?z *.buildinfo
+       $(CARGO) clean
+       rm -rf $(DEB_SOURCE)-[0-9]*/ build/ *.deb *.changes *.dsc *.tar.* *.buildinfo *.build .do-cargo-build
 
 .PHONY: dinstall
 dinstall: deb