override Ext.Components 'validIdRe' to include '@'

[proxmox-widget-toolkit.git] / Makefile

diff --git a/Makefile b/Makefile
index 33f233e9ba052ac0a1bf983c8ff45cf748c1d5c8..d12a4dacb69fcd9ac62ff8f608c7129612ecb15b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
+include /usr/share/dpkg/pkg-info.mk
+
 PACKAGE=proxmox-widget-toolkit
-PKGVER=1.0
-PKGREL=10
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+GITVERSION:=$(shell git rev-parse HEAD)
+
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 DESTDIR=
 
@@ -30,12 +34,14 @@ JSSRC=                                      \
        form/ComboGrid.js               \
        form/RRDTypeSelector.js         \
        form/BondModeSelector.js        \
+       form/NetworkSelector.js         \
        button/Button.js                \
        button/HelpButton.js            \
        grid/ObjectGrid.js              \
        grid/PendingObjectGrid.js       \
        panel/InputPanel.js             \
        panel/LogView.js                \
+       panel/JournalView.js            \
        panel/RRDChart.js               \
        panel/GaugeWidget.js            \
        window/Edit.js                  \
@@ -45,6 +51,7 @@ JSSRC=                                        \
        node/NetworkEdit.js             \
        node/NetworkView.js             \
        node/DNSEdit.js                 \
+       node/HostsView.js               \
        node/DNSView.js                 \
        node/Tasks.js                   \
        node/ServiceView.js             \
@@ -53,21 +60,30 @@ JSSRC=                                      \
 
 all:
 
+${BUILDDIR}:
+       rm -rf ${BUILDDIR}
+       rsync -a * ${BUILDDIR}
+       echo "git clone git://git.proxmox.com/git/proxmox-widget-toolkit.git\\ngit checkout ${GITVERSION}" >  ${BUILDDIR}/debian/SOURCE
+
 .PHONY: deb
 deb: ${DEB}
-${DEB}:
-       rm -rf build
-       rsync -a * build
-       cd build; dpkg-buildpackage -b -us -uc
+${DEB}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
        lintian ${DEB}
 
+.PHONY: dsc
+dsc: ${DSC}
+${DSC}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
+       lintian ${DSC}
+
 .PHONY: lint
 lint: ${JSSRC}
        jslint ${JSSRC}
 
 proxmoxlib.js: ${JSSRC}
        # add the version as comment in the file
-       echo "// ${PKGVER}-${PKGREL}" > $@.tmp
+       echo "// ${DEB_VERSION_UPSTREAM_REVISION}" > $@.tmp
        cat ${JSSRC} >> $@.tmp
        mv $@.tmp $@
 
@@ -77,12 +93,11 @@ install: proxmoxlib.js
 
 .PHONY: upload
 upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
 
 distclean: clean
-
 clean:
-       rm -rf ./build *.deb *.changes *.buildinfo proxmoxlib.js
+       rm -rf ${BUILDDIR} *.tar.gz *.dsc *.deb *.changes *.buildinfo proxmoxlib.js
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall