Commit: 5c0a4a4a90d52ba8296e28cd719f18abdbc82ab0 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 5c0a4a4a90d52ba8296e28cd719f18abdbc82ab0 (tree)
• Time: 2013-06-21 00:25:16
• Author: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Rework defective assignment of product version resources.

Change Summary

• modified: ChangeLog
• modified: Makefile.in

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Rework defective assignment of product version resources.
+
+	* Makefile.in (BUILD_TAG): Avoid creating an empty build.tag file.
+	(PACKAGE_VERINFO_SCRIPT): Ensure that the build tag is generated as a
+	string of non-zero length.  Do not assume that it comprises only two
+	elements; extract the final two, as the third and fourth elements
+	of the product version meta-data record.
+
 2013-06-19  Keith Marshall  <[e-mail]>
 
 	Rework defective package build time-stamping logic.

--- a/Makefile.in
+++ b/Makefile.in
@@ -30,7 +30,7 @@ PACKAGE_SUBSYSTEM = @host_os@
 CLI_RELEASE_CLASS = @CLI_RELEASE_CLASS@
 GUI_RELEASE_CLASS = @GUI_RELEASE_CLASS@
 
-BUILD_TAG = `>> build.tag; cat build.tag`
+BUILD_TAG = `test -f build.tag && cat build.tag`
 DEBUGLEVEL = @DEBUGLEVEL@
 
 # Establish the appropriate mechanism for invoking 'make' recursively,
@@ -116,7 +116,7 @@ AWK_PRINT_LINE_BUFFER = print linebuf;
 
 # Identify an appropriate resource compiler, for GUI builds,
 # and define a set of script macros to propagate the build-time
-# specific package meta-data into the compile resource modules.
+# specific package meta-data into compiled resource modules.
 #
 RC = @RC@
 RC_SCRIPT = tag=$(BUILD_TAG); \
@@ -137,11 +137,9 @@ TAG_SCRIPT = sed \
 PACKAGE_VERINFO_SCRIPT = \
   echo $(PACKAGE_VERSION) | awk -F. '{ \
     printf "%d, %d, ", $$1, $$2 * 100 + $$3 \
-  }'; \
-  (test -f build.tag && cat build.tag || date +%Y%m%d-0) | awk -F- '{ \
-    printf "%d, %d", (( substr( $$1, 1, 4 ) - 1970 ) * 16 \
-      + substr( $$1, 5, 2 )) * 32 + substr( $$1, 7, 2 ), \
-      $$2 \
+  }'; (test "x$$tag" = x && date +%Y%m%d-0 || echo $$tag) | awk -F- '{ \
+    DF = NF - 1; printf "%d, %d", (( substr( $$DF, 1, 4 ) - 1970 ) * 16 \
+      + substr( $$DF, 5, 2 )) * 32 + substr( $$DF, 7, 2 ), $$NF \
   }'
 
 RC_INCLUDES = -I . -I ${srcdir}/src -I ${srcdir}/icons