X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=c0fe06daab097a13f3a00692aafde86d816b6471;hb=689fa8a52cd49ff372725242ec1d0bda9d9e33d1;hp=d12a4dacb69fcd9ac62ff8f608c7129612ecb15b;hpb=607c37efd13f086cbdfdf65860582d26554e57af;p=proxmox-widget-toolkit.git

diff --git a/Makefile b/Makefile
index d12a4da..c0fe06d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,69 +1,19 @@
 include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM_REVISION
 
-PACKAGE=proxmox-widget-toolkit
-
+export PACKAGE=proxmox-widget-toolkit
 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=
-
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-
-WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
-
-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:
+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}
@@ -79,25 +29,16 @@ ${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}
+	${MAKE} -C src lint
 
 .PHONY: upload
 upload: ${DEB}
-	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --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