Let venum generate new timestamps if it's available

thoni56 · thoni56 · commit 96b5912f879f · 2020-09-26T17:39:27.000+02:00
diff --git a/NEXTRELEASE b/NEXTRELEASE
@@ -1 +1 @@
-3.0beta7
+3.0beta8
diff --git a/alan.version b/alan.version
@@ -5,11 +5,11 @@ Adventure Language System
 0
 8
 beta
-1600794293 2020-09-22 19:04:53
-Thomas
+1601134693 2020-09-26 17:38:13
+
 thoni64
 $v.$r{s$s|.}$c
 $n $V
 $H{z -- $z} ($D $t)
 
-cygwin64
+linux
diff --git a/alan.version.c b/alan.version.c
@@ -6,13 +6,13 @@ Product alan = {
   "Alan",
   "Adventure Language System",
   "Alan 3.0beta8",
-  "Alan 3.0beta8 -- Adventure Language System (2020-09-22 19:04)",
-  "2020-09-22",
-  "19:04:53",
-  "Thomas",
+  "Alan 3.0beta8 -- Adventure Language System (2020-09-26 17:38)",
+  "2020-09-26",
+  "17:38:13",
+  "",
   "thoni64",
-  "cygwin64",
-  {"3.0beta8", 3, 0, 8, 1600794293, "beta"}
+  "linux",
+  {"3.0beta8", 3, 0, 8, 1601134693, "beta"}
 };
 
 char *alanId =
diff --git a/compiler/Makefile.thoni b/compiler/Makefile.thoni
@@ -10,8 +10,6 @@ include ../mk/include_guard.mk
 # ThoNi's machine too
 #######################################################################
 
-include ../mk/venum.mk
-
 #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #
 # release
diff --git a/compiler/alan.version.c b/compiler/alan.version.c
@@ -6,13 +6,13 @@ Product alan = {
   "Alan",
   "Adventure Language System",
   "Alan 3.0beta8",
-  "Alan 3.0beta8 -- Adventure Language System (2020-09-22 19:04)",
-  "2020-09-22",
-  "19:04:53",
-  "Thomas",
+  "Alan 3.0beta8 -- Adventure Language System (2020-09-26 17:38)",
+  "2020-09-26",
+  "17:38:13",
+  "",
   "thoni64",
-  "cygwin64",
-  {"3.0beta8", 3, 0, 8, 1600794293, "beta"}
+  "linux",
+  {"3.0beta8", 3, 0, 8, 1601134693, "beta"}
 };
 
 char *alanId =
diff --git a/interpreter/alan.version.c b/interpreter/alan.version.c
@@ -6,13 +6,13 @@ Product alan = {
   "Alan",
   "Adventure Language System",
   "Alan 3.0beta8",
-  "Alan 3.0beta8 -- Adventure Language System (2020-09-22 19:04)",
-  "2020-09-22",
-  "19:04:53",
-  "Thomas",
+  "Alan 3.0beta8 -- Adventure Language System (2020-09-26 17:34)",
+  "2020-09-26",
+  "17:34:10",
+  "",
   "thoni64",
-  "cygwin64",
-  {"3.0beta8", 3, 0, 8, 1600794293, "beta"}
+  "linux",
+  {"3.0beta8", 3, 0, 8, 1601134450, "beta"}
 };
 
 char *alanId =
diff --git a/mk/venum.mk b/mk/venum.mk
@@ -13,7 +13,7 @@
 NEXTRELEASEFORMAT='$$v.$$r{s$$s|}$$c'
 VERSION = `cd ..; venum alan -print "\\$$v.\\$$r\\$$s\\$$c" | tr -d '\n\r'`
 
-alan.version.c: $(VERSIONSRCS) ../alan.version.c
+alan.version.c: ../alan.version.c
 	cp ../alan.version.c .
 
 alan.version.h : ../alan.version.h
@@ -27,10 +27,9 @@ version.h : ../version.h
 # Make considers alan.version to be one of those obviously
 %.version :
 
-../alan.version.c ../alan.version.h ../version.h: ../alan.version
-ifneq ($(shell command -v venum > /dev/null 2>&1),)
-	@echo \"$(shell command -v venum > /dev/null 2>&1)\"
-	# If venum exists on this platform we can use it to generate timestamps
+../alan.version.c ../alan.version.h ../version.h ../alan.version : $(VERSIONSRCS)
+ifneq ($(shell which venum), )
+	# Use venum to generate timestamps
 	cd ..; venum alan time
 	cd ..; venum alan -print $(NEXTRELEASEFORMAT) > NEXTRELEASE
 	cp ../alan.version.c .

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ Adventure Language System`
`5`	`5`	`0`
`6`	`6`	`8`
`7`	`7`	`beta`
`8`		`-1600794293 2020-09-22 19:04:53`
`9`		`-Thomas`
	`8`	`+1601134693 2020-09-26 17:38:13`
	`9`	`+`
`10`	`10`	`thoni64`
`11`	`11`	`$v.$r{s$s\|.}$c`
`12`	`12`	`$n $V`
`13`	`13`	`$H{z -- $z} ($D $t)`
`14`	`14`
`15`		`-cygwin64`
	`15`	`+linux`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ include ../mk/include_guard.mk`
`10`	`10`	`# ThoNi's machine too`
`11`	`11`	`#######################################################################`
`12`	`12`
`13`		`-include ../mk/venum.mk`
`14`		`-`
`15`	`13`	`#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`
`16`	`14`	`#`
`17`	`15`	`# release`