[Scummvm-git-logs] scummvm master -> 8c6f9e5116dc6f46e166d8a32f9a9b905ea8634c
digitall
dgturner at iee.org
Fri Nov 16 10:14:41 CET 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8c6f9e5116 WIN32: Retrieve the version information for the resource script from base/internal_version.h
Commit: 8c6f9e5116dc6f46e166d8a32f9a9b905ea8634c
https://github.com/scummvm/scummvm/commit/8c6f9e5116dc6f46e166d8a32f9a9b905ea8634c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-16T09:14:37Z
Commit Message:
WIN32: Retrieve the version information for the resource script from base/internal_version.h
Changed paths:
R dists/scummvm.rc.in
base/internal_version.h
base/internal_version.h.in
base/version.cpp
devtools/update-version.pl
dists/scummvm.rc
diff --git a/base/internal_version.h b/base/internal_version.h
index 5a4b8ad..80f839f 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_FROM_BASE_VERSION_CPP
-#error This file may only be included by base/version.cpp
+#if !defined(INCLUDED_FROM_BASE_VERSION_CPP) && !defined(RC_INVOKED)
+#error This file may only be included by base/version.cpp or dists/scummvm.rc
#endif
// Reads revision number from file
@@ -16,4 +16,8 @@
#define SCUMMVM_REVISION
#endif
-#define SCUMMVM_VERSION "2.1.0git" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "2.1.0git"
+
+#define SCUMMVM_VER_MAJOR 2
+#define SCUMMVM_VER_MINOR 1
+#define SCUMMVM_VER_PATCH 0
diff --git a/base/internal_version.h.in b/base/internal_version.h.in
index e2b46f5..01a62cd 100644
--- a/base/internal_version.h.in
+++ b/base/internal_version.h.in
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_FROM_BASE_VERSION_CPP
-#error This file may only be included by base/version.cpp
+#if !defined(INCLUDED_FROM_BASE_VERSION_CPP) && !defined(RC_INVOKED)
+#error This file may only be included by base/version.cpp or dists/scummvm.rc
#endif
// Reads revision number from file
@@ -16,4 +16,8 @@
#define SCUMMVM_REVISION
#endif
-#define SCUMMVM_VERSION "@VERSION@" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "@VERSION@"
+
+#define SCUMMVM_VER_MAJOR @VER_MAJOR@
+#define SCUMMVM_VER_MINOR @VER_MINOR@
+#define SCUMMVM_VER_PATCH @VER_PATCH@
diff --git a/base/version.cpp b/base/version.cpp
index 4379529..1b9cfe4 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -55,18 +55,18 @@
* I don't know VC enough to be sure). And of course it must be robust enough
* to properly work in exports (i.e. release tar balls etc.).
*/
-const char *gScummVMVersion = SCUMMVM_VERSION;
+const char *gScummVMVersion = SCUMMVM_VERSION SCUMMVM_REVISION;
#ifdef __amigaos4__
-static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION " (" AMIGA_DATE ")";
+static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
#endif
#ifdef __PLAYSTATION2__
const char *gScummVMBuildDate = "Git Master"; /* ScummVM Git Master */
-const char *gScummVMVersionDate = SCUMMVM_VERSION " - PlayStation2";
-const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION " - PlayStation2";
+const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION " - PlayStation2";
+const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " - PlayStation2";
#else
const char *gScummVMBuildDate = __DATE__ " " __TIME__;
-const char *gScummVMVersionDate = SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
-const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
+const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
+const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
#endif
const char *gScummVMFeatures = ""
#ifdef TAINTED_BUILD
diff --git a/devtools/update-version.pl b/devtools/update-version.pl
index 75f6f0e..09db89d 100755
--- a/devtools/update-version.pl
+++ b/devtools/update-version.pl
@@ -34,7 +34,6 @@ my @subs_files = qw(
base/internal_version.h
dists/redhat/scummvm.spec
dists/redhat/scummvm-tools.spec
- dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
dists/macosx/Info.plist
dists/macosx/dockplugin/Info.plist
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index e7e0a92..9153c16 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -4,6 +4,8 @@
#include "config.h"
#endif
+#include "base/internal_version.h"
+
#define FILE 256
#define IDI_ICON 1001
#define IDI_COUNT 1002
@@ -79,8 +81,8 @@ pred.dic FILE "dists/pred.dic"
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION SCUMMVM_VER_MAJOR,SCUMMVM_VER_MINOR,SCUMMVM_VER_PATCH,0
+ PRODUCTVERSION SCUMMVM_VER_MAJOR,SCUMMVM_VER_MINOR,SCUMMVM_VER_PATCH,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -98,13 +100,13 @@ BEGIN
VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
VALUE "CompanyName", "scummvm.org\0"
VALUE "FileDescription", "http://www.scummvm.org/\0"
- VALUE "FileVersion", "2.1.0git\0"
+ VALUE "FileVersion", SCUMMVM_VERSION "\0"
VALUE "InternalName", "scummvm\0"
VALUE "LegalCopyright", "Copyright © 2001-2018 The ScummVM Team\0"
VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
VALUE "OriginalFilename", "scummvm.exe\0"
VALUE "ProductName", "ScummVM\0"
- VALUE "ProductVersion", "2.1.0git\0"
+ VALUE "ProductVersion", SCUMMVM_VERSION "\0"
END
END
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
deleted file mode 100644
index 3d5c21f..0000000
--- a/dists/scummvm.rc.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "winresrc.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define FILE 256
-#define IDI_ICON 1001
-#define IDI_COUNT 1002
-#define ID_GDF_XML __GDF_XML
-
-IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
-IDI_COUNT ICON DISCARDABLE "icons/count.ico"
-
-ID_GDF_XML DATA "dists/win32/scummvm.gdf.xml"
-
-scummclassic.zip FILE "gui/themes/scummclassic.zip"
-scummmodern.zip FILE "gui/themes/scummmodern.zip"
-#ifdef USE_TRANSLATION
-translations.dat FILE "gui/themes/translations.dat"
-#endif
-#ifdef USE_SDL_NET
-wwwroot.zip FILE "dists/networking/wwwroot.zip"
-#endif
-
-#if ENABLE_ACCESS == STATIC_PLUGIN
-access.dat FILE "dists/engine-data/access.dat"
-#endif
-#if ENABLE_CRYO == STATIC_PLUGIN
-cryo.dat FILE "dists/engine-data/cryo.dat"
-#endif
-#if ENABLE_DRASCULA == STATIC_PLUGIN
-drascula.dat FILE "dists/engine-data/drascula.dat"
-#endif
-#if ENABLE_HUGO == STATIC_PLUGIN
-hugo.dat FILE "dists/engine-data/hugo.dat"
-#endif
-#if ENABLE_KYRA == STATIC_PLUGIN
-kyra.dat FILE "dists/engine-data/kyra.dat"
-#endif
-#if ENABLE_LURE == STATIC_PLUGIN
-lure.dat FILE "dists/engine-data/lure.dat"
-#endif
-#if ENABLE_MORTEVIELLE == STATIC_PLUGIN
-mort.dat FILE "dists/engine-data/mort.dat"
-#endif
-#if ENABLE_NEVERHOOD == STATIC_PLUGIN
-neverhood.dat FILE "dists/engine-data/neverhood.dat"
-#endif
-#if ENABLE_QUEEN == STATIC_PLUGIN
-queen.tbl FILE "dists/engine-data/queen.tbl"
-#endif
-#if ENABLE_SKY == STATIC_PLUGIN
-sky.cpt FILE "dists/engine-data/sky.cpt"
-#endif
-#if ENABLE_SUPERNOVA == STATIC_PLUGIN
-supernova.dat FILE "dists/engine-data/supernova.dat"
-#endif
-#if ENABLE_TEENAGENT == STATIC_PLUGIN
-teenagent.dat FILE "dists/engine-data/teenagent.dat"
-#endif
-#if ENABLE_TITANIC == STATIC_PLUGIN
-titanic.dat FILE "dists/engine-data/titanic.dat"
-#endif
-#if ENABLE_TONY == STATIC_PLUGIN
-tony.dat FILE "dists/engine-data/tony.dat"
-#endif
-#if ENABLE_TOON == STATIC_PLUGIN
-toon.dat FILE "dists/engine-data/toon.dat"
-#endif
-#if ENABLE_WINTERMUTE == STATIC_PLUGIN
-wintermute.zip FILE "dists/engine-data/wintermute.zip"
-#endif
-#if ENABLE_XEEN == STATIC_PLUGIN
-xeen.ccs FILE "dists/engine-data/xeen.ccs"
-#endif
-#if ENABLE_AGI == STATIC_PLUGIN
-pred.dic FILE "dists/pred.dic"
-#endif
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
- PRODUCTVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0" // US English, Unicode
- BEGIN
- VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
- VALUE "CompanyName", "scummvm.org\0"
- VALUE "FileDescription", "http://www.scummvm.org/\0"
- VALUE "FileVersion", "@VERSION@\0"
- VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2018 The ScummVM Team\0"
- VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
- VALUE "OriginalFilename", "scummvm.exe\0"
- VALUE "ProductName", "ScummVM\0"
- VALUE "ProductVersion", "@VERSION@\0"
- END
- END
-
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200 // US English, Unicode
- END
-END
More information about the Scummvm-git-logs
mailing list