X-Git-Url: https://git.proxmox.com/?p=proxmox-widget-toolkit.git;a=blobdiff_plain;f=Makefile;h=0060296534805ef7beefb320fd1095138348e8ed;hp=7aa7f73211a0abeb8f541a1b6d78fc4cf63a7b6b;hb=8556628c93f799dbfb734f85a2908bd7c0e70328;hpb=28de30b20e96ec9a579082435c1b17d281fd6c79

diff --git a/Makefile b/Makefile
index 7aa7f73..0060296 100644
--- a/Makefile
+++ b/Makefile
@@ -1,66 +1,27 @@
 include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM_REVISION
 
-include defines.mk
+export PACKAGE=proxmox-widget-toolkit
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+WT_DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+WT_DEV_DEB=${PACKAGE}-dev_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEBS=${WT_DEB} ${WT_DEV_DEB}
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
-SUBDIRS= css images
-
-JSSRC=					\
-	Utils.js			\
-	Toolkit.js			\
-	mixin/CBind.js			\
-	data/reader/JsonObject.js	\
-	data/ProxmoxProxy.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	\
-	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			\
-	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		\
-	node/TimeView.js
-
-all: ${SUBDIRS}
-	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
+GITVERSION:=$(shell git rev-parse HEAD)
 
 ${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
+	rm -rf ${BUILDDIR} ${BUILDDIR}.tmp
+	cp -a src/ ${BUILDDIR}.tmp
+	cp -a debian ${BUILDDIR}.tmp/
+	echo "git clone git://git.proxmox.com/git/proxmox-widget-toolkit.git\\ngit checkout ${GITVERSION}" >  ${BUILDDIR}.tmp/debian/SOURCE
+	mv ${BUILDDIR}.tmp/ ${BUILDDIR}
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: ${BUILDDIR}
+deb: ${DEBS}
+${DEBS}: ${BUILDDIR}
 	cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
-	lintian ${DEB}
+	lintian ${DEBS}
 
 .PHONY: dsc
 dsc: ${DSC}
@@ -70,28 +31,19 @@ ${DSC}: ${BUILDDIR}
 
 .PHONY: lint
 lint: ${JSSRC}
-	jslint ${JSSRC}
-
-proxmoxlib.js: ${JSSRC}
-	# add the version as comment in the file
-	echo "// ${DEB_VERSION_UPSTREAM_REVISION}" > $@.tmp
-	cat ${JSSRC} >> $@.tmp
-	mv $@.tmp $@
-
-install: proxmoxlib.js
-	install -d -m 755 ${WWWBASEDIR}
-	install -m 0644 proxmoxlib.js ${WWWBASEDIR}
-	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+	${MAKE} -C src lint
 
 .PHONY: upload
-upload: ${DEB}
-	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
+upload: ${DEBS}
+	tar cf - ${WT_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster
+	tar cf - ${WT_DEV_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product devel --dist buster
 
 distclean: clean
 clean:
-	rm -rf ${BUILDDIR} *.tar.gz *.dsc *.deb *.changes *.buildinfo proxmoxlib.js
+	$(MAKE) -C src clean
+	rm -rf ${BUILDDIR} ${BUILDDIR}.tmp *.tar.gz *.dsc *.deb *.changes *.buildinfo
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB}
+dinstall: ${DEBS}
+	dpkg -i ${DEBS}