GNOME.org
 

[gtkmm] Do not hard-code API version in resource files

commit 61fc92719b6ac64e90ba091a1ca410074801ac3e
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 13:20:42 2009 +0200

    Do not hard-code API version in resource files
    
    * MSVC_Net200[58]/atkmm/atkmm.rc.in: Use newer @PACKAGE_VERSION@
    substitution in place of @VERSION    Substitute @ATKMM_MODULE_NAME@
    instead of hardcoding the API version.  Replace @GTKMM_*_VERSION@
    substitutions with their @ATKMM_*_VERSION@ equivalents.
    * MSVC_Net200[58]/gdkmm/gdkmm.rc.in: Use newer @PACKAGE_VERSION@
    substitution in place of @VERSION    Substitute @GDKMM_MODULE_NAME@
    instead of hardcoding the API version.  Replace @GTKMM_*_VERSION@
    substitutions with their @GDKMM_*_VERSION@ equivalents.
    * MSVC_Net200[58]/gtkmm/gtkmm.rc.in: Use newer @PACKAGE_VERSION@
    substitution in place of @VERSION    Substitute @GTKMM_MODULE_NAME@
    instead of hardcoding the API version.

 ChangeLog                      |   16 ++++++++++++++++
 MSVC_Net2005/atkmm/atkmm.rc.in |   14 +++++++-------
 MSVC_Net2005/gdkmm/gdkmm.rc.in |   14 +++++++-------
 MSVC_Net2005/gtkmm/gtkmm.rc.in |    8 ++++----
 MSVC_Net2008/atkmm/atkmm.rc.in |   14 +++++++-------
 MSVC_Net2008/gdkmm/gdkmm.rc.in |   14 +++++++-------
 MSVC_Net2008/gtkmm/gtkmm.rc.in |    8 ++++----
 7 files changed, 52 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e3b5a83..95d033b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2009-08-20  Daniel Elstner  <danielk openismus com>
 
+	Do not hard-code API version in resource files
+
+	* MSVC_Net200[58]/atkmm/atkmm.rc.in: Use newer @PACKAGE_VERSION@
+	substitution in place of @VERSION    Substitute @ATKMM_MODULE_NAME@
+	instead of hardcoding the API version.  Replace @GTKMM_*_VERSION@
+	substitutions with their @ATKMM_*_VERSION@ equivalents.
+	* MSVC_Net200[58]/gdkmm/gdkmm.rc.in: Use newer @PACKAGE_VERSION@
+	substitution in place of @VERSION    Substitute @GDKMM_MODULE_NAME@
+	instead of hardcoding the API version.  Replace @GTKMM_*_VERSION@
+	substitutions with their @GDKMM_*_VERSION@ equivalents.
+	* MSVC_Net200[58]/gtkmm/gtkmm.rc.in: Use newer @PACKAGE_VERSION@
+	substitution in place of @VERSION    Substitute @GTKMM_MODULE_NAME@
+	instead of hardcoding the API version.
+
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
 	Substitute API version in filenames dynamically
 
 	* atk/atkmm.pc.in: Rename file from atk/atkmm-1.6.pc.in.
diff --git a/MSVC_Net2005/atkmm/atkmm.rc.in b/MSVC_Net2005/atkmm/atkmm.rc.in
index 7b0739a..1478fd2 100755
--- a/MSVC_Net2005/atkmm/atkmm.rc.in
+++ b/MSVC_Net2005/atkmm/atkmm.rc.in
@@ -33,8 +33,8 @@ END
 #endif    // APSTUDIO_INVOKED
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
- PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
+ FILEVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
+ PRODUCTVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -50,12 +50,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
-            VALUE "FileDescription", "The official C++ wrapper for atk"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileDescription", "The official C++ binding for ATK"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "atkmm-1.6"
-            VALUE "ProductName", "gtkmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "OriginalFilename", "@ATKMM_MODULE_NAME  dll"
+            VALUE "ProductName", "atkmm"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2005/gdkmm/gdkmm.rc.in b/MSVC_Net2005/gdkmm/gdkmm.rc.in
index 0fca432..d6cccff 100755
--- a/MSVC_Net2005/gdkmm/gdkmm.rc.in
+++ b/MSVC_Net2005/gdkmm/gdkmm.rc.in
@@ -33,8 +33,8 @@ END
 #endif    // APSTUDIO_INVOKED
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
- PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
+ FILEVERSION @GDKMM_MAJOR_VERSION@,@GDKMM_MINOR_VERSION@,@GDKMM_MICRO_VERSION@,1
+ PRODUCTVERSION @GDKMM_MAJOR_VERSION@,@GDKMM_MINOR_VERSION@,@GDKMM_MICRO_VERSION@,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -50,12 +50,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
-            VALUE "FileDescription", "The official C++ wrapper for gdk"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileDescription", "The official C++ binding for GDK"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "gdkmm-2.4"
-            VALUE "ProductName", "gtkmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "OriginalFilename", "@GDKMM_MODULE_NAME  dll"
+            VALUE "ProductName", "gdkmm"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2005/gtkmm/gtkmm.rc.in b/MSVC_Net2005/gtkmm/gtkmm.rc.in
index 153e889..e2fa251 100755
--- a/MSVC_Net2005/gtkmm/gtkmm.rc.in
+++ b/MSVC_Net2005/gtkmm/gtkmm.rc.in
@@ -50,12 +50,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
-            VALUE "FileDescription", "The official C++ wrapper for gtk+"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileDescription", "The official C++ binding for GTK+"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "gtkmm-2.4"
+            VALUE "OriginalFilename", "@GTKMM_MODULE_NAME  dll"
             VALUE "ProductName", "gtkmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/atkmm/atkmm.rc.in b/MSVC_Net2008/atkmm/atkmm.rc.in
index 7b0739a..1478fd2 100644
--- a/MSVC_Net2008/atkmm/atkmm.rc.in
+++ b/MSVC_Net2008/atkmm/atkmm.rc.in
@@ -33,8 +33,8 @@ END
 #endif    // APSTUDIO_INVOKED
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
- PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
+ FILEVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
+ PRODUCTVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -50,12 +50,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
-            VALUE "FileDescription", "The official C++ wrapper for atk"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileDescription", "The official C++ binding for ATK"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "atkmm-1.6"
-            VALUE "ProductName", "gtkmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "OriginalFilename", "@ATKMM_MODULE_NAME  dll"
+            VALUE "ProductName", "atkmm"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/gdkmm/gdkmm.rc.in b/MSVC_Net2008/gdkmm/gdkmm.rc.in
index 0fca432..d6cccff 100644
--- a/MSVC_Net2008/gdkmm/gdkmm.rc.in
+++ b/MSVC_Net2008/gdkmm/gdkmm.rc.in
@@ -33,8 +33,8 @@ END
 #endif    // APSTUDIO_INVOKED
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
- PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1
+ FILEVERSION @GDKMM_MAJOR_VERSION@,@GDKMM_MINOR_VERSION@,@GDKMM_MICRO_VERSION@,1
+ PRODUCTVERSION @GDKMM_MAJOR_VERSION@,@GDKMM_MINOR_VERSION@,@GDKMM_MICRO_VERSION@,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -50,12 +50,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
-            VALUE "FileDescription", "The official C++ wrapper for gdk"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileDescription", "The official C++ binding for GDK"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "gdkmm-2.4"
-            VALUE "ProductName", "gtkmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "OriginalFilename", "@GDKMM_MODULE_NAME  dll"
+            VALUE "ProductName", "gdkmm"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/gtkmm/gtkmm.rc.in b/MSVC_Net2008/gtkmm/gtkmm.rc.in
index 153e889..e2fa251 100644
--- a/MSVC_Net2008/gtkmm/gtkmm.rc.in
+++ b/MSVC_Net2008/gtkmm/gtkmm.rc.in
@@ -50,12 +50,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
-            VALUE "FileDescription", "The official C++ wrapper for gtk+"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileDescription", "The official C++ binding for GTK+"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "gtkmm-2.4"
+            VALUE "OriginalFilename", "@GTKMM_MODULE_NAME  dll"
             VALUE "ProductName", "gtkmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]