[Cogl] [PATCH][1.16]Fix the Windows Resource Files

[Fan Chun-wei]

Hi,

The templates for the Windows resource files (.rc.in) used wrong 
autotools variables for the versioning, so we would not have the correct 
Cogl-1.x versioning info when Cogl-1.x is released.  This patch remedies 
this by specifying the correct autotools variables in the templates so 
the correct versioning info will be filled in.

With blessings, thank you!
-------------- next part --------------
From b5f28ddefbf342d376857822d1f458626e997f58 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei at src.gnome.org>
Date: Wed, 28 Aug 2013 10:37:05 +0800
Subject: [PATCH] Fix the Windows Resource Files

The autotools variables to substitute for versioning in 1.16 is wrong, so we
have incorrect versioning info during a release as the variables are for
Cogl-2.x.  Fix this so we can have the correct versioning info for the
Cogl/Cogl-Pango DLLs during a release.
---
 cogl-pango/cogl-pango.rc.in | 12 ++++++------
 cogl/cogl.rc.in             | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cogl-pango/cogl-pango.rc.in b/cogl-pango/cogl-pango.rc.in
index 64242e4..ab8ff2d 100644
--- a/cogl-pango/cogl-pango.rc.in
+++ b/cogl-pango/cogl-pango.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
-  PRODUCTVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
+  FILEVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
+  PRODUCTVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
 	VALUE "CompanyName", "Intel Corporation"
 	VALUE "FileDescription", "cogl-pango"
-	VALUE "FileVersion", "@COGL_VERSION at .0"
-	VALUE "InternalName", "libcogl-pango-2.0- at COGL_LT_AGE@"
+	VALUE "FileVersion", "@COGL_1_VERSION at .0"
+	VALUE "InternalName", "libcogl-pango-1.0- at COGL_LT_AGE@"
 	VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation"
-	VALUE "OriginalFilename", "libcogl-pango-2.0- at COGL_LT_AGE@.dll"
+	VALUE "OriginalFilename", "libcogl-pango-1.0- at COGL_LT_AGE@.dll"
 	VALUE "ProductName", "cogl-pango"
-	VALUE "ProductVersion", "@COGL_VERSION@"
+	VALUE "ProductVersion", "@COGL_1_VERSION@"
       END
     END
     BLOCK "VarFileInfo"
diff --git a/cogl/cogl.rc.in b/cogl/cogl.rc.in
index 976c855..0911559 100644
--- a/cogl/cogl.rc.in
+++ b/cogl/cogl.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
-  PRODUCTVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
+  FILEVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
+  PRODUCTVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
 	VALUE "CompanyName", "Intel Corporation"
 	VALUE "FileDescription", "cogl"
-	VALUE "FileVersion", "@COGL_VERSION at .0"
-	VALUE "InternalName", "libcogl-2.0- at COGL_LT_AGE@"
+	VALUE "FileVersion", "@COGL_1_VERSION at .0"
+	VALUE "InternalName", "libcogl-1.0- at COGL_LT_AGE@"
 	VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation"
-	VALUE "OriginalFilename", "libcogl-2.0- at COGL_LT_AGE@.dll"
+	VALUE "OriginalFilename", "libcogl-1.0- at COGL_LT_AGE@.dll"
 	VALUE "ProductName", "cogl"
-	VALUE "ProductVersion", "@COGL_VERSION@"
+	VALUE "ProductVersion", "@COGL_1_VERSION@"
       END
     END
     BLOCK "VarFileInfo"
-- 
1.8.3.msysgit.0