buildsys: improve resolving package meta info

use the full version for the cache invalidation technique and fall
back to the commit ID and current time.

With that we can drop the exports in the top-level makefile, which
would only work for local direct builds anyway, but not for building
from DSC source package.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Makefile

@@ -1,7 +1,6 @@
 include /usr/share/dpkg/pkg-info.mk
-export DEB_VERSION_UPSTREAM_REVISION
 
-export PACKAGE=proxmox-widget-toolkit
+PACKAGE=proxmox-widget-toolkit
 
 DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
 DEV_DEB=$(PACKAGE)-dev_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb

debian/rules

@@ -3,6 +3,10 @@
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
+include /usr/share/dpkg/pkg-info.mk
+
+export DEB_SOURCE
+export DEB_VERSION
 
 %:
 	dh $@

src/Makefile

@@ -120,9 +120,11 @@ lint: $(JSSRC)
 	eslint --strict $(JSSRC)
 	touch ".lint-incremental"
 
+BUILD_TIME=$(or $(SOURCE_DATE_EPOCH),$(shell date '+%s.%N'))
+BUILD_VERSION=$(or $(DEB_VERSION),$(shell git rev-parse HEAD),unknown version)
 proxmoxlib.js: .lint-incremental $(JSSRC)
 	# add the version as comment in the file
-	echo "// $(DEB_VERSION_UPSTREAM_REVISION)" > $@.tmp
+	echo "// v$(BUILD_VERSION) - t$(BUILD_TIME)" > $@.tmp
 	cat $(JSSRC) $(MARKEDJS)  >> $@.tmp
 	mv $@.tmp $@
 

src/defines.mk

@@ -1,3 +1,5 @@
+PACKAGE ?= $(or $(DEB_SOURCE), proxmox-widget-toolkit)
+
 DESTDIR=
 DOCDIR=$(DESTDIR)/usr/share/doc/$(PACKAGE)
 WWWBASEDIR=$(DESTDIR)/usr/share/javascript/$(PACKAGE)