From fc6e566c9cbed867f946957e8d8d6c6f4107ffde Mon Sep 17 00:00:00 2001 From: skyjake Date: Fri, 6 May 2011 15:32:10 +0300 Subject: [PATCH] Include build number in version text Only for non-stable builds. Stable builds just go by their actual version number. This commit affects Mac and Linux only. --- distrib/platform_release.py | 3 ++- doomsday/engine/portable/include/dd_version.h | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/distrib/platform_release.py b/distrib/platform_release.py index f17f76cb65..fc5203ed22 100644 --- a/distrib/platform_release.py +++ b/distrib/platform_release.py @@ -105,7 +105,7 @@ def mac_release(): os.chdir(WORK_DIR) mkdir('release_build') os.chdir('release_build') - if os.system('cmake -D MACOS_VERSION=' + mac_os_version() + ' ' + DOOMSDAY_DIR + ' && make'): + if os.system('cmake -D DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD + '" -D MACOS_VERSION=' + mac_os_version() + ' ' + DOOMSDAY_DIR + ' && make'): raise Exception("Failed to build from source.") # Now we can proceed to packaging. @@ -224,6 +224,7 @@ def linux_release(): if os.system('cmake -D SYSTEMARCH=`dpkg --print-architecture`' + ' -D DOOMSDAY_VERSION=' + DOOMSDAY_VERSION + ' -D DOOMSDAY_BUILD=' + DOOMSDAY_BUILD + + ' -D DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD + '"' + ' -D CMAKE_INSTALL_PREFIX=/usr ../../doomsday && fakeroot make package'): raise Exception("Failure to build from source.") diff --git a/doomsday/engine/portable/include/dd_version.h b/doomsday/engine/portable/include/dd_version.h index cd2253566f..c61a904390 100644 --- a/doomsday/engine/portable/include/dd_version.h +++ b/doomsday/engine/portable/include/dd_version.h @@ -69,7 +69,11 @@ * DOOMSDAY_VERSION unless you wish to break compatibility. */ #define DOOMSDAY_VERSION 10900 // Don't touch; see above. -#if defined(DOOMSDAY_RELEASE_NAME) + +#if defined(DOOMSDAY_BUILD_TEXT) +/** The build number is included only for non-Stable builds. */ +# define DOOMSDAY_VERSION_TEXT DOOMSDAY_VERSION_BASE " (#" DOOMSDAY_BUILD_TEXT ")" +#elif defined(DOOMSDAY_RELEASE_NAME) # define DOOMSDAY_VERSION_TEXT DOOMSDAY_VERSION_BASE "-" DOOMSDAY_RELEASE_NAME #else # define DOOMSDAY_VERSION_TEXT DOOMSDAY_VERSION_BASE