[GRASS-SVN] r41468 - in grass/trunk: include/Make mswindows

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-03-17 09:39:40 -0400 (Wed, 17 Mar 2010)
New Revision: 41468

Modified:
   grass/trunk/include/Make/Compile.make
   grass/trunk/mswindows/generic.manifest.rc
Log:
Add version information to Windows executables


Modified: grass/trunk/include/Make/Compile.make
===================================================================
--- grass/trunk/include/Make/Compile.make	2010-03-17 11:29:22 UTC (rev 41467)
+++ grass/trunk/include/Make/Compile.make	2010-03-17 13:39:40 UTC (rev 41468)
@@ -50,10 +50,14 @@
 %.manifest.res: %.manifest.rc %.exe.manifest
 	$(WINDRES) --input=$< --input-format=rc --output=$@ --output-format=coff
 
-%.manifest.rc:
-	sed 's/@CMD@/$(notdir $*)/' $(MODULE_TOPDIR)/mswindows/generic.manifest.rc > $@
+%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc
+	sed	-e 's/@CMD@/$(notdir $*)/' \
+		-e 's/@VER_MAJOR@/$(GRASS_VERSION_MAJOR)/' \
+		-e 's/@VER_MINOR@/$(GRASS_VERSION_MINOR)/' \
+		-e 's/@VER_RELEASE@/$(GRASS_VERSION_RELEASE)/' \
+		$(MODULE_TOPDIR)/mswindows/generic.manifest.rc > $@
 
-%.exe.manifest:
+%.exe.manifest: $(MODULE_TOPDIR)/mswindows/generic.manifest
 	sed 's/@CMD@/$(notdir $*)/' $(MODULE_TOPDIR)/mswindows/generic.manifest > $@
 
 -include $(DEPFILE)

Modified: grass/trunk/mswindows/generic.manifest.rc
===================================================================
--- grass/trunk/mswindows/generic.manifest.rc	2010-03-17 11:29:22 UTC (rev 41467)
+++ grass/trunk/mswindows/generic.manifest.rc	2010-03-17 13:39:40 UTC (rev 41468)
@@ -1,2 +1,43 @@
+#include "winver.h"
 #include "winuser.h"
+
 1 RT_MANIFEST "@CMD at .exe.manifest"
+
+#define VER_FILEVERSION             @VER_MAJOR@, at VER_MINOR@,0,0
+#define VER_FILEVERSION_STR         "@VER_MAJOR at .@VER_MINOR at .@VER_RELEASE@\0"
+
+#define VER_PRODUCTVERSION          @VER_MAJOR@, at VER_MINOR@,0,0
+#define VER_PRODUCTVERSION_STR      "@VER_MAJOR at .@VER_MINOR at .@VER_RELEASE@\0"
+
+#define VER_PRIVATEBUILD	VS_FF_PRIVATEBUILD
+#define VER_PRERELEASE		VS_FF_PRERELEASE
+#define VER_DEBUG		VS_FF_DEBUG
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION    	VER_FILEVERSION
+PRODUCTVERSION 	VER_PRODUCTVERSION
+FILEFLAGSMASK  	VS_FFI_FILEFLAGSMASK
+FILEFLAGS      	(VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
+FILEOS         	VOS__WINDOWS32
+FILETYPE       	VFT_APP
+FILESUBTYPE    	VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",      "GRASS Development Team"
+            VALUE "FileDescription",  "GRASS @VER_MAJOR@"
+            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "LegalCopyright",   "Copyright GRASS Development Team"
+            VALUE "OriginalFilename", "@CMD at .exe"
+            VALUE "ProductName",      "GRASS @VER_MAJOR@"
+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END