From 98340c44ba763d29eddf0800466d05f2300179db Mon Sep 17 00:00:00 2001 From: Chun-wei Fan 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. Reviewed-by: Neil Roberts --- 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 64242e454..ab8ff2dd5 100644 --- a/cogl-pango/cogl-pango.rc.in +++ b/cogl-pango/cogl-pango.rc.in @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 - PRODUCTVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 + FILEVERSION 1,@COGL_1_MINOR_VERSION@,@COGL_1_MICRO_VERSION@,0 + PRODUCTVERSION 1,@COGL_1_MINOR_VERSION@,@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@.0" - VALUE "InternalName", "libcogl-pango-2.0-@COGL_LT_AGE@" + VALUE "FileVersion", "@COGL_1_VERSION@.0" + VALUE "InternalName", "libcogl-pango-1.0-@COGL_LT_AGE@" VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation" - VALUE "OriginalFilename", "libcogl-pango-2.0-@COGL_LT_AGE@.dll" + VALUE "OriginalFilename", "libcogl-pango-1.0-@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 976c85507..091155948 100644 --- a/cogl/cogl.rc.in +++ b/cogl/cogl.rc.in @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 - PRODUCTVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 + FILEVERSION 1,@COGL_1_MINOR_VERSION@,@COGL_1_MICRO_VERSION@,0 + PRODUCTVERSION 1,@COGL_1_MINOR_VERSION@,@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@.0" - VALUE "InternalName", "libcogl-2.0-@COGL_LT_AGE@" + VALUE "FileVersion", "@COGL_1_VERSION@.0" + VALUE "InternalName", "libcogl-1.0-@COGL_LT_AGE@" VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation" - VALUE "OriginalFilename", "libcogl-2.0-@COGL_LT_AGE@.dll" + VALUE "OriginalFilename", "libcogl-1.0-@COGL_LT_AGE@.dll" VALUE "ProductName", "cogl" - VALUE "ProductVersion", "@COGL_VERSION@" + VALUE "ProductVersion", "@COGL_1_VERSION@" END END BLOCK "VarFileInfo"