qmake|Snowberry: Launcher script and .desktop file respect config.pri

The launch-doomsday script and the .desktop file for starting the script
are now generated by qmake so that their contents reflect the directories
configured in config.pri. (patch by vvv1)

Added the configuration variable PYTHON for manually specifying which
Python interpreter to use. The default (not specified) assumes that
Python can be found on the system path.

distrib/linux/doomsday-engine.desktop

@@ -3,8 +3,8 @@ Encoding=UTF-8
 Name=Doomsday Engine
 Comment=Doom/Heretic/Hexen with enhanced graphics
 Categories=Game;ActionGame;
-Exec=/usr/bin/launch-doomsday
+Exec=BIN_DIR/launch-doomsday
 Terminal=false
 Type=Application
-Icon=/usr/share/doomsday/snowberry/graphics/snowberry.png
+Icon=SB_DIR/graphics/snowberry.png
 

distrib/platform_release.py

@@ -248,16 +248,6 @@ def linux_release():
 
     os.chdir(LAUNCH_DIR)
 
-    # Generate a launcher script.
-    f = file('linux/launch-doomsday', 'wt')
-    print >> f, """#!/usr/bin/python
-import os, sys
-os.chdir('/usr/share/doomsday/snowberry')
-sys.path += '.'
-
-import snowberry"""
-    f.close()
-
     def clean_products():
         # Remove previously built deb packages.
         os.system('rm -f ../doomsday*.deb ../doomsday*.changes ../doomsday*.tar.gz ../doomsday*.dsc')

doomsday/build/build.pro

@@ -10,7 +10,7 @@ include(../config.pri)
 
 # Update the PK3 files.
 deng_packres {
-    system(cd $$PWD/scripts/ && python packres.py --quiet \"$$OUT_PWD/..\")
+    system(cd $$PWD/scripts/ && $$PYTHON packres.py --quiet \"$$OUT_PWD/..\")
 }
 
 # Install the launcher.
@@ -51,17 +51,27 @@ deng_snowberry {
         $${SB_ROOT}/plugins/wizard.py
     plugins.path = $$SB_DIR/plugins
 
-    # Include the launch script if it exists.
-    LAUNCHER = ../../distrib/linux/launch-doomsday
-    exists($$LAUNCHER) {
-        launch.files = $$LAUNCHER
-        launch.path = $$DENG_BIN_DIR
-        INSTALLS += launch
+    # Make may not have yet created the output directory at this point.
+    system(mkdir -p \"$$OUT_PWD\")
 
-        message(Installing the launch-doomsday script.)
-    }
+    # Generate a script for starting the laucher.
+    LAUNCH_FILE = launch-doomsday
+    !system(sed \"s:PYTHON:$$PYTHON:; s:SB_DIR:$$SB_DIR:\" \
+        <\"../../distrib/linux/$$LAUNCH_FILE\" \
+        >\"$$OUT_PWD/$$LAUNCH_FILE\" && \
+        chmod 755 \"$$OUT_PWD/$$LAUNCH_FILE\"): error(Can\'t build $$LAUNCH_FILE)
+    launch.files = $$OUT_PWD/$$LAUNCH_FILE
+    launch.path = $$DENG_BIN_DIR
 
-    INSTALLS += conf plugins sb
+    # Generate a .desktop file for the applications menu.
+    DESKTOP_FILE = doomsday-engine.desktop
+    !system(sed \"s:BIN_DIR:$$DENG_BIN_DIR:; s:SB_DIR:$$SB_DIR:\" \
+        <\"../../distrib/linux/$$DESKTOP_FILE\" \
+        >\"$$OUT_PWD/$$DESKTOP_FILE\"): error(Can\'t build $$DESKTOP_FILE)
+    desktop.files = $$OUT_PWD/$$DESKTOP_FILE
+    desktop.path = $$PREFIX/share/applications
+
+    INSTALLS += conf plugins sb launch desktop
 }
 
 deng_aptunstable {

doomsday/config.pri

@@ -8,6 +8,10 @@
 # NOTE: The PREFIX option should always be specified on the qmake command
 #       line, as it is checked before config_user.pri is read.
 #
+# User-definable variables:
+#   PREFIX      Install prefix for Unix (specify on qmake command line)
+#   PYTHON      Path of the Python interpreter binary
+#
 # CONFIG options for Doomsday:
 # - deng_32bitonly          Only do a 32-bit build (no 64-bit)
 # - deng_aptstable          Include the stable apt repository .list
@@ -166,6 +170,19 @@ exists(config_user.pri) {
     include(config_user.pri)
 }
 
+# System Tools ---------------------------------------------------------------
+
+# See if Python is overridden.
+isEmpty(PYTHON) {
+    unix:!macx {
+        exists(/usr/bin/python): PYTHON = /usr/bin/python
+        exists(/usr/local/bin/python): PYTHON = /usr/local/bin/python
+    }
+    # Assume user has python on the path.
+    echo(Using Python on system path.)
+    PYTHON = python
+}
+
 # Apply deng_* Configuration -------------------------------------------------
 
 deng_nofixedasm {

doomsday/engine/engine.pro

@@ -663,7 +663,7 @@ win32 {
 }
 else:unix:!macx {
     # Generic Unix installation.
-    INSTALLS += target data startupdata startupgfx startupfonts desktop readme
+    INSTALLS += target data startupdata startupgfx startupfonts readme
 
     target.path = $$DENG_BIN_DIR
 
@@ -672,9 +672,6 @@ else:unix:!macx {
     startupfonts.path = $$DENG_DATA_DIR/fonts
     startupgfx.path = $$DENG_DATA_DIR/graphics
 
-    desktop.files = ../../distrib/linux/doomsday-engine.desktop
-    desktop.path = $$PREFIX/share/applications
-
     readme.files = ../doc/output/doomsday.6
     readme.path = $$PREFIX/share/man/man6
 }