LADI
/
cogl
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <neil@linux.intel.com>
This commit is contained in:
Chun-wei Fan 2013-08-28 10:37:05 +08:00 committed by Neil Roberts
parent 24f8d20ada
commit 98340c44ba
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cogl-pango/cogl-pango.rc.in
View File

@ -1,8 +1,8 @@
#include <winver.h> #include <winver.h>
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 FILEVERSION 1,@COGL_1_MINOR_VERSION@,@COGL_1_MICRO_VERSION@,0
PRODUCTVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 PRODUCTVERSION 1,@COGL_1_MINOR_VERSION@,@COGL_1_MICRO_VERSION@,0
FILEFLAGSMASK 0 FILEFLAGSMASK 0
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN BEGIN
VALUE "CompanyName", "Intel Corporation" VALUE "CompanyName", "Intel Corporation"
VALUE "FileDescription", "cogl-pango" VALUE "FileDescription", "cogl-pango"
VALUE "FileVersion", "@COGL_VERSION@.0" VALUE "FileVersion", "@COGL_1_VERSION@.0"
VALUE "InternalName", "libcogl-pango-2.0-@COGL_LT_AGE@" VALUE "InternalName", "libcogl-pango-1.0-@COGL_LT_AGE@"
VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation" 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 "ProductName", "cogl-pango"
VALUE "ProductVersion", "@COGL_VERSION@" VALUE "ProductVersion", "@COGL_1_VERSION@"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

12
cogl/cogl.rc.in
View File

@ -1,8 +1,8 @@
#include <winver.h> #include <winver.h>
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 FILEVERSION 1,@COGL_1_MINOR_VERSION@,@COGL_1_MICRO_VERSION@,0
PRODUCTVERSION 1,@COGL_MINOR_VERSION@,@COGL_MICRO_VERSION@,0 PRODUCTVERSION 1,@COGL_1_MINOR_VERSION@,@COGL_1_MICRO_VERSION@,0
FILEFLAGSMASK 0 FILEFLAGSMASK 0
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN BEGIN
VALUE "CompanyName", "Intel Corporation" VALUE "CompanyName", "Intel Corporation"
VALUE "FileDescription", "cogl" VALUE "FileDescription", "cogl"
VALUE "FileVersion", "@COGL_VERSION@.0" VALUE "FileVersion", "@COGL_1_VERSION@.0"
VALUE "InternalName", "libcogl-2.0-@COGL_LT_AGE@" VALUE "InternalName", "libcogl-1.0-@COGL_LT_AGE@"
VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation" 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 "ProductName", "cogl"
VALUE "ProductVersion", "@COGL_VERSION@" VALUE "ProductVersion", "@COGL_1_VERSION@"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"