From a3c7be1a9c0271bbaae67e6b406e0af2a11d05ad Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 19 Jun 2013 11:20:03 -0600
Subject: [PATCH] win32: fix version info in executables

Also, remove the need for a cron job that patches the version
number in resource and manifest files.
---
 racket/src/worksp/gracket/gracket.manifest | 26 +++++++++-------------
 racket/src/worksp/gracket/gracket.rc       | 19 ++++++----------
 racket/src/worksp/mzcom/mzcom.rc           | 10 +++++----
 racket/src/worksp/racket/racket.manifest   | 26 +++++++++-------------
 racket/src/worksp/racket/racket.rc         | 19 ++++++----------
 racket/src/worksp/racket/racket.vcproj     |  1 +
 racket/src/worksp/starters/start.rc        | 13 +++++------
 7 files changed, 47 insertions(+), 67 deletions(-)

diff --git a/racket/src/worksp/gracket/gracket.manifest b/racket/src/worksp/gracket/gracket.manifest
index 55a781c9a5..314024aa0a 100644
--- a/racket/src/worksp/gracket/gracket.manifest
+++ b/racket/src/worksp/gracket/gracket.manifest
@@ -1,28 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="5.3.5.1"
-                    processorArchitecture="*"
-                    name="Org.Racket-Lang.GRacket"
-                    type="win32" />
-  <description>GRacket: Graphical Racket.</description>
-  <!-- Avoid UAC -->
-  <!--
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel level="asInvoker"
+				 uiAccess="false">
+	</requestedExecutionLevel>
       </requestedPrivileges>
     </security>
   </trustInfo>
-  -->
   <dependency>
     <dependentAssembly>
       <assemblyIdentity type="win32"
-                        name="Microsoft.Windows.Common-Controls"
-                        version="6.0.0.0"
-                        processorArchitecture="*"
-                        publicKeyToken="6595b64144ccf1df"
-                        language="*" />
+			name="Microsoft.Windows.Common-Controls"
+			version="6.0.0.0"
+			processorArchitecture="*"
+			publicKeyToken="6595b64144ccf1df"
+			language="*">
+      </assemblyIdentity>
     </dependentAssembly>
   </dependency>
 </assembly>
diff --git a/racket/src/worksp/gracket/gracket.rc b/racket/src/worksp/gracket/gracket.rc
index 6b6e779964..21a8eec9c1 100644
--- a/racket/src/worksp/gracket/gracket.rc
+++ b/racket/src/worksp/gracket/gracket.rc
@@ -1,3 +1,6 @@
+#include <windows.h>
+#include "../../racket/src/schvers.h"
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -11,8 +14,8 @@ APPLICATION             ICON    DISCARDABLE     "gracket.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,5,1
- PRODUCTVERSION 5,3,5,1
+ FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
+ PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -30,11 +33,11 @@ BEGIN
             VALUE "CompanyName", "PLT Design Inc.\0"
             VALUE "FileDescription", "Racket GUI application\0"
             VALUE "InternalName", "GRacket\0"
-            VALUE "FileVersion", "5, 3, 5, 1\0"
+            VALUE "FileVersion", MZSCHEME_VERSION "\0"
             VALUE "LegalCopyright", "Copyright � 1995-2013\0"
             VALUE "OriginalFilename", "GRacket.exe\0"
             VALUE "ProductName", "Racket\0"
-            VALUE "ProductVersion", "5, 3, 5, 1\0"
+            VALUE "ProductVersion", MZSCHEME_VERSION "\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -43,12 +46,4 @@ BEGIN
     END
 END
 
-#ifndef RT_MANIFEST
-#define RT_MANIFEST 24
-#endif
-
-#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
-#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
-#endif
-
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gracket.manifest" 
diff --git a/racket/src/worksp/mzcom/mzcom.rc b/racket/src/worksp/mzcom/mzcom.rc
index 2e338f3dba..92b2f647c6 100644
--- a/racket/src/worksp/mzcom/mzcom.rc
+++ b/racket/src/worksp/mzcom/mzcom.rc
@@ -1,6 +1,8 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
+#include <windows.h>
+#include "../../racket/src/schvers.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -53,8 +55,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,5,1
- PRODUCTVERSION 5,3,5,1
+ FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
+ PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +72,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "MzCOM Module"
-            VALUE "FileVersion", "5, 3, 5, 1"
+            VALUE "FileVersion", MZSCHEME_VERSION "\0"
             VALUE "InternalName", "MzCOM"
             VALUE "LegalCopyright", "Copyright 2000-2013 PLT (Paul Steckler)"
             VALUE "OriginalFilename", "MzCOM.EXE"
             VALUE "ProductName", "MzCOM Module"
-            VALUE "ProductVersion", "5, 3, 5, 1"
+            VALUE "ProductVersion", MZSCHEME_VERSION "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/racket/src/worksp/racket/racket.manifest b/racket/src/worksp/racket/racket.manifest
index 1e02ee52ba..314024aa0a 100644
--- a/racket/src/worksp/racket/racket.manifest
+++ b/racket/src/worksp/racket/racket.manifest
@@ -1,28 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="5.3.5.1"
-                    processorArchitecture="*"
-                    name="Org.Racket-Lang.Racket"
-                    type="win32" />
-  <description>Racket.</description>
-  <!-- Avoid UAC -->
-  <!--
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel level="asInvoker"
+				 uiAccess="false">
+	</requestedExecutionLevel>
       </requestedPrivileges>
     </security>
   </trustInfo>
-  -->
   <dependency>
     <dependentAssembly>
       <assemblyIdentity type="win32"
-                        name="Microsoft.Windows.Common-Controls"
-                        version="6.0.0.0"
-                        processorArchitecture="*"
-                        publicKeyToken="6595b64144ccf1df"
-                        language="*" />
+			name="Microsoft.Windows.Common-Controls"
+			version="6.0.0.0"
+			processorArchitecture="*"
+			publicKeyToken="6595b64144ccf1df"
+			language="*">
+      </assemblyIdentity>
     </dependentAssembly>
   </dependency>
 </assembly>
diff --git a/racket/src/worksp/racket/racket.rc b/racket/src/worksp/racket/racket.rc
index b544ed86bb..c4fbb86217 100644
--- a/racket/src/worksp/racket/racket.rc
+++ b/racket/src/worksp/racket/racket.rc
@@ -1,3 +1,6 @@
+#include <windows.h>
+#include "../../racket/src/schvers.h"
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -11,8 +14,8 @@ APPLICATION             ICON    DISCARDABLE     "racket.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,5,1
- PRODUCTVERSION 5,3,5,1
+ FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
+ PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -30,11 +33,11 @@ BEGIN
             VALUE "CompanyName", "PLT Design Inc.\0"
             VALUE "FileDescription", "Racket application\0"
             VALUE "InternalName", "Racket\0"
-            VALUE "FileVersion", "5, 3, 5, 1\0"
+            VALUE "FileVersion", MZSCHEME_VERSION "\0"
             VALUE "LegalCopyright", "Copyright �� 1995-2013\0"
             VALUE "OriginalFilename", "racket.exe\0"
             VALUE "ProductName", "Racket\0"
-            VALUE "ProductVersion", "5, 3, 5, 1\0"
+            VALUE "ProductVersion", MZSCHEME_VERSION "\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -43,12 +46,4 @@ BEGIN
     END
 END
 
-#ifndef RT_MANIFEST
-#define RT_MANIFEST 24
-#endif
-
-#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
-#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
-#endif
-
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "racket.manifest" 
diff --git a/racket/src/worksp/racket/racket.vcproj b/racket/src/worksp/racket/racket.vcproj
index 77cdc6e614..4ccfde2f47 100644
--- a/racket/src/worksp/racket/racket.vcproj
+++ b/racket/src/worksp/racket/racket.vcproj
@@ -338,6 +338,7 @@
 				OutputFile="..\..\..\RacketCGC.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\..\RacketCGC.pdb"
 				SubSystem="1"
diff --git a/racket/src/worksp/starters/start.rc b/racket/src/worksp/starters/start.rc
index 4c7238e4ff..5bc8624808 100644
--- a/racket/src/worksp/starters/start.rc
+++ b/racket/src/worksp/starters/start.rc
@@ -1,6 +1,5 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
+#include <windows.h>
+#include "../../racket/src/schvers.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -22,8 +21,8 @@ APPLICATION             ICON    DISCARDABLE     "mzstart.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,5,1
- PRODUCTVERSION 5,3,5,1
+ FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
+ PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,7 +44,7 @@ BEGIN
 #ifdef MZSTART
             VALUE "FileDescription", "Racket Launcher\0"
 #endif
-            VALUE "FileVersion", "5, 3, 5, 1\0"
+            VALUE "FileVersion", MZSCHEME_VERSION "\0"
 #ifdef MRSTART
             VALUE "InternalName", "mrstart\0"
 #endif
@@ -60,7 +59,7 @@ BEGIN
             VALUE "OriginalFilename", "MzStart.exe\0"
 #endif
             VALUE "ProductName", "Racket\0"
-            VALUE "ProductVersion", "5, 3, 5, 1\0"
+            VALUE "ProductVersion", MZSCHEME_VERSION "\0"
         END
     END
     BLOCK "VarFileInfo"