Change CEF version number format to remove SVN dependency (issue #1580).

This commit is contained in:
Marshall Greenblatt
2015-03-16 19:34:35 -04:00
parent d17dc3e5de
commit 7acecd6b6b
14 changed files with 59 additions and 175 deletions

View File

@@ -95,8 +95,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_REVISION,0
PRODUCTVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_REVISION,0
FILEVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_COMMIT_NUMBER,0
PRODUCTVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_COMMIT_NUMBER,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -112,12 +112,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Chromium Embedded Framework (CEF) Dynamic Link Library"
VALUE "FileVersion", MAKE_STRING(CEF_VERSION_MAJOR) "." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION)
VALUE "FileVersion", CEF_VERSION
VALUE "InternalName", "libcef"
VALUE "LegalCopyright", "Copyright (C) " MAKE_STRING(COPYRIGHT_YEAR) " The Chromium Embedded Framework Authors"
VALUE "OriginalFilename", "libcef.dll"
VALUE "ProductName", "Chromium Embedded Framework (CEF) Dynamic Link Library"
VALUE "ProductVersion", MAKE_STRING(CEF_VERSION_MAJOR) "." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION)
VALUE "ProductVersion", CEF_VERSION
END
END
BLOCK "VarFileInfo"

View File

@@ -6,14 +6,10 @@
#include "include/cef_version.h"
#include <cstddef>
CEF_EXPORT int cef_build_revision() {
return CEF_REVISION;
}
CEF_EXPORT int cef_version_info(int entry) {
switch (entry) {
case 0: return CEF_VERSION_MAJOR;
case 1: return CEF_REVISION;
case 1: return CEF_COMMIT_NUMBER;
case 2: return CHROME_VERSION_MAJOR;
case 3: return CHROME_VERSION_MINOR;
case 4: return CHROME_VERSION_BUILD;
@@ -26,6 +22,7 @@ CEF_EXPORT const char* cef_api_hash(int entry) {
switch (entry) {
case 0: return CEF_API_HASH_PLATFORM;
case 1: return CEF_API_HASH_UNIVERSAL;
case 2: return CEF_COMMIT_HASH;
default: return NULL;
}
}