X-Git-Url: https://git.proxmox.com/?p=proxmox-widget-toolkit.git;a=blobdiff_plain;f=Makefile;h=aa8c0e3d2511d9a1c756e74789990fdd9c4b88c5;hp=3675e0ea3a88719d5189cbf6e717f84fc45cc8b9;hb=c9d603afff59e295542ae41e37ca7b49283bb7dd;hpb=bb64de6e768299414c4a027aebcf4b5c1fb34d9a

diff --git a/Makefile b/Makefile
index 3675e0e..aa8c0e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,68 +1,43 @@
-PACKAGE=proxmox-widget-toolkit
-PKGVER=1.0
-PKGREL=1
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM_REVISION
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
+export PACKAGE=proxmox-widget-toolkit
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
-DESTDIR=
+GITVERSION:=$(shell git rev-parse HEAD)
 
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-
-WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
-
-JSSRC=					\
-	Utils.js			\
-	Toolkit.js			\
-	data/reader/JsonObject.js	\
-	data/ProxmoxProxy.js		\
-	data/UpdateQueue.js		\
-	data/UpdateStore.js		\
-	data/DiffStore.js		\
-	data/ObjectStore.js		\
-	data/TimezoneStore.js		\
-	form/TextField.js		\
-	form/Checkbox.js		\
-	grid/ObjectGrid.js		\
-	panel/InputPanel.js		\
-	panel/LogView.js		\
-	window/Edit.js			\
-	window/TaskViewer.js		\
-	node/NetworkEdit.js		\
-	node/NetworkView.js		\
-	node/Tasks.js			\
-	node/ServiceView.js		\
-	node/TimeEdit.js		\
-	node/TimeView.js
-
-all:
+${BUILDDIR}:
+	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}:
-	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
-	mv $@.tmp $@
-
-install: proxmoxlib.js
-	install -d -m 755 ${WWWBASEDIR}
-	install -m 0644 proxmoxlib.js ${WWWBASEDIR}
+	${MAKE} -C src lint
 
 .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,pbs --dist buster
 
 distclean: clean
-
 clean:
-	rm -rf ./build *.deb *.changes *.buildinfo
+	rm -rf ${BUILDDIR} ${BUILDDIR}.tmp *.tar.gz *.dsc *.deb *.changes *.buildinfo
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall