[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch, master, updated. r0-5-beta-20120426-1-111-g360d7f9

[Keith M. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, master has been updated
       via  360d7f996802046f38941c12e4158a87bdf7567e (commit)
      from  779318fc5ce4778670261a3b9ca22e285c0bd0ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-get/ci/360d7f996802046f38941c12e4158a87bdf7567e/

commit 360d7f996802046f38941c12e4158a87bdf7567e
Author: Keith Marshall <kei...@us...>
Date:   Fri Jun 21 10:34:10 2013 +0100

    Keep version strings clean when release class is unspecified.

diff --git a/ChangeLog b/ChangeLog
index 8539bbd..98d5889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-21  Keith Marshall  <kei...@us...>
+
+	Keep version strings clean when release class is unspecified.
+
+	* Makefile.in (RC_SCRIPT, VERSION_SCRIPT): Simplify; assign specified
+	release class to local variable; delegate release tag generation to...
+	(TAG_SCRIPT): ...this; check release class variable is not an empty
+	string, before inserting it into the generated release tag.
+
 2013-06-20  Keith Marshall  <kei...@us...>
 
 	Rework defective assignment of product version resources.
diff --git a/Makefile.in b/Makefile.in
index ac2e67a..78a3133 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,20 +119,21 @@ AWK_PRINT_LINE_BUFFER = print linebuf;
 # specific package meta-data into compiled resource modules.
 #
 RC = @RC@
-RC_SCRIPT = tag=$(BUILD_TAG); \
-  test "x$$tag" != x && tag="-$(GUI_RELEASE_CLASS)-$$tag"; \
+RC_SCRIPT = tag_class=$(GUI_RELEASE_CLASS) \
     $(TAG_SCRIPT)
 
-VERSION_SCRIPT = tag=$(BUILD_TAG); \
-  test "x$$tag" != x && tag="-$(CLI_RELEASE_CLASS)-$$tag"; \
+VERSION_SCRIPT = tag_class=$(CLI_RELEASE_CLASS) \
     $(TAG_SCRIPT)
 
-TAG_SCRIPT = sed \
-  -e "s!%PACKAGE_NAME%!$(PACKAGE_TARNAME)!g" \
-  -e "s!%PACKAGE_VERSION%!$(PACKAGE_VERSION)$$tag!g" \
-  -e "s!%PACKAGE_VERINFO_PRODUCT_VERSION%!`$(PACKAGE_VERINFO_SCRIPT)`!g" \
-  -e "s!%COPYRIGHT_HOLDER%!@COPYRIGHT_HOLDER@!g" \
-  -e "s!%YEARS_OF_ISSUE%!@YEARS_OF_ISSUE@!g"
+TAG_SCRIPT = tag=$(BUILD_TAG); \
+  test "x$$tag_class" != x && test "x$$tag" != x && tag="$$tag_class-$$tag"; \
+  test "x$$tag" != x && tag="-$$tag"; \
+  sed  \
+    -e "s!%PACKAGE_NAME%!$(PACKAGE_TARNAME)!g" \
+    -e "s!%PACKAGE_VERSION%!$(PACKAGE_VERSION)$$tag!g" \
+    -e "s!%PACKAGE_VERINFO_PRODUCT_VERSION%!`$(PACKAGE_VERINFO_SCRIPT)`!g" \
+    -e "s!%COPYRIGHT_HOLDER%!@COPYRIGHT_HOLDER@!g" \
+    -e "s!%YEARS_OF_ISSUE%!@YEARS_OF_ISSUE@!g"
 
 PACKAGE_VERINFO_SCRIPT = \
   echo $(PACKAGE_VERSION) | awk -F. '{ \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    9 +++++++++
 Makefile.in |   21 +++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Repository: mingw-get