X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=b9dc8b93a7f5c7918ee4ecae8327f375102f8d02;hb=464dd619c7248162320dabb98b1e00d92bfd8471;hp=d2d60d556890242a3fed26ce0b1922d8fe940d52;hpb=fccec7c6c2ddb4dbefd5e1540c021ecd5e00d3ed;p=proxmox-widget-toolkit.git

diff --git a/Makefile b/Makefile
index d2d60d5..b9dc8b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
+include /usr/share/dpkg/pkg-info.mk
+
 PACKAGE=proxmox-widget-toolkit
-PKGVER=1.0
-PKGREL=1
 
-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=
 
@@ -12,22 +16,42 @@ WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
 
 JSSRC=					\
 	Utils.js			\
+	Toolkit.js			\
+	mixin/CBind.js			\
 	data/reader/JsonObject.js	\
 	data/ProxmoxProxy.js		\
-	data/UpdateQueue.js		\
 	data/UpdateStore.js		\
 	data/DiffStore.js		\
 	data/ObjectStore.js		\
+	data/RRDStore.js		\
 	data/TimezoneStore.js		\
+	form/IntegerField.js		\
 	form/TextField.js		\
+	form/DateTimeField.js		\
 	form/Checkbox.js		\
+	form/KVComboBox.js		\
+	form/LanguageSelector.js	\
+	form/ComboGrid.js		\
+	form/RRDTypeSelector.js		\
+	form/BondModeSelector.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			\
+	window/PasswordEdit.js		\
 	window/TaskViewer.js		\
+	node/APT.js			\
 	node/NetworkEdit.js		\
 	node/NetworkView.js		\
+	node/DNSEdit.js			\
+	node/HostsView.js		\
+	node/DNSView.js			\
 	node/Tasks.js			\
 	node/ServiceView.js		\
 	node/TimeEdit.js		\
@@ -35,19 +59,31 @@ 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}:
-	rm -rf build
-	rsync -a * build
-	cd build; dpkg-buildpackage -b -us -uc
+deb: ${DEB}
+${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}
-	cat ${JSSRC} >$@.tmp
+	# add the version as comment in the file
+	echo "// ${DEB_VERSION_UPSTREAM_REVISION}" > $@.tmp
+	cat ${JSSRC} >> $@.tmp
 	mv $@.tmp $@
 
 install: proxmoxlib.js
@@ -56,12 +92,11 @@ install: proxmoxlib.js
 
 .PHONY: upload
 upload: ${DEB}
-	# fixme	tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
 
 distclean: clean
-
 clean:
-	rm -rf ./build *.deb *.changes *.buildinfo
+	rm -rf ${BUILDDIR} *.tar.gz *.dsc *.deb *.changes *.buildinfo proxmoxlib.js
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall