コミット: 7687627c1dc5f4cebe519df19cdeae8aaf6b2058 - mingw-get (git)

The MinGW.org Installation Manager Tool

コミットメタ情報

• リビジョン: 7687627c1dc5f4cebe519df19cdeae8aaf6b2058 (tree)
• 日時: 2013-05-15 18:59:03
• 作者: Keith Marshall <keithmarshall@user...>
• コミッター: Keith Marshall

ログメッセージ

Add resources for specification of product version.

変更サマリ

• modified: ChangeLog
• modified: Makefile.in
• modified: src/guimain.rc
• add: src/verinfo.h.in
• add: src/verinfo.rc

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Add resources for specification of product version.
+
+	* src/verinfo.rc src/verinfo.h.in: New files; included by...
+	* src/guimain.rc: ...this, whence also specify version information...
+	(VERINFO_FILE_NAME, VERINFO_INTERNAL_NAME, VERINFO_FILE_DESCRIPTION):
+	(VERINFO_FILE_VERSION, VERINFO_FILE_VERSION_STRING): ...per these new
+	manifest constant macros; define them, with propagation to...
+	(ID_MAIN_WINDOW_CAPTION): ...this; keep it consistent.
+
+	* Makefile.in (TAG_SCRIPT): Include invocation for...
+	(PACKAGE_VERINFO_SCRIPT): ...this new macro; defined to interpret...
+	(PACKAGE_VERINFO_PRODUCT_VERSION): ...this new substitution template;
+	it is used in src/verinfo.h.in, whence verinfo.h is generated.
+	(RC_INCLUDES): Add current working directory, for...
+	(verinfo.h): ...this; add rule and dependencies to generate it.
+
 2013-05-14  Keith Marshall  <[e-mail]>
 
 	Make application manifest resource definition reusable.

--- a/Makefile.in
+++ b/Makefile.in
@@ -130,10 +130,21 @@ VERSION_SCRIPT = tag=$(BUILD_TAG); \
 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"
 
-RC_INCLUDES = -I ${srcdir}/src -I ${srcdir}/icons
+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 \
+  }'
+
+RC_INCLUDES = -I . -I ${srcdir}/src -I ${srcdir}/icons
 
 # Specify extensions, and link-time requirements, for binary
 # package deliverables.
@@ -260,7 +271,13 @@ time-stamp:
 %.c: %.c.in
 	$(VERSION_SCRIPT) $< > $@
 
-version.c guimain.res.$(OBJEXT): Makefile build.time
+%.h: %.h.in
+	$(VERSION_SCRIPT) $< > $@
+
+# The following dependencies must be explicitly declared.
+#
+guimain.res.$(OBJEXT): Makefile build.time verinfo.h
+verinfo.h version.c: Makefile build.time
 
 # Installation tools and directory paths...
 #

--- a/src/guimain.rc
+++ b/src/guimain.rc
@@ -27,6 +27,20 @@
 #include "guimain.h"
 #include <windows.h>
 
+/* Version identification resources which are specific to guimain.exe
+ */
+#define VERINFO_INTERNAL_NAME		"guimain"
+
+#define VERINFO_FILE_NAME		VERINFO_INTERNAL_NAME ".exe"
+#define VERINFO_FILE_DESCRIPTION	"MinGW Installation Manager"
+#define VERINFO_FILE_VERSION_STRING	VERINFO_PRODUCT_VERSION_STRING
+#define VERINFO_FILE_VERSION		VERINFO_PRODUCT_VERSION
+
+/* Interpret the foregoing, together with common product version
+ * information, in this package component context.
+ */
+#include "verinfo.rc"
+
 /* The icon representing the mingw-get application; it is a clone
  * of the icon representing the synaptic package for Debian APT.
  */
@@ -63,7 +77,7 @@ END
 STRINGTABLE		DISCARDABLE
 BEGIN
   ID_MAIN_WINDOW_CLASS  		"mingw-get-gui"
-  ID_MAIN_WINDOW_CAPTION 		"MinGW Installation Manager"
+  ID_MAIN_WINDOW_CAPTION 		 VERINFO_FILE_DESCRIPTION
   ID_SASH_WINDOW_PANE_CLASS		"mingw-get-sash-pane"
   ID_FONT_PREF				"Verdana"
 END

--- /dev/null
+++ b/src/verinfo.h.in
@@ -0,0 +1,48 @@
+#ifndef VERINFO_H
+/*
+ * verinfo.h, verinfo.h.in
+ *
+ * $Id$
+ *
+ * Written by Keith Marshall <[e-mail]>
+ * Copyright (C) 2013, MinGW.org Project
+ *
+ *
+ * Product version resource definitions which are common to all
+ * distributable components of the mingw-get package implementation;
+ * the deployable verinfo.h is generated from the source template,
+ * verinfo.h.in, at package build time.
+ *
+ *
+ * This is free software.  Permission is granted to copy, modify and
+ * redistribute this software, under the provisions of the GNU General
+ * Public License, Version 3, (or, at your option, any later version),
+ * as published by the Free Software Foundation; see the file COPYING
+ * for licensing details.
+ *
+ * Note, in particular, that this software is provided "as is", in the
+ * hope that it may prove useful, but WITHOUT WARRANTY OF ANY KIND; not
+ * even an implied WARRANTY OF MERCHANTABILITY, nor of FITNESS FOR ANY
+ * PARTICULAR PURPOSE.  Under no circumstances will the author, or the
+ * MinGW Project, accept liability for any damages, however caused,
+ * arising from the use of this software.
+ *
+ */
+#define VERINFO_H			1
+
+#define VERINFO_PRODUCT_NAME		"%PACKAGE_NAME%"
+#define VERINFO_PRODUCT_VERSION 	%PACKAGE_VERINFO_PRODUCT_VERSION%
+#define VERINFO_PRODUCT_VERSION_STRING	"%PACKAGE_VERSION%"
+
+#define VERINFO_COMPANY_NAME		"%COPYRIGHT_HOLDER%"
+#define VERINFO_COPYRIGHT_NOTICE	"Copyright \xa9 %YEARS_OF_ISSUE%, %COPYRIGHT_HOLDER%"
+
+#define VERINFO_FILE_OS 		VOS__WINDOWS32
+#define VERINFO_FILE_TYPE		VFT_APP
+#define VERINFO_FILE_SUBTYPE		VFT2_UNKNOWN
+#define VERINFO_FILE_FLAGS		VS_FF_PRERELEASE
+
+#define VERINFO_DEFAULT_LOCALE		"080904E4"   /* U.K. English, code page 1252 */
+#define VERINFO_LOCALE_TUPLES		0x0809, 1252
+
+#endif /* VERINFO_H: $RCSfile$: end of file */

--- /dev/null
+++ b/src/verinfo.rc
@@ -0,0 +1,59 @@
+/*
+ * verinfo.rc
+ *
+ * $Id$
+ *
+ * Written by Keith Marshall <[e-mail]>
+ * Copyright (C) 2013, MinGW.org Project
+ *
+ *
+ * Resource definition template for adding version information
+ * properties to an application module.
+ *
+ *
+ * This is free software.  Permission is granted to copy, modify and
+ * redistribute this software, under the provisions of the GNU General
+ * Public License, Version 3, (or, at your option, any later version),
+ * as published by the Free Software Foundation; see the file COPYING
+ * for licensing details.
+ *
+ * Note, in particular, that this software is provided "as is", in the
+ * hope that it may prove useful, but WITHOUT WARRANTY OF ANY KIND; not
+ * even an implied WARRANTY OF MERCHANTABILITY, nor of FITNESS FOR ANY
+ * PARTICULAR PURPOSE.  Under no circumstances will the author, or the
+ * MinGW Project, accept liability for any damages, however caused,
+ * arising from the use of this software.
+ *
+ */
+#include "verinfo.h"
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION   			VERINFO_FILE_VERSION
+  PRODUCTVERSION			VERINFO_PRODUCT_VERSION
+  FILEFLAGSMASK 			VS_FFI_FILEFLAGSMASK
+  FILEFLAGS     			VERINFO_FILE_FLAGS
+  FILEOS				VERINFO_FILE_OS
+  FILETYPE				VERINFO_FILE_TYPE
+  FILESUBTYPE   			VERINFO_FILE_SUBTYPE
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK VERINFO_DEFAULT_LOCALE
+      BEGIN
+        VALUE "ProductName",     	VERINFO_PRODUCT_NAME
+        VALUE "ProductVersion",  	VERINFO_PRODUCT_VERSION_STRING
+        VALUE "CompanyName",     	VERINFO_COMPANY_NAME
+        VALUE "LegalCopyright",  	VERINFO_COPYRIGHT_NOTICE
+        VALUE "OriginalFileName",	VERINFO_FILE_NAME
+        VALUE "FileDescription", 	VERINFO_FILE_DESCRIPTION
+        VALUE "FileVersion",     	VERINFO_FILE_VERSION_STRING
+        VALUE "InternalName",    	VERINFO_INTERNAL_NAME
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation",		VERINFO_LOCALE_TUPLES
+    END
+  END
+
+/* $RCSfile$: end of file */