[commit] r1658 - in trunk: GME/Console GME/ConstraintManager GME/Core GME/GMEActiveBrowser GME/Gme GME/Meta GME/Mga GME/MgaUtil GME/ObjectInspector GME/PanningView GME/Parser GME/PartBrowser GME/Search GME/XmlBackEnd Install/Build
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Nov 4 09:02:11 CDT 2011
Author: ksmyth
Date: Fri Nov 4 09:02:10 2011
New Revision: 1658
Log:
Add version info to dlls
Modified:
trunk/GME/Console/Console.rc
trunk/GME/ConstraintManager/ConstraintManager.rc
trunk/GME/Core/Core.rc
trunk/GME/GMEActiveBrowser/GMEActiveBrowser.rc
trunk/GME/Gme/GME.rc
trunk/GME/Gme/GME.vcxproj
trunk/GME/Gme/GME.vcxproj.filters
trunk/GME/Gme/GMEVersion.h
trunk/GME/Gme/GMEVersion.h.tmpl
trunk/GME/Meta/Meta.rc
trunk/GME/Mga/Mga.rc
trunk/GME/MgaUtil/MgaUtil.rc
trunk/GME/ObjectInspector/ObjectInspector.rc
trunk/GME/PanningView/PanningView.rc
trunk/GME/Parser/Parser.rc
trunk/GME/PartBrowser/PartBrowser.rc
trunk/GME/Search/Search.rc
trunk/GME/XmlBackEnd/XmlBackEnd.rc
trunk/Install/Build/build.py
trunk/Install/Build/prefs.py
Modified: trunk/GME/Console/Console.rc
==============================================================================
--- trunk/GME/Console/Console.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Console/Console.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -53,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +72,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "Console ActiveX Control Module"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "Console"
VALUE "LegalCopyright", "Copyright (C) 2004"
VALUE "OriginalFilename", "Console.OCX"
VALUE "ProductName", "Console ActiveX Control Module"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/ConstraintManager/ConstraintManager.rc
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintManager.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/ConstraintManager/ConstraintManager.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -53,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -70,12 +71,12 @@
BLOCK "040904B0"
BEGIN
VALUE "FileDescription", "ConstraintManager Module"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "ConstraintManager"
VALUE "LegalCopyright", "Copyright 2002"
VALUE "OriginalFilename", "ConstraintManager.DLL"
VALUE "ProductName", "ConstraintManager Module"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/Core/Core.rc
==============================================================================
--- trunk/GME/Core/Core.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Core/Core.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,8 +55,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -72,12 +73,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "Core Module\0"
- VALUE "FileVersion", "1, 0, 0, 1\0"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "Core\0"
VALUE "LegalCopyright", "Copyright 1999\0"
VALUE "OriginalFilename", "Core.DLL\0"
VALUE "ProductName", "Core Module\0"
- VALUE "ProductVersion", "1, 0, 0, 1\0"
+ VALUE "ProductVersion", GME_VERSION_STR
VALUE "OLESelfRegister", "\0"
END
END
Modified: trunk/GME/GMEActiveBrowser/GMEActiveBrowser.rc
==============================================================================
--- trunk/GME/GMEActiveBrowser/GMEActiveBrowser.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/GMEActiveBrowser/GMEActiveBrowser.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -51,8 +52,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,12 +70,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "GMEActiveBrowser ActiveX Control Module"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "GMEActiveBrowser"
VALUE "LegalCopyright", "Copyright (C) 2001"
VALUE "OriginalFilename", "GMEActiveBrowser.OCX"
VALUE "ProductName", "GMEActiveBrowser ActiveX Control Module"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/Gme/GME.rc
==============================================================================
--- trunk/GME/Gme/GME.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Gme/GME.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -1067,8 +1067,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1084,12 +1084,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "GME"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "GME"
VALUE "LegalCopyright", "Copyright (C) 1999-2011 ISIS, Vanderbilt University"
VALUE "OriginalFilename", "GME.EXE"
VALUE "ProductName", "GME Application"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Gme/GME.vcxproj Fri Nov 4 09:02:10 2011 (r1658)
@@ -359,6 +359,7 @@
<None Include="GME.exe.config">
<SubType>Designer</SubType>
</None>
+ <None Include="GMEVersion.h.tmpl" />
<None Include="res\atomport.bmp" />
<None Include="res\bitmap1.bmp" />
<None Include="res\bitmap_l.bmp" />
Modified: trunk/GME/Gme/GME.vcxproj.filters
==============================================================================
--- trunk/GME/Gme/GME.vcxproj.filters Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Gme/GME.vcxproj.filters Fri Nov 4 09:02:10 2011 (r1658)
@@ -362,6 +362,9 @@
<None Include="GME.reg" />
<None Include="..\..\Install\GME.wxs" />
<None Include="GME.exe.config" />
+ <None Include="GMEVersion.h.tmpl">
+ <Filter>Header Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AnnotatorEventSink.h">
Modified: trunk/GME/Gme/GMEVersion.h
==============================================================================
--- trunk/GME/Gme/GMEVersion.h Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Gme/GMEVersion.h Fri Nov 4 09:02:10 2011 (r1658)
@@ -4,17 +4,27 @@
#define _GMEVERSION_H_
#define GME_VERSION_MAJOR 11 // MAJOR = Last two digits of Year
-#define GME_VERSION_MINOR 7 // MINOR = Month
-#define GME_VERSION_PLEVEL 28 // PATCH LEVEL = Day
+#define GME_VERSION_MINOR 11 // MINOR = Month
+#define GME_VERSION_PLEVEL 3 // PATCH LEVEL = Day
+#define GME_VERSION_BUILD 0 // BUILD = Jenkins build number (0 for official releases)
#define _VERSION_STRING2(x) #x
#define _VERSION_STRING(x) _VERSION_STRING2(x)
#define _VERSION_STRING_CON2(x, y) _VERSION_STRING2(x##y)
#define _VERSION_STRING_CON(x, y) _VERSION_STRING_CON2(x, y)
+#if GME_VERSION_BUILD == 0
#define GME_VERSION_STR _VERSION_STRING(GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL)
+#else
+#define GME_VERSION_STR _VERSION_STRING(GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL.GME_VERSION_BUILD)
+#endif
+#if GME_VERSION_BUILD == 0
#define GME_VERSION_ID _VERSION_STRING_CON(Release r, GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL)
+#else
+#define GME_VERSION_ID _VERSION_STRING_CON(Release r, GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL.GME_VERSION_BUILD)
+#endif
+#define GME_VERSION_RC GME_VERSION_MAJOR,GME_VERSION_MINOR,GME_VERSION_PLEVEL,GME_VERSION_BUILD
#endif // !defined(_GMEVERSION_H_)
Modified: trunk/GME/Gme/GMEVersion.h.tmpl
==============================================================================
--- trunk/GME/Gme/GMEVersion.h.tmpl Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Gme/GMEVersion.h.tmpl Fri Nov 4 09:02:10 2011 (r1658)
@@ -6,15 +6,25 @@
#define GME_VERSION_MAJOR %d // MAJOR = Last two digits of Year
#define GME_VERSION_MINOR %d // MINOR = Month
#define GME_VERSION_PLEVEL %d // PATCH LEVEL = Day
+#define GME_VERSION_BUILD %d // BUILD = Jenkins build number (0 for official releases)
#define _VERSION_STRING2(x) #x
#define _VERSION_STRING(x) _VERSION_STRING2(x)
#define _VERSION_STRING_CON2(x, y) _VERSION_STRING2(x##y)
#define _VERSION_STRING_CON(x, y) _VERSION_STRING_CON2(x, y)
+#if GME_VERSION_BUILD == 0
#define GME_VERSION_STR _VERSION_STRING(GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL)
+#else
+#define GME_VERSION_STR _VERSION_STRING(GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL.GME_VERSION_BUILD)
+#endif
+#if GME_VERSION_BUILD == 0
#define GME_VERSION_ID _VERSION_STRING_CON(Release r, GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL)
+#else
+#define GME_VERSION_ID _VERSION_STRING_CON(Release r, GME_VERSION_MAJOR.GME_VERSION_MINOR.GME_VERSION_PLEVEL.GME_VERSION_BUILD)
+#endif
+#define GME_VERSION_RC GME_VERSION_MAJOR,GME_VERSION_MINOR,GME_VERSION_PLEVEL,GME_VERSION_BUILD
#endif // !defined(_GMEVERSION_H_)
Modified: trunk/GME/Meta/Meta.rc
==============================================================================
--- trunk/GME/Meta/Meta.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Meta/Meta.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,8 +55,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -72,12 +73,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "Meta Module\0"
- VALUE "FileVersion", "1, 0, 0, 1\0"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "Meta\0"
VALUE "LegalCopyright", "Copyright 2000-2004\0"
VALUE "OriginalFilename", "Meta.DLL\0"
VALUE "ProductName", "Meta Module\0"
- VALUE "ProductVersion", "1, 0, 0, 1\0"
+ VALUE "ProductVersion", GME_VERSION_STR
VALUE "OLESelfRegister", "\0"
END
END
Modified: trunk/GME/Mga/Mga.rc
==============================================================================
--- trunk/GME/Mga/Mga.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Mga/Mga.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,8 +55,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -72,12 +73,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "Mga Module\0"
- VALUE "FileVersion", "1, 0, 0, 1\0"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "Mga\0"
VALUE "LegalCopyright", "Copyright 1999\0"
VALUE "OriginalFilename", "Mga.DLL\0"
VALUE "ProductName", "Mga Module\0"
- VALUE "ProductVersion", "1, 0, 0, 1\0"
+ VALUE "ProductVersion", GME_VERSION_STR
VALUE "OLESelfRegister", "\0"
END
END
Modified: trunk/GME/MgaUtil/MgaUtil.rc
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/MgaUtil/MgaUtil.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -536,8 +537,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -553,12 +554,12 @@
BLOCK "040904B0"
BEGIN
VALUE "FileDescription", "MgaUtil DLL"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "MgaUtil"
VALUE "LegalCopyright", "Copyright (C) 2000-2004"
VALUE "OriginalFilename", "MgaUtil.DLL"
VALUE "ProductName", "MgaUtil Dynamic Link Library"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/ObjectInspector/ObjectInspector.rc
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspector.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/ObjectInspector/ObjectInspector.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -53,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +72,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "ObjectInspector ActiveX Control Module"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "ObjectInspector"
VALUE "LegalCopyright", "Copyright (C) 2001"
VALUE "OriginalFilename", "ObjectInspector.OCX"
VALUE "ProductName", "ObjectInspector ActiveX Control Module"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/PanningView/PanningView.rc
==============================================================================
--- trunk/GME/PanningView/PanningView.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/PanningView/PanningView.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -53,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +72,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "PanningView Component"
- VALUE "FileVersion", "1.0.0.1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "PanningView.ocx"
VALUE "LegalCopyright", "Copyright (C) Vanderbilt University"
VALUE "OriginalFilename", "PanningView.ocx"
VALUE "ProductName", "PanningView Component"
- VALUE "ProductVersion", "1.0.0.1"
+ VALUE "FileVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/Parser/Parser.rc
==============================================================================
--- trunk/GME/Parser/Parser.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Parser/Parser.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -54,8 +55,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -72,12 +73,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "Parser Module\0"
- VALUE "FileVersion", "1, 0, 0, 1\0"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "Parser\0"
VALUE "LegalCopyright", "Copyright 2000-2004\0"
VALUE "OriginalFilename", "Parser.DLL\0"
VALUE "ProductName", "Parser Module\0"
- VALUE "ProductVersion", "1, 0, 0, 1\0"
+ VALUE "ProductVersion", GME_VERSION_STR
VALUE "OLESelfRegister", "\0"
END
END
Modified: trunk/GME/PartBrowser/PartBrowser.rc
==============================================================================
--- trunk/GME/PartBrowser/PartBrowser.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/PartBrowser/PartBrowser.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -53,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +72,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "PartBrowser Component"
- VALUE "FileVersion", "1.0.0.1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "PartBrowser.ocx"
VALUE "LegalCopyright", "2008 (c) ISIS, Vanderbilt University. All rights reserved."
VALUE "OriginalFilename", "PartBrowser.ocx"
VALUE "ProductName", "GME"
- VALUE "ProductVersion", "1.0.0.1"
+ VALUE "FileVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/Search/Search.rc
==============================================================================
--- trunk/GME/Search/Search.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/Search/Search.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -51,8 +52,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,12 +70,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "Search ActiveX Control Module"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "Search"
VALUE "LegalCopyright", "Copyright (C) 2002"
VALUE "OriginalFilename", "Search.OCX"
VALUE "ProductName", "Search ActiveX Control Module"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.rc
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.rc Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.rc Fri Nov 4 09:02:10 2011 (r1658)
@@ -11,6 +11,7 @@
#include "targetver.h"
#endif
#include "afxres.h"
+#include "..\GME\GMEVersion.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -57,8 +58,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -74,12 +75,12 @@
BLOCK "040904B0"
BEGIN
VALUE "FileDescription", "XmlBackEnd Module"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", GME_VERSION_STR
VALUE "InternalName", "XmlBackEnd"
VALUE "LegalCopyright", "Copyright 2004"
VALUE "OriginalFilename", "XmlBackEnd.DLL"
VALUE "ProductName", "XmlBackEnd Module"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", GME_VERSION_STR
END
END
BLOCK "VarFileInfo"
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/Install/Build/build.py Fri Nov 4 09:02:10 2011 (r1658)
@@ -85,7 +85,7 @@
with file(os.path.join(GME_ROOT, 'GME/Gme/GMEVersion.h.tmpl')) as template:
template_text = "".join(file.readlines(template))
with file(os.path.join(GME_ROOT, 'GME/Gme/GMEVersion.h'), 'w') as header:
- header.write(template_text % (prefs["version_major"], prefs["version_minor"], prefs["version_patch"]))
+ header.write(template_text % (prefs["version_major"], prefs["version_minor"], prefs["version_patch"], prefs["version_build"]))
def compile_GME():
"Compile GME core components"
@@ -296,8 +296,8 @@
-i, --include=NUM include build step 'NUM' explicitly
-x, --exclude=NUM exclude build step 'NUM' explicitly
- -V, --version=MAJOR.MINOR.PATCHLEVEL
- set build version (default: %d.%d.%d)
+ -V, --version=MAJOR.MINOR.PATCHLEVEL.BUILD
+ set build version (default: %d.%d.%d.%d)
-a, --arch=ARCH set architecture (x64 or x86)
\tBuild steps:
@@ -311,6 +311,7 @@
prefs["version_major"],
prefs["version_minor"],
prefs["version_patch"],
+ prefs["version_build"],
"\n\t".join([str(build_steps.index(s)) + ": " + s.__doc__ for s in build_steps])
)
@@ -345,10 +346,11 @@
if val not in exclude_steps:
exclude_steps.append(step)
if opt in ("-V", "--version"):
- (M, m, p) = val.split(".")
+ (M, m, p, b) = val.split(".")
prefs["version_major"] = int(M)
prefs["version_minor"] = int(m)
prefs["version_patch"] = int(p)
+ prefs["version_build"] = int(b)
if opt in ("-a", "--arch"):
prefs["arch"] = val
@@ -359,7 +361,8 @@
prefs["version_string"] = ".".join([str(prefs["version_major"]),
str(prefs["version_minor"]),
- str(prefs["version_patch"])])
+ str(prefs["version_patch"])] +
+ ( [ str(prefs["version_build"]) ] if prefs["version_build"] != 0 else [] ))
print "Building GME version " + prefs["version_string"] + " " + prefs["arch"]
Modified: trunk/Install/Build/prefs.py
==============================================================================
--- trunk/Install/Build/prefs.py Wed Nov 2 16:22:42 2011 (r1657)
+++ trunk/Install/Build/prefs.py Fri Nov 4 09:02:10 2011 (r1658)
@@ -17,5 +17,6 @@
"version_major" : (time.localtime()[0] - 2000),
"version_minor" : time.localtime()[1],
"version_patch" : time.localtime()[2],
+ "version_build" : 0,
"arch" : "x86",
}
\ No newline at end of file
More information about the gme-commit
mailing list