Enabled the "make sis" target with the Symbian makefile build system.

2 files changed, 89 insertions, 74 deletions

diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
index a20aa1d..e9b4ab8 100644
--- a/mkspecs/features/symbian/qt.prf
+++ b/mkspecs/features/symbian/qt.prf
@@ -41,54 +41,49 @@ isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
 
 # Sis file creation
-make_cache_name = .make.cache
-fixedDestdir = $$DESTDIR
-!isEmpty(fixedDestdir):!contains(fixedDestdir, "[/\\]$"):fixedDestdir = $${fixedDestdir}/
-contains(QMAKE_HOST.os, "Windows"):fixedDestdir = $$replace(fixedDestdir, "/", "\\")
-
-sis_target.target = sis
-sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \
-                          $(if $(wildcard $$make_cache_name), \
-                              $(MAKE) -f $(MAKEFILE) ok_sis MAKEFILES=$$make_cache_name \
-                          , \
-                              $(if $(QT_SIS_TARGET), \
-                                  $(MAKE) -f $(MAKEFILE) ok_sis \
+symbian-abld|symbian-sbsv2 {
+    sis_destdir =
+    make_cache_name = .make.cache
+    sis_target.target = sis
+    sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \
+                              $(if $(wildcard $$make_cache_name), \
+                                  $(MAKE) -f $(MAKEFILE) ok_sis MAKEFILES=$$make_cache_name \
                               , \
-                                  $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
+                                  $(if $(QT_SIS_TARGET), \
+                                      $(MAKE) -f $(MAKEFILE) ok_sis \
+                                  , \
+                                      $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
+                                  ) \
                               ) \
-                          ) \
-                      , \
-                          $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
-                      )
+                          , \
+                              $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
+                          )
 
-ok_sis_target.target = ok_sis
-ok_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \
-                             $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+    ok_sis_target.target = ok_sis
+    ok_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \
+                                 $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
-target_sis_target.target = $${fixedDestdir}$${TARGET}.sis
-target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
+    target_sis_target.target = $${sis_destdir}$${TARGET}.sis
+    target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
 
-installer_sis_target.target = installer_sis
-installer_sis_target.commands = $(if $(wildcard $$basename(TARGET)_installer.pkg), \
-                                    $(MAKE) -f $(MAKEFILE) ok_installer_sis \
-                                , \
-                                    $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
-                                )
-installer_sis_target.depends = $${fixedDestdir}$${TARGET}.sis
+    installer_sis_target.target = installer_sis
+    installer_sis_target.commands = $(if $(wildcard $$basename(TARGET)_installer.pkg), \
+                                        $(MAKE) -f $(MAKEFILE) ok_installer_sis \
+                                    , \
+                                        $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
+                                    )
+    installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis
 
-ok_installer_sis_target.target = ok_installer_sis
-ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \
-                                       $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+    ok_installer_sis_target.target = ok_installer_sis
+    ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \
+                                           $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
-fail_sis_nopkg_target.target = fail_sis_nopkg
-fail_sis_nopkg_target.commands = "$(error PKG file does not exist, 'sis' and 'installer_sis' target are only supported for executables or projects with DEPLOYMENT statement)"
+    fail_sis_nopkg_target.target = fail_sis_nopkg
+    fail_sis_nopkg_target.commands = "$(error PKG file does not exist, 'sis' and 'installer_sis' target are only supported for executables or projects with DEPLOYMENT statement)"
 
-fail_sis_nocache_target.target = fail_sis_nocache
-fail_sis_nocache_target.commands = "$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)"
+    fail_sis_nocache_target.target = fail_sis_nocache
+    fail_sis_nocache_target.commands = "$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)"
 
-symbian-abld|symbian-sbsv2 {
-    # Only enable stub_sis files for the abld/sbsv2 build systems for now, since we don't
-    # support ROM builds for any other Symbian build system.
     stub_sis_target.target = stub_sis
     stub_sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \
                                    $(if $(wildcard $$make_cache_name), \
@@ -108,44 +103,63 @@ symbian-abld|symbian-sbsv2 {
     ok_stub_sis_target.commands = createpackage.bat -s $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \
                                       $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
-    QMAKE_EXTRA_TARGETS += stub_sis_target \
+    QMAKE_EXTRA_TARGETS += sis_target \
+                           ok_sis_target \
+                           target_sis_target \
+                           installer_sis_target \
+                           ok_installer_sis_target \
+                           fail_sis_nopkg_target \
+                           fail_sis_nocache_target \
+                           stub_sis_target \
                            ok_stub_sis_target
+    # Sbsv2 has its own store_build target which is using flms.
+    !symbian-sbsv2 {
+        contains(QMAKE_HOST.os, "Windows") {
+            shellFixedHash = $${LITERAL_HASH}
+        } else {
+            shellFixedHash = \\$${LITERAL_HASH}
+        }
+        store_build_target.target = store_build
+        store_build_target.commands = \
+              @echo $${shellFixedHash} ============================================================================== > $$make_cache_name \
+            && echo $${shellFixedHash}   This file is generated by make and should not be modified by the user >> $$make_cache_name \
+            && echo $${shellFixedHash}  Name        : $$make_cache_name >> $$make_cache_name \
+            && echo $${shellFixedHash}  Part of     : lineedits >> $$make_cache_name \
+            && echo $${shellFixedHash}  Description : This file is used to cache last build target for >> $$make_cache_name \
+            && echo $${shellFixedHash}                make sis target. >> $$make_cache_name \
+            && echo $${shellFixedHash}  Version     :  >> $$make_cache_name \
+            && echo $${shellFixedHash} >> $$make_cache_name \
+            && echo $${shellFixedHash} ============================================================================== >> $$make_cache_name \
+            && echo. >> $$make_cache_name \
+            && echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> $$make_cache_name
+
+        QMAKE_EXTRA_TARGETS += store_build_target
+    }
 } else {
-    # DESTDIR is not honored on abld and sbsv2
+    sis_destdir = $$DESTDIR
+    !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\]$"):sis_destdir = $${sis_destdir}/
+    contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\")
+
+    sis_target.target = sis
+    sis_target.commands = createpackage $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \
+                              - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+
+    target_sis_target.target = $${sis_destdir}$${TARGET}.sis
+    target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
+
+    installer_sis_target.target = installer_sis
+    installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \
+                                        $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+    installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis
+
     !isEmpty(DESTDIR) {
-        ok_sis_target.commands += && $$QMAKE_MOVE $$basename(TARGET).sis $$DESTDIR
-        ok_installer_sis_target.commands += && $$QMAKE_MOVE $$basename(TARGET).sis $$DESTDIR
+        sis_target.commands += && $$QMAKE_MOVE $$basename(TARGET).sis $$DESTDIR
+        installer_sis_target.commands += && $$QMAKE_MOVE $$basename(TARGET).sis $$DESTDIR
     }
-}
 
-QMAKE_EXTRA_TARGETS += sis_target \
-                       ok_sis_target \
-                       target_sis_target \
-                       installer_sis_target \
-                       ok_installer_sis_target \
-                       fail_sis_nopkg_target \
-                       fail_sis_nocache_target
-
-# Sbsv2 has its own store_build target which is using flms.
-!symbian-sbsv2 {
-    contains(QMAKE_HOST.os, "Windows") {
-        shellFixedHash = $${LITERAL_HASH}
-    } else {
-        shellFixedHash = \\$${LITERAL_HASH}
-    }
-    store_build_target.target = store_build
-    store_build_target.commands = \
-          @echo $${shellFixedHash} ============================================================================== > $$make_cache_name \
-        && echo $${shellFixedHash}   This file is generated by make and should not be modified by the user >> $$make_cache_name \
-        && echo $${shellFixedHash}  Name        : $$make_cache_name >> $$make_cache_name \
-        && echo $${shellFixedHash}  Part of     : lineedits >> $$make_cache_name \
-        && echo $${shellFixedHash}  Description : This file is used to cache last build target for >> $$make_cache_name \
-        && echo $${shellFixedHash}                make sis target. >> $$make_cache_name \
-        && echo $${shellFixedHash}  Version     :  >> $$make_cache_name \
-        && echo $${shellFixedHash} >> $$make_cache_name \
-        && echo $${shellFixedHash} ============================================================================== >> $$make_cache_name \
-        && echo. >> $$make_cache_name \
-        && echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> $$make_cache_name
-
-    QMAKE_EXTRA_TARGETS += store_build_target
+    QMAKE_EXTRA_TARGETS += sis_target \
+                           target_sis_target \
+                           installer_sis_target
 }
+
+QMAKE_DISTCLEAN += $${sis_destdir}$${TARGET}.sis
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 0f96d0e..064366b 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -15,6 +15,7 @@ symbian: {
         qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
     } else {
         qtresources.sources = $$QMAKE_LIBDIR_QT/s60main.rsc
+        DESTDIR = $$QMAKE_LIBDIR_QT
     }
     qtresources.path = c:$$APP_RESOURCE_DIR