diff --git a/distrib/linux/.gitignore b/distrib/linux/.gitignore new file mode 100644 index 0000000000..22827937e4 --- /dev/null +++ b/distrib/linux/.gitignore @@ -0,0 +1,2 @@ +launch-doomsday + diff --git a/distrib/platform_release.py b/distrib/platform_release.py index f27988d922..aad237a6b5 100644 --- a/distrib/platform_release.py +++ b/distrib/platform_release.py @@ -210,10 +210,10 @@ def win_release(): """The Linux release procedure.""" def linux_release(): - os.chdir(WORK_DIR) + os.chdir(LAUNCH_DIR) # Generate a launcher script. - f = file('launch-doomsday', 'wt') + f = file('linux/launch-doomsday', 'wt') print >> f, """#!/usr/bin/python import os, sys os.chdir('/usr/share/doomsday/snowberry') @@ -222,15 +222,24 @@ def linux_release(): import snowberry""" f.close() - 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_NUMBER + '"' + - ' -D CMAKE_INSTALL_PREFIX=/usr ../../doomsday && fakeroot make package'): + def clean_products(): + # Remove previously build deb packages. + os.system('rm -f ../doomsday*.deb ../doomsday*.changes ../doomsday*.tar.gz ../doomsday*.dsc') + + clean_products() + + #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_NUMBER + '"' + + # ' -D CMAKE_INSTALL_PREFIX=/usr ../../doomsday && fakeroot make package'): + if os.system('linux/gencontrol.sh && dpkg-buildpackage -b'): raise Exception("Failure to build from source.") # Place the result in the output directory. - shutil.copy(glob.glob('doomsday*deb')[0], OUTPUT_DIR) + shutil.copy(glob.glob('../doomsday*.deb')[0], OUTPUT_DIR) + shutil.copy(glob.glob('../doomsday*.changes')[0], OUTPUT_DIR) + clean_products() def main(): diff --git a/doomsday/engine/engine.pro b/doomsday/engine/engine.pro index b78e267a6d..a6bd7e2a4f 100644 --- a/doomsday/engine/engine.pro +++ b/doomsday/engine/engine.pro @@ -30,7 +30,7 @@ win32 { DEFINES += __DOOMSDAY__ !isEmpty(DENG_BUILD) { - echo(DENG_BUILD $$DENG_BUILD) + echo(Build number: $$DENG_BUILD) DEFINES += DOOMSDAY_BUILD_TEXT=\\\"$$DENG_BUILD\\\" } else { echo(DENG_BUILD is not defined.)