upgrade xterm.js to version 4.7.0

[pve-xtermjs.git] / Makefile

diff --git a/Makefile b/Makefile
index 7d02e6b25614eacff04d96fc61ef657135823a5f..d4aeee48f44a514e453e4894af19d3d0edc2f8ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,65 @@
-include defines.mk
+include /usr/share/dpkg/pkg-info.mk
 
-XTERMJSVER=3.10.1
+PACKAGE=pve-xtermjs
+
+export VERSION=${DEB_VERSION_UPSTREAM_REVISION}
+
+XTERMJSVER=4.7.0
 XTERMJSTGZ=xterm-${XTERMJSVER}.tgz
-XTERMJSDIR=package
-XTERMDATA = ${XTERMJSDIR}/dist/
 
-SRCDIR=src
+FITADDONVER=0.4.0
+FITADDONTGZ=xterm-addon-fit-${FITADDONVER}.tgz
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+SRCDIR=src
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${VERSION}_${ARCH}.deb
+DEB=${PACKAGE}_${VERSION}_all.deb
+DSC=${PACKAGE}_${VERSION}.dsc
 
 all: ${DEB}
        @echo ${DEB}
 
+${BUILDDIR}: ${SRCDIR} debian
+       rm -rf ${BUILDDIR}
+       rsync -a ${SRCDIR}/ debian ${BUILDDIR}
+       echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+
 .PHONY: deb
 deb: ${DEB}
-${DEB}: ${XTERMDATA}
-       rm -rf ${SRCDIR}.tmp
-       cp -rpa ${SRCDIR} ${SRCDIR}.tmp
-       cp -a debian ${SRCDIR}.tmp/
-       cp -ar ${XTERMJSDIR}/dist/* ${SRCDIR}.tmp/www
-       echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout ${GITVERSION}" > ${SRCDIR}.tmp/debian/SOURCE
-       cd ${SRCDIR}.tmp; dpkg-buildpackage -rfakeroot -b -uc -us
+${DEB}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -b -uc -us
        lintian ${DEB}
        @echo ${DEB}
 
-${XTERMDATA}: ${XTERMJSTGZ}
-       rm -rf ${XTTERMDIR}
-       tar -xf ${XTERMJSTGZ}
+.PHONY: dsc
+dsc: ${DSC}
+${DSC}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
+       lintian ${DSC}
 
+X_EXCLUSIONS=--exclude=addons/attach --exclude=addons/fullscreen --exclude=addons/search \
+  --exclude=addons/terminado --exclude=addons/webLinks --exclude=addons/zmodem
 .PHONY: download
-download ${SRCDIR}:
+download:
        wget https://registry.npmjs.org/xterm/-/${XTERMJSTGZ} -O ${XTERMJSTGZ}.tmp
+       wget https://registry.npmjs.org/xterm-addon-fit/-/${FITADDONTGZ} -O ${FITADDONTGZ}.tmp
        mv ${XTERMJSTGZ}.tmp ${XTERMJSTGZ}
+       mv ${FITADDONTGZ}.tmp ${FITADDONTGZ}
+       tar -C $(SRCDIR)/www -xf ${XTERMJSTGZ} package/lib package/css --strip-components=2 ${X_EXCLUSIONS}
+       tar -C $(SRCDIR)/www -xf ${FITADDONTGZ} package/lib --strip-components=2 ${X_EXCLUSIONS}
+       rm ${XTERMJSTGZ} ${FITADDONTGZ}
 
 .PHONY: upload
 upload: ${DEB}
-       tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist stretch
+       tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist buster
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ *_${ARCH}.deb ${SRCDIR}.tmp ${XTERMJSDIR} *_all.deb *.changes *.dsc *.buildinfo
+       rm -rf *~ debian/*~ ${PACKAGE}-*/ *.deb *.changes *.dsc *.tar.gz *.buildinfo
 
 .PHONY: dinstall
 dinstall: deb