Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/…

…deng
skyjake · May 7, 2011 · b5a4f9b · b5a4f9b
2 parents 5ae8af6 + 3c8e16e
commit b5a4f9b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/distrib/platform_release.py b/distrib/platform_release.py
@@ -15,7 +15,8 @@
 DOOMSDAY_VERSION_PLAIN = "0.0.0"
 DOOMSDAY_RELEASE_TYPE = "Unstable"
 now = time.localtime()
-DOOMSDAY_BUILD = 'build' + str((now.tm_year - 2011)*365 + now.tm_yday)
+DOOMSDAY_BUILD_NUMBER = str((now.tm_year - 2011)*365 + now.tm_yday)
+DOOMSDAY_BUILD = 'build' + DOOMSDAY_BUILD_NUMBER
 TIMESTAMP = time.strftime('%y-%m-%d')
 
 print 'Build:', DOOMSDAY_BUILD, 'on', TIMESTAMP
@@ -105,7 +106,7 @@ def mac_release():
     os.chdir(WORK_DIR)
     mkdir('release_build')
     os.chdir('release_build')
-    if os.system('cmake -D DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD + '" -D MACOS_VERSION=' + mac_os_version() + ' ' + DOOMSDAY_DIR + ' && make'):
+    if os.system('cmake -D DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD_NUMBER + '" -D MACOS_VERSION=' + mac_os_version() + ' ' + DOOMSDAY_DIR + ' && make'):
         raise Exception("Failed to build from source.")
 
     # Now we can proceed to packaging.
@@ -203,7 +204,7 @@ def win_release():
 
     # Execute the win32 release script.
     os.chdir('win32')
-    if os.system('dorel.bat'):
+    if os.system('dorel.bat ' + DOOMSDAY_BUILD_NUMBER):
         raise Exception("Failure in the Windows release script.")
 
 
@@ -224,7 +225,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 DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD_NUMBER + '"' +
                  ' -D CMAKE_INSTALL_PREFIX=/usr ../../doomsday && fakeroot make package'):
         raise Exception("Failure to build from source.")
 

diff --git a/distrib/win32/dorel.bat b/distrib/win32/dorel.bat
@@ -4,6 +4,10 @@ REM -- Does a complete Win32 Binary Release distribution.
 REM -- Visual C++ environment.
 call "c:\Program Files\Microsoft Visual Studio 10.0\vc\vcvarsall.bat"
 
+REM -- Build number.
+SET DOOMSDAY_BUILD=%1
+echo Doomsday build number is %DOOMSDAY_BUILD%.
+
 REM -- Package a Snowberry binary.
 cd ..\..\snowberry
 call build.bat

diff --git a/doomsday/CMakeLists.txt b/doomsday/CMakeLists.txt
@@ -21,7 +21,7 @@
 ##
 ################################################################################
 
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.4 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.3 FATAL_ERROR)
 
 ## Supported Build Types are:
 ##    * None (CMAKE_C_FLAGS) Cmake gcc default of $CFLAGS.

diff --git a/doomsday/build/win32/vcbuild.bat b/doomsday/build/win32/vcbuild.bat
@@ -70,7 +70,7 @@ IF NOT EXIST %BIN_DIR% md %BIN_DIR%
 IF NOT EXIST %OBJ_DIR% md %OBJ_DIR%
 
 :: -- Compiler and linker options.
-SET DEFINES=/D "ZLIB_DLL" /D "WIN32_GAMMA" /D "NORANGECHECKING" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE"
+SET DEFINES=/D "ZLIB_DLL" /D "WIN32_GAMMA" /D "NORANGECHECKING" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /DDOOMSDAY_BUILD_TEXT="\"%DOOMSDAY_BUILD%\""
 SET DLLDEFINES=/D "_USRDLL" /D "_WINDLL" %DEFINES%
 
 SET INCS_ENGINE_API=%DENG_ENGINE_API_DIR%