win32: fix version info in executables

Also, remove the need for a cron job that patches the version
number in resource and manifest files.
This commit is contained in:
Matthew Flatt 2013-06-19 11:20:03 -06:00
parent 092db5414a
commit a3c7be1a9c
7 changed files with 47 additions and 67 deletions

View File

@ -1,28 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.3.5.1" <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
processorArchitecture="*"
name="Org.Racket-Lang.GRacket"
type="win32" />
<description>GRacket: Graphical Racket.</description>
<!-- Avoid UAC -->
<!--
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security> <security>
<requestedPrivileges> <requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false" /> <requestedExecutionLevel level="asInvoker"
uiAccess="false">
</requestedExecutionLevel>
</requestedPrivileges> </requestedPrivileges>
</security> </security>
</trustInfo> </trustInfo>
-->
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity type="win32" <assemblyIdentity type="win32"
name="Microsoft.Windows.Common-Controls" name="Microsoft.Windows.Common-Controls"
version="6.0.0.0" version="6.0.0.0"
processorArchitecture="*" processorArchitecture="*"
publicKeyToken="6595b64144ccf1df" publicKeyToken="6595b64144ccf1df"
language="*" /> language="*">
</assemblyIdentity>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
</assembly> </assembly>

View File

@ -1,3 +1,6 @@
#include <windows.h>
#include "../../racket/src/schvers.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Icon // Icon
@ -11,8 +14,8 @@ APPLICATION ICON DISCARDABLE "gracket.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,3,5,1 FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
PRODUCTVERSION 5,3,5,1 PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -30,11 +33,11 @@ BEGIN
VALUE "CompanyName", "PLT Design Inc.\0" VALUE "CompanyName", "PLT Design Inc.\0"
VALUE "FileDescription", "Racket GUI application\0" VALUE "FileDescription", "Racket GUI application\0"
VALUE "InternalName", "GRacket\0" VALUE "InternalName", "GRacket\0"
VALUE "FileVersion", "5, 3, 5, 1\0" VALUE "FileVersion", MZSCHEME_VERSION "\0"
VALUE "LegalCopyright", "Copyright © 1995-2013\0" VALUE "LegalCopyright", "Copyright © 1995-2013\0"
VALUE "OriginalFilename", "GRacket.exe\0" VALUE "OriginalFilename", "GRacket.exe\0"
VALUE "ProductName", "Racket\0" VALUE "ProductName", "Racket\0"
VALUE "ProductVersion", "5, 3, 5, 1\0" VALUE "ProductVersion", MZSCHEME_VERSION "\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -43,12 +46,4 @@ BEGIN
END END
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" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gracket.manifest"

View File

@ -1,6 +1,8 @@
// Microsoft Visual C++ generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "resource.h" #include "resource.h"
#include <windows.h>
#include "../../racket/src/schvers.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -53,8 +55,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,3,5,1 FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
PRODUCTVERSION 5,3,5,1 PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -70,12 +72,12 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "MzCOM Module" VALUE "FileDescription", "MzCOM Module"
VALUE "FileVersion", "5, 3, 5, 1" VALUE "FileVersion", MZSCHEME_VERSION "\0"
VALUE "InternalName", "MzCOM" VALUE "InternalName", "MzCOM"
VALUE "LegalCopyright", "Copyright 2000-2013 PLT (Paul Steckler)" VALUE "LegalCopyright", "Copyright 2000-2013 PLT (Paul Steckler)"
VALUE "OriginalFilename", "MzCOM.EXE" VALUE "OriginalFilename", "MzCOM.EXE"
VALUE "ProductName", "MzCOM Module" VALUE "ProductName", "MzCOM Module"
VALUE "ProductVersion", "5, 3, 5, 1" VALUE "ProductVersion", MZSCHEME_VERSION "\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -1,28 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.3.5.1" <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
processorArchitecture="*"
name="Org.Racket-Lang.Racket"
type="win32" />
<description>Racket.</description>
<!-- Avoid UAC -->
<!--
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security> <security>
<requestedPrivileges> <requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false" /> <requestedExecutionLevel level="asInvoker"
uiAccess="false">
</requestedExecutionLevel>
</requestedPrivileges> </requestedPrivileges>
</security> </security>
</trustInfo> </trustInfo>
-->
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity type="win32" <assemblyIdentity type="win32"
name="Microsoft.Windows.Common-Controls" name="Microsoft.Windows.Common-Controls"
version="6.0.0.0" version="6.0.0.0"
processorArchitecture="*" processorArchitecture="*"
publicKeyToken="6595b64144ccf1df" publicKeyToken="6595b64144ccf1df"
language="*" /> language="*">
</assemblyIdentity>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
</assembly> </assembly>

View File

@ -1,3 +1,6 @@
#include <windows.h>
#include "../../racket/src/schvers.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Icon // Icon
@ -11,8 +14,8 @@ APPLICATION ICON DISCARDABLE "racket.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,3,5,1 FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
PRODUCTVERSION 5,3,5,1 PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -30,11 +33,11 @@ BEGIN
VALUE "CompanyName", "PLT Design Inc.\0" VALUE "CompanyName", "PLT Design Inc.\0"
VALUE "FileDescription", "Racket application\0" VALUE "FileDescription", "Racket application\0"
VALUE "InternalName", "Racket\0" VALUE "InternalName", "Racket\0"
VALUE "FileVersion", "5, 3, 5, 1\0" VALUE "FileVersion", MZSCHEME_VERSION "\0"
VALUE "LegalCopyright", "Copyright <20>© 1995-2013\0" VALUE "LegalCopyright", "Copyright <20>© 1995-2013\0"
VALUE "OriginalFilename", "racket.exe\0" VALUE "OriginalFilename", "racket.exe\0"
VALUE "ProductName", "Racket\0" VALUE "ProductName", "Racket\0"
VALUE "ProductVersion", "5, 3, 5, 1\0" VALUE "ProductVersion", MZSCHEME_VERSION "\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -43,12 +46,4 @@ BEGIN
END END
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" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "racket.manifest"

View File

@ -338,6 +338,7 @@
OutputFile="..\..\..\RacketCGC.exe" OutputFile="..\..\..\RacketCGC.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\..\RacketCGC.pdb" ProgramDatabaseFile="..\..\..\RacketCGC.pdb"
SubSystem="1" SubSystem="1"

View File

@ -1,6 +1,5 @@
//Microsoft Developer Studio generated resource script. #include <windows.h>
// #include "../../racket/src/schvers.h"
#include "resource.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@ -22,8 +21,8 @@ APPLICATION ICON DISCARDABLE "mzstart.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,3,5,1 FILEVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
PRODUCTVERSION 5,3,5,1 PRODUCTVERSION MZSCHEME_VERSION_X,MZSCHEME_VERSION_Y,MZSCHEME_VERSION_Z,MZSCHEME_VERSION_W
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -45,7 +44,7 @@ BEGIN
#ifdef MZSTART #ifdef MZSTART
VALUE "FileDescription", "Racket Launcher\0" VALUE "FileDescription", "Racket Launcher\0"
#endif #endif
VALUE "FileVersion", "5, 3, 5, 1\0" VALUE "FileVersion", MZSCHEME_VERSION "\0"
#ifdef MRSTART #ifdef MRSTART
VALUE "InternalName", "mrstart\0" VALUE "InternalName", "mrstart\0"
#endif #endif
@ -60,7 +59,7 @@ BEGIN
VALUE "OriginalFilename", "MzStart.exe\0" VALUE "OriginalFilename", "MzStart.exe\0"
#endif #endif
VALUE "ProductName", "Racket\0" VALUE "ProductName", "Racket\0"
VALUE "ProductVersion", "5, 3, 5, 1\0" VALUE "ProductVersion", MZSCHEME_VERSION "\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"