From 8c71456e2fdeba68978895d5c38f7fd251ab7808 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 26 Aug 2009 12:43:00 +0300
Subject: Make fluidlauncher sis generation work with -no-script configuration

Fluidlauncher was trying to add context2d executable to sis package,
even if it is not built because -no-script.

Reviewed-by: Shane Kearns
---
 demos/embedded/fluidlauncher/fluidlauncher.pro | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 3eff37b..522ccf3 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -67,15 +67,14 @@ symbian {
         pathstroke.exe \
         wiggly.exe \
         ftp.exe \
-        context2d.exe \
         saxbookmarks.exe \
         desktopservices.exe \
         fridgemagnets.exe \
         drilldown.exe \
         softkeys.exe
-    contains(QT_CONFIG, webkit) {
-        executables.sources += anomaly.exe
-        }
+
+    contains(QT_CONFIG, webkit): executables.sources += anomaly.exe
+    contains(QT_CONFIG, script): executables.sources += context2d.exe
 
     executables.path = /sys/bin
 
@@ -86,15 +85,14 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
-         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
-    contains(QT_CONFIG, webkit) {
-        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
-        }
+
+    contains(QT_CONFIG, webkit): reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
+    contains(QT_CONFIG, script): reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
 
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
@@ -105,16 +103,14 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\
-         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
-    contains(QT_CONFIG, webkit) {
-        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
-        }
-
+    contains(QT_CONFIG, webkit): resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
+    contains(QT_CONFIG, script): resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
+    
     resource.path = $$APP_RESOURCE_DIR
 
     mifs.sources = \
-- 
cgit v0.12


From f189e00fb98f3f5cf5353c69ffe77f206304666b Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Thu, 27 Aug 2009 08:04:32 +0300
Subject: Support for template PKG file.

This commit changes qmake to generate only one template pkg file,
instead of one for each supported platform and build.

Due to this change createpackage.bat script now need to be called with
two additional parameters - platform and target. Example of needed changes:

Instead of old way:
	>createpackage.bat [-i] pkgfile [certificate key [passphrase]]
The new implementation works as:
	>createpackage.bat [-i] pkgfile platform build [certificate key [passphrase]]

In addition createpackage.bat backend is replaced by createpackage.pl,
it takes care of preprocesing the pkg file, i.e. expanding the variables with
their values and calling the makesis and signsis with right parameters.

Perl is used to make implementation more cross-platform.

Task: 259037
RevBy: Miikka Heikkinen
---
 bin/createpackage.bat                              | 105 +-------------
 bin/createpackage.pl                               | 156 +++++++++++++++++++++
 .../symbian/initprojectdeploy_symbian.cpp          |   2 +-
 qmake/generators/symbian/symmake.cpp               |  23 +--
 qmake/generators/symbian/symmake.h                 |   2 +-
 5 files changed, 165 insertions(+), 123 deletions(-)
 create mode 100644 bin/createpackage.pl

diff --git a/bin/createpackage.bat b/bin/createpackage.bat
index 116d52b..b5ede18 100644
--- a/bin/createpackage.bat
+++ b/bin/createpackage.bat
@@ -1,106 +1,3 @@
 @echo off
-
-set installsigned_old=%installsigned%
-set pkgfile_old=%pkgfile%
-set basename_old=%basename%
-set signsis1_old=%signsis1%
-set signsis2_old=%signsis2%
-set signsis3_old=%signsis3%
-set unsigned_sis_name_old=%unsigned_sis_name%
-set signed_sis_name_old=%signed_sis_name%
-set scriptpath_old=%scriptpath%
-set certificate_old=%certificate%
-
-rem Help text
-if "%1"=="" (
-    echo Convenience script for creating signed packages you can install on your phone.
-    echo Usage: createpackage.bat [-i] myexample_armv5_udeb.pkg [certificate key [passphrase]]
-    echo.
-    echo If no certificate and key files are provided, either a RnD certificate or
-    echo a self-signed certificate from Qt installation root directory is used.
-    echo.
-    echo To install the package right away using PC suite, use -i argument. 
-    goto done
-)
-
-if "%1"=="-i" (
-    set installsigned=true
-    set pkgfile=%2
-    set basename=%~n2
-    set signsis1=%3
-    set signsis2=%4
-    set signsis3=%5
-) else (
-    set installsigned=false
-    set pkgfile=%1
-    set basename=%~n1
-    set signsis1=%2
-    set signsis2=%3
-    set signsis3=%4
-)
-
-set unsigned_sis_name=%basename%_unsigned.sis
-set signed_sis_name=%basename%.sis
-
-rem Get absolute path to this script
 set scriptpath=%~dp0
-
-rem Check the .pkg actually exists.
-if not exist %pkgfile% (
-    echo Error: Package description file '%pkgfile%' does not exist.
-    goto done
-)
-
-rem Remove any existing .sis packages
-if exist %signed_sis_name% del %signed_sis_name%
-if exist %unsigned_sis_name% del %unsigned_sis_name%
-
-rem Create .sis package
-makesis %pkgfile% %unsigned_sis_name%
-
-rem If no certificate is given, check default options
-if x%signsis1% == x (
-    rem If RnD certificate is not found, sign with self signed certificate
-    if not exist %scriptpath%..\rd.cer (
-        set certificate=Self signed
-        signsis %unsigned_sis_name% %signed_sis_name% %scriptpath%..\selfsigned.cer %scriptpath%..\selfsigned.key
-        goto install
-    )
-
-    rem Sign with RnD certificate
-    set certificate=RnD
-    signsis %unsigned_sis_name% %signed_sis_name% %scriptpath%..\rd.cer %scriptpath%..\rd-key.pem
-) else (
-    if x%signsis2% == x (
-       echo Custom certificate key file parameter missing.
-       goto cleanup
-    )
-
-    set certificate=%signsis1%
-    signsis %unsigned_sis_name% %signed_sis_name% %signsis1% %signsis2% %signsis3%
-)
-
-:install
-if exist %signed_sis_name% (
-    echo Successfully created %signed_sis_name% using certificate %certificate%
-    if "%installsigned%" == "true" (
-        echo Installing %signed_sis_name%...
-        call %signed_sis_name%
-    )
-)
-
-:cleanup
-if exist %unsigned_sis_name% del %unsigned_sis_name%
-
-:done
-
-set installsigned=%installsigned_old%
-set pkgfile=%pkgfile_old%
-set basename=%basename_old%
-set signsis1=%signsis1_old%
-set signsis2=%signsis2_old%
-set signsis3=%signsis3_old%
-set unsigned_sis_name=%unsigned_sis_name_old%
-set signed_sis_name=%signed_sis_name_old%
-set scriptpath=%scriptpath_old%
-set certificate=%certificate_old%
+perl %scriptpath%createpackage.pl %*
\ No newline at end of file
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
new file mode 100644
index 0000000..8501174
--- /dev/null
+++ b/bin/createpackage.pl
@@ -0,0 +1,156 @@
+#!\usr\bin\perl
+############################################################################################
+#
+# Convenience script for creating signed packages you can install on your phone.
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
+#
+############################################################################################
+
+use strict;
+
+# use a command-line parsing module
+use Getopt::Long;
+# Use file name parsing module
+use File::Basename;
+
+sub Usage() {
+    print "\n";
+    print "==========================================================================================\n";
+    print "Convenience script for creating signed packages you can install on your phone.\n";
+    print "\n";
+    print "Usage: createpackage.pl [-i] templatepkg platform target [certificate key [passphrase]]\n";
+    print "\n";
+    print "Where parameters are as follows:\n";
+    print "     [-i|install] = Install the package right away using PC suite\n";
+    print "     templatepkg  = Name of .pkg file template\n";
+    print "     platform     = One of the supported platform\n";
+    print "                    GCCE | ARMV5 | ARMV6 | ARMV7\n";
+    print "     target       = Either UDEB or UREL\n";
+    print "     certificate  = The certificate file used for signing\n";
+    print "     key          = The certificate's private key file\n";
+    print "     passphrase   = The certificate's private key file's passphrase\n";
+    print "\n";
+    print "If no certificate and key files are provided, either a RnD certificate or\n";
+    print "a self-signed certificate from Qt installation root directory is used.\n";
+    print "\n";
+    print "==========================================================================================\n";
+    exit();
+}
+
+# Read given options
+my $install = "";
+unless (GetOptions('i|install' => \$install)){
+    Usage();
+}
+
+# Read params to variables
+my $templatepkg = $ARGV[0];
+my $platform = uc $ARGV[1];
+my $target = uc $ARGV[2];
+my $visualtarget = $target;
+$visualtarget =~ s/udeb/debug/i;
+$visualtarget =~ s/urel/release/i;
+
+my $certificate = $ARGV[3];
+my $key = $ARGV[4];
+my $passphrase = $ARGV[5];
+
+# Generate output pkg basename (i.e. file name without extension)
+my $pkgoutputbasename = $templatepkg;
+$pkgoutputbasename =~ s/_template\.pkg/_$visualtarget-$platform/g;
+$pkgoutputbasename = lc($pkgoutputbasename);
+
+# Store output file names to variables
+my $pkgoutput = lc($pkgoutputbasename.".pkg");
+my $unsigned_sis_name = $pkgoutputbasename."_unsigned.sis";
+my $signed_sis_name = $pkgoutputbasename.".sis";
+
+# Store some utility variables
+my $scriptpath = dirname(__FILE__);
+my $certtext = $certificate;
+my $certpath = $scriptpath;
+$certpath =~ s-^(.*[^\\])$-$1\\-o;      # ensure path ends with a backslash
+$certpath = $certpath."../";            # certificates are one step up in hierarcy
+$certpath =~ s-/-\\-go;	                # for those working with UNIX shells
+
+# Check some pre-conditions and print error messages if needed
+unless (length($templatepkg) && length($platform) && length($target)) {
+    print "\nError: Template PKG filename, platform or target is not defined!\n";
+    Usage();
+}
+
+# Check template exist
+stat($templatepkg);
+unless( -e _ ) {
+    print "\nError: Package description file '$templatepkg' does not exist!\n";
+    Usage();
+}
+
+# Check certifcate preconditions and set default certificate variables if needed
+if (length($certificate)) {
+    unless(length($key)) {
+        print "\nError: Custom certificate key file parameter missing.!\n";
+        Usage();
+    }
+} else {
+    #If no certificate is given, check default options
+    $certtext = "RnD";
+    $certificate = $certpath."rd.cer";
+    $key = $certpath."rd-key.pem";
+
+    stat($certificate);
+    unless( -e _ ) {
+        $certtext = "Self Signed";
+        $certificate = $certpath."selfsigned.cer";
+        $key = $certpath."selfsigned.key";
+    }
+}
+
+# Remove any existing .sis packages
+unlink $unsigned_sis_name;
+unlink $signed_sis_name;
+unlink $pkgoutput;
+
+# Preprocess PKG
+local $/;
+# read template file
+open( TEMPLATE, $templatepkg) or die "Error '$templatepkg': $!\n";
+$_=<TEMPLATE>;
+close (TEMPLATE);
+
+# replace the PKG variables
+s/\$\(PLATFORM\)/$platform/gm;
+s/\$\(TARGET\)/$target/gm;
+
+#write the output
+open( OUTPUT, ">$pkgoutput" ) or die "Error '$pkgoutput' $!\n";
+print OUTPUT $_;
+close OUTPUT;
+
+# Create and sign SIS
+system ("makesis $pkgoutput $unsigned_sis_name");
+system ("signsis $unsigned_sis_name $signed_sis_name $certificate $key $passphrase");
+
+# Check if creating signed SIS Succeeded
+stat($signed_sis_name);
+if( -e _ ) {
+    print ("\nSuccessfully created $signed_sis_name using certificate $certtext!\n");
+
+    # remove temporary pkg and unsigned sis
+    unlink $pkgoutput;
+    unlink $unsigned_sis_name;
+
+    # Install the sis if requested
+    if ($install) {
+        print ("\nInstalling $signed_sis_name...\n");
+        system ("$signed_sis_name");
+    }
+} else {
+    # Lets leave the generated PKG for problem solving purposes
+    print ("\nSIS creation failed!\n");
+}
+
+
+#end of file
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index e903fc1..3bc2391 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -331,7 +331,7 @@ void initProjectDeploySymbian(QMakeProject* project,
                         if (deployBinaries) {
                             // Executables and libraries are deployed to \sys\bin
                             QFileInfo releasePath(epocRoot() + "epoc32\\release\\" + platform + "\\" + build + "\\");
-                            deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName()),
+                            deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName(), false, true),
                                                            Option::fixPathToLocalOS(deploymentDrive + QLatin1String(SYSBIN_DIR "\\") + info.fileName())));
                         }
                         if (isPlugin(info, devicePath)) {
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index c20ecf3..b4d693c 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -194,13 +194,7 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     }
 
     if (generatePkg) {
-        QStringList platformList = project->values("SYMBIAN_PLATFORMS");
-        foreach(QString platform, platformList) {
-            if (platform.compare("WINSCW", Qt::CaseInsensitive)) {
-                generatePkgFile(platform.toLower(), "udeb", iconFile);
-                generatePkgFile(platform.toLower(), "urel", iconFile);
-            }
-        }
+        generatePkgFile(iconFile);
     }
 
     writeBldInfContent(t, generatePkg);
@@ -258,13 +252,10 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     return true;
 }
 
-void SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile)
+void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile)
 {
-    QString build = (config == "udeb") ? "debug" : "release";
-    QString pkgFilename = QString("%1_%2-%3.%4")
+    QString pkgFilename = QString("%1_template.%2")
                           .arg(fileInfo(project->projectFile()).completeBaseName())
-                          .arg(build)
-                          .arg(compiler)
                           .arg("pkg");
     QFile pkgFile(pkgFilename);
     if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -344,10 +335,8 @@ void SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
     QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
 
     // Find location of builds
-    QString epocReleasePath = QString("%1epoc32/release/%2/%3")
-                              .arg(epocRoot())
-                              .arg(compiler)
-                              .arg(config);
+    QString epocReleasePath = QString("%1epoc32/release/$(PLATFORM)/$(TARGET)")
+                              .arg(epocRoot());
 
 
     if (targetType == TypeExe) {
@@ -391,7 +380,7 @@ void SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
     QString remoteTestPath;
     remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
 
-    initProjectDeploySymbian(project, depList, remoteTestPath, true, compiler, config, generatedDirs, generatedFiles);
+    initProjectDeploySymbian(project, depList, remoteTestPath, true, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
     if (depList.size())
         t << "; DEPLOYMENT" << endl;
     for (int i = 0; i < depList.size(); ++i)  {
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index 22dc4c9..2fea29b 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -84,7 +84,7 @@ protected:
     QString canonizePath(const QString& origPath);
 
     virtual bool writeMakefile(QTextStream &t);
-    void generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile);
+    void generatePkgFile(const QString &iconFile);
     bool containsStartWithItem(const QChar &c, const QStringList& src);
 
     virtual void init();
-- 
cgit v0.12


From c2bfd3a4e13515bc9507250a71e2f04612d78a04 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Thu, 27 Aug 2009 08:14:03 +0300
Subject: Added support for 'make sisx' target in Symbian OS.

Commit f189e00 added support for template PKG file. This commit extends
the template PKG file usage with new make target, i.e. the commit adds
a new make target called sisx, which can be used to generate signed sisx
files.

The sisx target is basically wrapper for calling createpackage.bat,
but it also adds support for default platform/target and environment
variables. Default platform/target feature means that SIS packages are
automatically created for last build target. For example:

>qmake
>make release-armv5
>make sisx                            <- Creates sisx for release-armv5

It is also possible to override the platform and target for which the
SISX is created as follows:

>qmake
>make release-armv5 debug-winscw
>make sisx PLATFORM=ARMV5 TARGET=UREL <- Creates sisx for release-armv5

Since PLATFORM and TARGET are make variables they can also be defined
as an environment variables instead of passing them for make. I.e. the
following is indentical to previous example:

>set PLATFORM=ARMV5
>set TARGET=UREL
>qmake
>make release-armv5 debug-winscw
>make sisx                           <- Creates sisx for release-armv5

The environment variables are also useful if you have your own developer
certificate what you want to use for signing SIS files. For example:

>set CERTIFICATE=mycert.cer
>set KEY=mykey.key
>qmake
>make release-armv5
>make sisx

The above example creates release-armv5 SIS package with custom
certificate and key (key without password). If certificate and key are
not defined, the same logic as in old createpackage.bat will be used i.e.
if RD cert is available in Qt root it will be used, and if not self-signed
cerfificate will be used.

The environment variables supported by 'make sisx' are:
    PLATFORM
    TARGET
    CERTIFICATE
    KEY
    PASSPHRASE

The createpackage.bat can still be called directly but preferred way is
to use new make target directly as examples above demonstrated.

Task: 259037
RevBy: Miikka Heikkinen
---
 mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm | 35 ++++++++++++++++++
 mkspecs/symbian-sbsv2/flm/qt/qt.xml                |  4 +++
 qmake/generators/symbian/symmake.cpp               | 42 +++++++++++++++++++++-
 qmake/generators/symbian/symmake.h                 |  2 ++
 qmake/generators/symbian/symmake_abld.cpp          | 32 +++++++++++++++--
 qmake/generators/symbian/symmake_abld.h            |  1 +
 qmake/generators/symbian/symmake_sbsv2.cpp         |  6 ++++
 7 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm

diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
new file mode 100644
index 0000000..101f942
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -0,0 +1,35 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Nokia Corporation (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+include $(FLMHOME)/metaflm.mk
+
+STORE_BUILD_TARGET:=$(call sanitise,TSTORE_BUILD_$(PLATFORM_PATH)_$(CFG_PATH)_$(EXTENSION_ROOT))
+CACHE_FILENAME:=$(EXTENSION_ROOT)/.make.cache
+
+define qmake_store_build
+FINAL:: $(STORE_BUILD_TARGET)
+
+$(STORE_BUILD_TARGET):
+	$(call startrule,qmake_store_build) \
+	echo "# ==============================================================================" > $(CACHE_FILENAME) && \
+	echo "# This file is generated by make and should not be modified by the user" >> $(CACHE_FILENAME) && \
+	echo "#  Name        : .make.cache" >> $(CACHE_FILENAME) && \
+	echo "#  Part of     : " >> $(CACHE_FILENAME) && \
+	echo "#  Description : This file is used to cache last build target for" >> $(CACHE_FILENAME) && \
+	echo "#                make sisx target." >> $(CACHE_FILENAME) && \
+	echo "#  Version     : " >> $(CACHE_FILENAME) && \
+	echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
+	echo PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
+	echo TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
+	$(call endrule,qmake_store_build)
+endef
+
+$(eval $(qmake_store_build))
+$(eval $(call GenerateStandardCleanTarget,$(CACHE_FILENAME),''))
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
index 2c46f78..5074e47 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml
+++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
@@ -39,4 +39,8 @@
                 flm="qmake_generate_temp_dirs.flm">
         <param name='DIRS' />
     </interface>
+    
+    <interface name="qt.qmake_store_build" extends="Symbian.UserFLM"
+                flm="qmake_store_build.flm">
+    </interface>    
 </build>
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index b4d693c..13feb25 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -72,6 +72,12 @@
 #define MMP_TARGETTYPE "TARGETTYPE"
 #define MMP_SECUREID "SECUREID"
 
+#define SISX_TARGET "sisx"
+#define OK_SISX_TARGET "ok_sisx"
+#define FAIL_SISX_NOPKG_TARGET "fail_sisx_nopkg"
+#define FAIL_SISX_NOCACHE_TARGET "fail_sisx_nocache"
+#define RESTORE_BUILD_TARGET "restore_build"
+
 #define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
 
 QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
@@ -1624,6 +1630,41 @@ void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
     str.replace(QString(" "), QString("_"));
 }
 
+void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
+{
+    t << SISX_TARGET ": " RESTORE_BUILD_TARGET << endl;
+    QString sisxcommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3),$(MAKE) -s %4,$(MAKE) -s %5),$(MAKE) -s %6)")
+                          .arg(fileInfo(project->projectFile()).completeBaseName())
+                          .arg("pkg")
+                          .arg(MAKE_CACHE_NAME)
+                          .arg(OK_SISX_TARGET)
+                          .arg(FAIL_SISX_NOCACHE_TARGET)
+                          .arg(FAIL_SISX_NOPKG_TARGET);    
+    t << sisxcommand << endl;         
+    t << endl;
+
+    t << OK_SISX_TARGET ":" << endl;
+
+    QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(PLATFORM) $(TARGET) $(CERTIFICATE) $(KEY) $(PASSPHRASE)")
+                          .arg(fileInfo(project->projectFile()).completeBaseName())
+                          .arg("pkg");
+    t << pkgcommand << endl;
+    t << endl;
+    
+    t << FAIL_SISX_NOPKG_TARGET ":" << endl;  
+    t << "\t$(error PKG file does not exist, 'SISX' target is only supported for executables or projects with DEPLOYMENT statement)" << endl;  
+    t << endl;
+    
+    t << FAIL_SISX_NOCACHE_TARGET ":" << endl;  
+    t << "\t$(error Project has to be build before calling 'SISX' target)" << endl;  
+    t << endl;
+    
+
+    t << RESTORE_BUILD_TARGET ":" << endl;
+    t << "-include " MAKE_CACHE_NAME << endl;
+    t << endl;
+}
+
 void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t)
 {
     t << "dodistclean:" << endl;
@@ -1677,4 +1718,3 @@ void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t)
     t << "distclean: clean dodistclean" << endl;
     t << endl;
 }
-
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index 2fea29b..b4b3022 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 #define MAKEFILE_DEPENDENCY_SEPARATOR " \\\n\t"
 
 #define QT_EXTRA_INCLUDE_DIR "tmp"
+#define MAKE_CACHE_NAME ".make.cache"
 
 class SymbianMakefileGenerator : public MakefileGenerator
 {
@@ -136,6 +137,7 @@ protected:
                                const QString& itemPrefix,
                                const QString& itemSuffix);
 
+    void writeSisxTargets(QTextStream &t);
     void generateDistcleanTargets(QTextStream& t);
 
     // Subclass implements
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 271d210..d66557a 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -58,6 +58,7 @@
 #define ALL_SOURCE_DEPS_TARGET "all_source_deps"
 #define WINSCW_DEPLOYMENT_TARGET "winscw_deployment"
 #define WINSCW_DEPLOYMENT_CLEAN_TARGET "winscw_deployment_clean"
+#define STORE_BUILD_TARGET "store_build"
 
 SymbianAbldMakefileGenerator::SymbianAbldMakefileGenerator() : SymbianMakefileGenerator() { }
 SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { }
@@ -108,7 +109,7 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
             finalDepsWinscw.append(WINSCW_DEPLOYMENT_TARGET);
             wrapperTargets << WINSCW_DEPLOYMENT_TARGET << WINSCW_DEPLOYMENT_CLEAN_TARGET;
         } else {
-            buildDeps.append(CREATE_TEMPS_TARGET " " PRE_TARGETDEPS_TARGET);
+            buildDeps.append(CREATE_TEMPS_TARGET " " PRE_TARGETDEPS_TARGET " " STORE_BUILD_TARGET);
             cleanDeps.append(EXTENSION_CLEAN);
             cleanDepsWinscw.append(EXTENSION_CLEAN " " WINSCW_DEPLOYMENT_CLEAN_TARGET);
             finalDeps.append(FINALIZE_TARGET);
@@ -118,7 +119,8 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
                 << EXTENSION_CLEAN
                 << FINALIZE_TARGET
                 << WINSCW_DEPLOYMENT_CLEAN_TARGET
-                << WINSCW_DEPLOYMENT_TARGET;
+                << WINSCW_DEPLOYMENT_TARGET
+                << STORE_BUILD_TARGET;
         }
 
         t << "MAKMAKE: " << buildDeps << endl << endl;
@@ -143,7 +145,7 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
         foreach(QString target, wrapperTargets) {
             t << target << " : " << makefile << endl;
-            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << endl << endl;
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " PLATFORM=$(PLATFORM) TARGET=$(CFG)" << endl << endl;
         }
 
         t << endl;
@@ -353,6 +355,10 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
 
     writeDeploymentTargets(t);
 
+    writeSisxTargets(t);
+
+    writeStoreBuildTarget(t);
+
     generateDistcleanTargets(t);
 
     t << "clean: $(ABLD)" << endl;
@@ -408,6 +414,26 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t)
     return true;
 }
 
+void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t)
+{
+    t << STORE_BUILD_TARGET ":" << endl;
+    t << "\t@echo # ============================================================================== > " MAKE_CACHE_NAME << endl;
+    t << "\t@echo # This file is generated by make and should not be modified by the user >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo #  Name        : " << MAKE_CACHE_NAME << " >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo #  Part of     : " << project->values("TARGET").join(" ") << " >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo #  Description : This file is used to cache last build target for >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo #                make sisx target. >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo #  Version     :  >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo # >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo # ============================================================================== >> " MAKE_CACHE_NAME <<  endl;
+    t << "\t@echo. >> " MAKE_CACHE_NAME <<  endl;
+    t << "\t@echo PLATFORM ?= $(PLATFORM) >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo TARGET ?= $(TARGET) >> " MAKE_CACHE_NAME << endl;
+    t << endl;
+
+    generatedFiles << MAKE_CACHE_NAME;
+}
+
 void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension)
 {
     // Normally emulator deployment gets done via regular makefile, but since subdirs
diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h
index 7709d5d..67da43e 100644
--- a/qmake/generators/symbian/symmake_abld.h
+++ b/qmake/generators/symbian/symmake_abld.h
@@ -56,6 +56,7 @@ protected:
     virtual void writeMkFile(const QString& wrapperFileName, bool deploymentOnly);
     virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile);
 
+    void writeStoreBuildTarget(QTextStream &t);
     bool writeDeploymentTargets(QTextStream &t);
 
 public:
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 2471a2b..8b38f3b 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -219,6 +219,8 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
         qDeleteAll(subtargets);
     }
 
+    writeSisxTargets(t);
+
     generateDistcleanTargets(t);
 
     t << "clean: " << BLD_INF_FILENAME << endl;
@@ -402,6 +404,10 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     t << "END" << endl;
     t << endl;
 
+    t << "START EXTENSION qt/qmake_store_build" << endl;
+    t << "END" << endl;
+    t << endl;
+
     t << endl;
 }
 
-- 
cgit v0.12


From 7f08c316c4accf21c37ba75b299ca3504cb1a2ec Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Thu, 27 Aug 2009 09:34:44 +0300
Subject: Fixed createpackage.bat params to be more consistent with make
 targets.

Createpackage.bat now accepts also release/debug instead of urel/udeb.
Also the order is swicthed so that now you need to call:

>createpackage.bat [-i] pkgfile release armv5 [certificate key [passphrase]]

instead of

>createpackage.bat [-i] pkgfile armv5 urel [certificate key [passphrase]]

RevBy: Miikka Heikkinen
---
 bin/createpackage.pl                 | 15 +++++++++++----
 qmake/generators/symbian/symmake.cpp |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 8501174..856f318 100644
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -25,9 +25,9 @@ sub Usage() {
     print "Where parameters are as follows:\n";
     print "     [-i|install] = Install the package right away using PC suite\n";
     print "     templatepkg  = Name of .pkg file template\n";
+    print "     target       = Either debug|udeb or release|urel\n";    
     print "     platform     = One of the supported platform\n";
-    print "                    GCCE | ARMV5 | ARMV6 | ARMV7\n";
-    print "     target       = Either UDEB or UREL\n";
+    print "                    winscw | gcce | armv5 | armv6 | armv7\n";
     print "     certificate  = The certificate file used for signing\n";
     print "     key          = The certificate's private key file\n";
     print "     passphrase   = The certificate's private key file's passphrase\n";
@@ -47,8 +47,15 @@ unless (GetOptions('i|install' => \$install)){
 
 # Read params to variables
 my $templatepkg = $ARGV[0];
-my $platform = uc $ARGV[1];
-my $target = uc $ARGV[2];
+my $target = uc $ARGV[1];
+my $platform = uc $ARGV[2];
+
+# Make sure target contains only urel/udeb. 
+# i.e. convert possible given debug->udeb and release->urel
+$target =~ s/debug/udeb/i;
+$target =~ s/release/urel/i;
+
+# Make sure visual target contains only release/debug
 my $visualtarget = $target;
 $visualtarget =~ s/udeb/debug/i;
 $visualtarget =~ s/urel/release/i;
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 13feb25..5ce4304 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -1645,7 +1645,7 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
 
     t << OK_SISX_TARGET ":" << endl;
 
-    QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(PLATFORM) $(TARGET) $(CERTIFICATE) $(KEY) $(PASSPHRASE)")
+    QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(TARGET) $(PLATFORM) $(CERTIFICATE) $(KEY) $(PASSPHRASE)")
                           .arg(fileInfo(project->projectFile()).completeBaseName())
                           .arg("pkg");
     t << pkgcommand << endl;
-- 
cgit v0.12


From 8c4c7cc111331256b2637e067298e1c93b2e8c3c Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Thu, 27 Aug 2009 10:20:21 +0300
Subject: Bug fix for store_build target when using subdirs project template.

.make.cache need to be generated also for subdirs, this commit fixes
this bug in previous commit related to 'make sisx' target.
---
 qmake/generators/symbian/symmake_abld.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index d66557a..975a20f 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -102,12 +102,14 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString finalDepsWinscw;
         QStringList wrapperTargets;
         if (deploymentOnly) {
-            buildDeps.append(DO_NOTHING_TARGET);
+            buildDeps.append(STORE_BUILD_TARGET);
             cleanDeps.append(DO_NOTHING_TARGET);
             cleanDepsWinscw.append(WINSCW_DEPLOYMENT_CLEAN_TARGET);
             finalDeps.append(DO_NOTHING_TARGET);
             finalDepsWinscw.append(WINSCW_DEPLOYMENT_TARGET);
-            wrapperTargets << WINSCW_DEPLOYMENT_TARGET << WINSCW_DEPLOYMENT_CLEAN_TARGET;
+            wrapperTargets << WINSCW_DEPLOYMENT_TARGET 
+                << WINSCW_DEPLOYMENT_CLEAN_TARGET 
+                << STORE_BUILD_TARGET;
         } else {
             buildDeps.append(CREATE_TEMPS_TARGET " " PRE_TARGETDEPS_TARGET " " STORE_BUILD_TARGET);
             cleanDeps.append(EXTENSION_CLEAN);
-- 
cgit v0.12


From 6ae0b4848526719b526443b853bc95aa85cb6cb9 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Fri, 28 Aug 2009 09:07:13 +0300
Subject: Various small fixes and cleanups for symbian qmake generator.

The included fixes / cleanups:
    - QtLibs PKG filename changed
    - Component name in Qt libs pkg changed to "Qt for S60"
        * Done in order to make SISX upgrade possible after pre-release.
    - Removed passing of 'fixedTarget' member variable as an argument
    - Removed whitespaces from generated file names
    - Fixed 'make sisx' calling syntax when custom makefile name used
    - Fixed MAKEFILE variable content in generated makefiles
    - Changed names of environment variables used by 'make sisx'
        * Nee variables have 'QT_SISX_' prefix

Reviewed-By: Miikka Heikkinen
---
 doc/src/getting-started/installation.qdoc          |  2 +-
 mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm |  4 +-
 qmake/generators/symbian/symmake.cpp               | 59 +++++++-------
 qmake/generators/symbian/symmake.h                 |  6 +-
 qmake/generators/symbian/symmake_abld.cpp          | 12 ++-
 src/s60installs/qt_libs.pro                        | 91 ---------------------
 src/s60installs/s60installs.pro                    | 92 ++++++++++++++++++++++
 src/src.pro                                        |  5 +-
 8 files changed, 138 insertions(+), 133 deletions(-)
 delete mode 100644 src/s60installs/qt_libs.pro
 create mode 100644 src/s60installs/s60installs.pro

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 9bf774b..ec50060 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -520,7 +520,7 @@ in the \l{Qt for S60 Requirements} document.
         We've included a subset of the Qt demos in this package for you
         to try out. An excellent starting point is the "fluidlauncher"
         demo. To run the demo on a real device, you first have to install
-        \c{qt_libs.sis} and \c{fluidlauncher.sis} found in the Qt installation
+        \c{qt_for_s60.sis} and \c{fluidlauncher.sis} found in the Qt installation
         directory. Begin by connecting your phone using the USB cable and
         selecting "PC Suite mode". In Windows Explorer right click on the
         \c{.sis} files and select "Install with Nokia Application Installer"
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index 101f942..49d9bab 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -25,8 +25,8 @@ $(STORE_BUILD_TARGET):
 	echo "#                make sisx target." >> $(CACHE_FILENAME) && \
 	echo "#  Version     : " >> $(CACHE_FILENAME) && \
 	echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
-	echo PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
-	echo TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
+	echo QT_SISX_PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
+	echo QT_SISX_TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
 	$(call endrule,qmake_store_build)
 endef
 
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 5ce4304..aaa1903 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -246,9 +246,9 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
 
     if (targetType == TypeExe) {
         if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-            writeRegRssFile(fixedTarget, userRssRules);
-            writeRssFile(fixedTarget, numberOfIcons, iconFile);
-            writeLocFile(fixedTarget, symbianLangCodes);
+            writeRegRssFile(userRssRules);
+            writeRssFile(numberOfIcons, iconFile);
+            writeLocFile(symbianLangCodes);
         }
     }
 
@@ -261,7 +261,7 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
 void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile)
 {
     QString pkgFilename = QString("%1_template.%2")
-                          .arg(fileInfo(project->projectFile()).completeBaseName())
+                          .arg(fixedTarget)
                           .arg("pkg");
     QFile pkgFile(pkgFilename);
     if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -310,8 +310,11 @@ void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile)
     QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
 
     if (!containsStartWithItem('#', rawPkgPreRules)) {
+        QString visualTarget = escapeFilePath(fileFixify(project->first("TARGET")));
+        visualTarget = removePathSeparators(visualTarget);
+
         t << "; SIS header: name, uid, version" << endl;
-        t << QString("#{\"%1\"},(%2),%3").arg(fixedTarget).arg(uid3).arg(applicationVersion) << endl << endl;
+        t << QString("#{\"%1\"},(%2),%3").arg(visualTarget).arg(uid3).arg(applicationVersion) << endl << endl;
     }
 
     // Localized vendor name
@@ -466,6 +469,7 @@ void SymbianMakefileGenerator::init()
     MakefileGenerator::init();
     fixedTarget = escapeFilePath(fileFixify(project->first("TARGET")));
     fixedTarget = removePathSeparators(fixedTarget);
+    removeSpecialCharacters(fixedTarget);
 
     if (0 != project->values("QMAKE_PLATFORM").size())
         platform = varGlue("QMAKE_PLATFORM", "", " ", "");
@@ -1182,9 +1186,9 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
     }
 }
 
-void SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &userItems)
+void SymbianMakefileGenerator::writeRegRssFile(QStringList &userItems)
 {
-    QString filename(appName);
+    QString filename(fixedTarget);
     filename.append("_reg.rss");
     QFile ft(filename);
     if (ft.open(QIODevice::WriteOnly)) {
@@ -1197,7 +1201,7 @@ void SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &us
         t << "// * user." << endl;
         t << "// ============================================================================" << endl;
         t << endl;
-        t << "#include <" << appName << ".rsg>" << endl;
+        t << "#include <" << fixedTarget << ".rsg>" << endl;
         t << "#include <appinfo.rh>" << endl;
         t << endl;
         //t << "#include <data_caging_paths.hrh>" << "\n" << endl;
@@ -1205,8 +1209,8 @@ void SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &us
         t << "UID3 " << uid3 << endl << endl;
         t << "RESOURCE APP_REGISTRATION_INFO" << endl;
         t << "\t{" << endl;
-        t << "\tapp_file=\"" << appName << "\";" << endl;
-        t << "\tlocalisable_resource_file=\"" RESOURCE_DIRECTORY_RESOURCE << appName << "\";" << endl;
+        t << "\tapp_file=\"" << fixedTarget << "\";" << endl;
+        t << "\tlocalisable_resource_file=\"" RESOURCE_DIRECTORY_RESOURCE << fixedTarget << "\";" << endl;
         t << endl;
 
         foreach(QString item, userItems)
@@ -1217,9 +1221,9 @@ void SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &us
     }
 }
 
-void SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfIcons, QString &iconFile)
+void SymbianMakefileGenerator::writeRssFile(QString &numberOfIcons, QString &iconFile)
 {
-    QString filename(appName);
+    QString filename(fixedTarget);
     filename.append(".rss");
     QFile ft(filename);
     if (ft.open(QIODevice::WriteOnly)) {
@@ -1233,7 +1237,7 @@ void SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfI
         t << "// ============================================================================" << endl;
         t << endl;
         t << "#include <appinfo.rh>" << endl;
-        t << "#include \"" << appName << ".loc\"" << endl;
+        t << "#include \"" << fixedTarget << ".loc\"" << endl;
         t << endl;
         t << "RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info" << endl;
         t << "\t{" << endl;
@@ -1260,9 +1264,9 @@ void SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfI
     }
 }
 
-void SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbianLangCodes)
+void SymbianMakefileGenerator::writeLocFile(QStringList &symbianLangCodes)
 {
-    QString filename(appName);
+    QString filename(fixedTarget);
     filename.append(".loc");
     QFile ft(filename);
     if (ft.open(QIODevice::WriteOnly)) {
@@ -1276,18 +1280,16 @@ void SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbi
         t << "// ============================================================================" << endl;
         t << endl;
         t << "#ifdef LANGUAGE_SC" << endl;
-        //t << "#include \"" << appName << ".l01\"" << endl;
-        t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
+        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
+        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
         foreach(QString lang, symbianLangCodes) {
             t << "#elif defined LANGUAGE_" << lang << endl;
-            //t << "#include \"" << appName << ".l" << lang << "\"" << endl;
-            t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
-            t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
+            t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
+            t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
         }
         t << "#else" << endl;
-        t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
+        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
+        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
         t << "#endif" << endl;
     } else {
         PRINT_FILE_CREATE_ERROR(filename);
@@ -1633,8 +1635,10 @@ void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
 void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
 {
     t << SISX_TARGET ": " RESTORE_BUILD_TARGET << endl;
-    QString sisxcommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3),$(MAKE) -s %4,$(MAKE) -s %5),$(MAKE) -s %6)")
-                          .arg(fileInfo(project->projectFile()).completeBaseName())
+    QString sisxcommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
+                                  "$(MAKE) -s -f $(MAKEFILE) %4,$(MAKE) -s -f $(MAKEFILE) %5)," \
+                                  "$(MAKE) -s -f $(MAKEFILE) %6)")
+                          .arg(fixedTarget)
                           .arg("pkg")
                           .arg(MAKE_CACHE_NAME)
                           .arg(OK_SISX_TARGET)
@@ -1645,8 +1649,9 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
 
     t << OK_SISX_TARGET ":" << endl;
 
-    QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(TARGET) $(PLATFORM) $(CERTIFICATE) $(KEY) $(PASSPHRASE)")
-                          .arg(fileInfo(project->projectFile()).completeBaseName())
+    QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(QT_SISX_TARGET) " \
+                                 "$(QT_SISX_PLATFORM) $(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)")
+                          .arg(fixedTarget)
                           .arg("pkg");
     t << pkgcommand << endl;
     t << endl;
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index b4b3022..ce65822 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -117,9 +117,9 @@ protected:
 
     void writeCustomDefFile();
 
-    void writeRegRssFile(QString &appname, QStringList &useritems);
-    void writeRssFile(QString &appName, QString &numberOfIcons, QString &iconfile);
-    void writeLocFile(QString &appName, QStringList &symbianLangCodes);
+    void writeRegRssFile(QStringList &useritems);
+    void writeRssFile(QString &numberOfIcons, QString &iconfile);
+    void writeLocFile(QStringList &symbianLangCodes);
     void readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules);
 
     QStringList symbianLangCodesFromTsFiles();
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 975a20f..254bf9c 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -147,7 +147,7 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
         foreach(QString target, wrapperTargets) {
             t << target << " : " << makefile << endl;
-            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " PLATFORM=$(PLATFORM) TARGET=$(CFG)" << endl << endl;
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SISX_PLATFORM=$(PLATFORM) QT_SISX_TARGET=$(CFG)" << endl << endl;
         }
 
         t << endl;
@@ -183,10 +183,8 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
     t << "#" << endl;
     t << "# ==============================================================================" << "\n" << endl;
     t << endl;
-    QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
-    if (ofile.lastIndexOf(Option::dir_sep) != -1)
-        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) - 1);
-    t << "MAKEFILE          = " << ofile << endl;
+
+    t << "MAKEFILE          = " << wrapperFile.fileName() << endl;
     t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
     t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
     t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
@@ -429,8 +427,8 @@ void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t)
     t << "\t@echo # >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo # ============================================================================== >> " MAKE_CACHE_NAME <<  endl;
     t << "\t@echo. >> " MAKE_CACHE_NAME <<  endl;
-    t << "\t@echo PLATFORM ?= $(PLATFORM) >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo TARGET ?= $(TARGET) >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo QT_SISX_PLATFORM ?= $(QT_SISX_PLATFORM) >> " MAKE_CACHE_NAME << endl;
+    t << "\t@echo QT_SISX_TARGET ?= $(QT_SISX_TARGET) >> " MAKE_CACHE_NAME << endl;
     t << endl;
 
     generatedFiles << MAKE_CACHE_NAME;
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
deleted file mode 100644
index f24a03f..0000000
--- a/src/s60installs/qt_libs.pro
+++ /dev/null
@@ -1,91 +0,0 @@
-# Use subdirs template to suppress generation of unnecessary files
-TEMPLATE = subdirs
-
-symbian: {
-    load(data_caging_paths)
-
-    SUBDIRS=
-    TARGET = "QtLibs pre-release"
-    TARGET.UID3 = 0x2001E61C
-    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-
-    qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
-    qtresources.path = $$APP_RESOURCE_DIR
-
-    qtlibraries.sources = \
-        QtCore.dll \
-        QtXml.dll \
-        QtGui.dll \
-        QtNetwork.dll \
-        QtTest.dll \
-        QtSql.dll \
-        qts60plugin_3_1.dll \
-        qts60plugin_3_2.dll \
-        qts60plugin_5_0.dll
-
-
-    # TODO: This should be conditional in PKG file, see commented code below
-    # However we don't yet have such mechanism in place
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        contains(CONFIG, system-sqlite): qtlibraries.sources += sqlite3.dll
-    }
-
-    #; EXISTS statement does not resolve !. Lets check the most common drives
-    #IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll")
-    #"\Epoc32\release\armv5\UREL\sqlite3.dll"-"!:\sys\bin\sqlite3.dll"
-    #ENDIF
-
-    qtlibraries.path = /sys/bin
-
-    vendorinfo = \
-        "; Localised Vendor name" \
-        "%{\"Nokia, Qt\"}" \
-        " " \
-        "; Unique Vendor name" \
-        ":\"Nokia, Qt\"" \
-        " "
-
-
-    qtlibraries.pkg_prerules = vendorinfo
-    qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
-    qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
-    contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-        qtlibraries.pkg_prerules += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
-    }
-    contains(CONFIG, stl) {
-        qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
-    }
-
-    !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
-    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
-    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
-    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
-    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.dll
-    imageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats
-
-    codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
-    codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
-
-    DEPLOYMENT += qtresources qtlibraries imageformats_plugins codecs_plugins graphicssystems_plugins
-
-    contains(QT_CONFIG, svg): {
-       qtlibraries.sources += QtSvg.dll
-       imageformats_plugins.sources += qsvg.dll
-       iconengines_plugins.sources = qsvgicon.dll
-       iconengines_plugins.path = $$QT_PLUGINS_BASE_DIR/iconengines
-       DEPLOYMENT += iconengines_plugins
-    }
-
-    contains(QT_CONFIG, phonon): {
-       qtlibraries.sources += Phonon.dll
-    }
-
-    graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems
-    contains(QT_CONFIG, openvg) {
-        qtlibraries.sources = QtOpenVG.dll
-        graphicssystems_plugins.sources += qvggraphicssystem.dll
-    }
-
-    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
-    BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
-}
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
new file mode 100644
index 0000000..0314958
--- /dev/null
+++ b/src/s60installs/s60installs.pro
@@ -0,0 +1,92 @@
+# Use subdirs template to suppress generation of unnecessary files
+TEMPLATE = subdirs
+
+symbian: {
+    load(data_caging_paths)
+
+    SUBDIRS=
+    # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
+    TARGET = "Qt for S60"
+    TARGET.UID3 = 0x2001E61C
+    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+
+    qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
+    qtresources.path = $$APP_RESOURCE_DIR
+
+    qtlibraries.sources = \
+        QtCore.dll \
+        QtXml.dll \
+        QtGui.dll \
+        QtNetwork.dll \
+        QtTest.dll \
+        QtSql.dll \
+        qts60plugin_3_1.dll \
+        qts60plugin_3_2.dll \
+        qts60plugin_5_0.dll
+
+
+    # TODO: This should be conditional in PKG file, see commented code below
+    # However we don't yet have such mechanism in place
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        contains(CONFIG, system-sqlite): qtlibraries.sources += sqlite3.dll
+    }
+
+    #; EXISTS statement does not resolve !. Lets check the most common drives
+    #IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll")
+    #"\Epoc32\release\armv5\UREL\sqlite3.dll"-"!:\sys\bin\sqlite3.dll"
+    #ENDIF
+
+    qtlibraries.path = /sys/bin
+
+    vendorinfo = \
+        "; Localised Vendor name" \
+        "%{\"Nokia, Qt\"}" \
+        " " \
+        "; Unique Vendor name" \
+        ":\"Nokia, Qt\"" \
+        " "
+
+
+    qtlibraries.pkg_prerules = vendorinfo
+    qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
+    qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
+    contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+        qtlibraries.pkg_prerules += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
+    }
+    contains(CONFIG, stl) {
+        qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
+    }
+
+    !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
+    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
+    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
+    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
+    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.dll
+    imageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats
+
+    codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+    codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+
+    DEPLOYMENT += qtresources qtlibraries imageformats_plugins codecs_plugins graphicssystems_plugins
+
+    contains(QT_CONFIG, svg): {
+       qtlibraries.sources += QtSvg.dll
+       imageformats_plugins.sources += qsvg.dll
+       iconengines_plugins.sources = qsvgicon.dll
+       iconengines_plugins.path = $$QT_PLUGINS_BASE_DIR/iconengines
+       DEPLOYMENT += iconengines_plugins
+    }
+
+    contains(QT_CONFIG, phonon): {
+       qtlibraries.sources += Phonon.dll
+    }
+
+    graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems
+    contains(QT_CONFIG, openvg) {
+        qtlibraries.sources = QtOpenVG.dll
+        graphicssystems_plugins.sources += qvggraphicssystem.dll
+    }
+
+    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
+    BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
+}
diff --git a/src/src.pro b/src/src.pro
index feb6a9c..1801d55 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,8 +6,7 @@ win32:SRC_SUBDIRS += src_winmain
 wince*:{
   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib
 } else:symbian {
-  SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib
-  SRC_SUBDIRS += $$QT_SOURCE_TREE/src/s60installs/qt_libs.pro
+  SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs
 } else {
     SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_testlib
     !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
@@ -37,6 +36,8 @@ SRC_SUBDIRS += src_plugins
 
 src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main
 src_s60main.target = sub-s60main
+src_s60installs.subdir = $$QT_SOURCE_TREE/src/s60installs
+src_s60installs.target = sub-s60installs
 src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain
 src_winmain.target = sub-winmain
 src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
-- 
cgit v0.12


From 92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Fri, 28 Aug 2009 09:45:59 +0300
Subject: Minor fix to MAKEFILE variable in SBSv2 generated makefiles.

MAKEFILE variable pointed to root bld.inf from which makefile was
generated but it shoudl contain the makefile name instead. This is how
it work in abld generator.

Reviewed-by: TrustMe
---
 qmake/generators/symbian/symmake_sbsv2.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 8b38f3b..9891a2e 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -123,10 +123,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     t << "#" << endl;
     t << "# ==============================================================================" << "\n" << endl;
     t << endl;
-    QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
-    if (ofile.lastIndexOf(Option::dir_sep) != -1)
-        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) - 1);
-    t << "MAKEFILE          = " << ofile << endl;
+    t << "MAKEFILE          = " << wrapperFile.fileName() << endl;
     t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
     t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
     t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
-- 
cgit v0.12


From d7cdd1989081a0da7746fb6ce64896c0fe85e9d5 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Fri, 28 Aug 2009 10:48:37 +0300
Subject: Changed createpackage parameters to be more consistent with make
 targets.

Earlier createpackage required two separate parameters to define the
platform and target. For example
    > createpackage fluidlauncher_template.pkg release armv5

Now it is changed to:
    > createpackage fluidlauncher_template.pkg release-armv5

This is consistent to make target what is used to do the building i.e.:
    > make release-armv5

The change also affected environment variables supported by 'make sisx'
target. QT_SISX_PLATFORM is not any more supported, and the info is
merged QT_SISX_TARGET variable.

Reviewed-by: Miikka Heikkinen
---
 bin/createpackage.pl                               | 30 +++++++++++-----------
 mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm |  8 ++++--
 qmake/generators/symbian/symmake.cpp               |  2 +-
 qmake/generators/symbian/symmake_abld.cpp          | 15 +++++++----
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 856f318..b7f4682 100644
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -20,18 +20,21 @@ sub Usage() {
     print "==========================================================================================\n";
     print "Convenience script for creating signed packages you can install on your phone.\n";
     print "\n";
-    print "Usage: createpackage.pl [-i] templatepkg platform target [certificate key [passphrase]]\n";
+    print "Usage: createpackage.pl [-i] templatepkg target-platform [certificate key [passphrase]]\n";
     print "\n";
     print "Where parameters are as follows:\n";
     print "     [-i|install] = Install the package right away using PC suite\n";
     print "     templatepkg  = Name of .pkg file template\n";
-    print "     target       = Either debug|udeb or release|urel\n";    
+    print "     target       = Either debug or release\n";    
     print "     platform     = One of the supported platform\n";
     print "                    winscw | gcce | armv5 | armv6 | armv7\n";
     print "     certificate  = The certificate file used for signing\n";
     print "     key          = The certificate's private key file\n";
     print "     passphrase   = The certificate's private key file's passphrase\n";
     print "\n";
+    print "For example:\n";    
+    print "     createpackage.pl fluidlauncher_template.pkg release-armv5\n";        
+    print "\n";
     print "If no certificate and key files are provided, either a RnD certificate or\n";
     print "a self-signed certificate from Qt installation root directory is used.\n";
     print "\n";
@@ -47,26 +50,23 @@ unless (GetOptions('i|install' => \$install)){
 
 # Read params to variables
 my $templatepkg = $ARGV[0];
-my $target = uc $ARGV[1];
-my $platform = uc $ARGV[2];
+my $targetplatform = uc $ARGV[1];
+
+my @tmpvalues = split('-', $targetplatform);
+my $target = $tmpvalues[0];
+my $platform = $tmpvalues[1];;
 
-# Make sure target contains only urel/udeb. 
-# i.e. convert possible given debug->udeb and release->urel
+# Convert visual target to real target (debug->udeb and release->urel)
 $target =~ s/debug/udeb/i;
 $target =~ s/release/urel/i;
 
-# Make sure visual target contains only release/debug
-my $visualtarget = $target;
-$visualtarget =~ s/udeb/debug/i;
-$visualtarget =~ s/urel/release/i;
-
-my $certificate = $ARGV[3];
-my $key = $ARGV[4];
-my $passphrase = $ARGV[5];
+my $certificate = $ARGV[2];
+my $key = $ARGV[3];
+my $passphrase = $ARGV[4];
 
 # Generate output pkg basename (i.e. file name without extension)
 my $pkgoutputbasename = $templatepkg;
-$pkgoutputbasename =~ s/_template\.pkg/_$visualtarget-$platform/g;
+$pkgoutputbasename =~ s/_template\.pkg/_$targetplatform/g;
 $pkgoutputbasename = lc($pkgoutputbasename);
 
 # Store output file names to variables
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index 49d9bab..96eb189 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -12,6 +12,11 @@ include $(FLMHOME)/metaflm.mk
 STORE_BUILD_TARGET:=$(call sanitise,TSTORE_BUILD_$(PLATFORM_PATH)_$(CFG_PATH)_$(EXTENSION_ROOT))
 CACHE_FILENAME:=$(EXTENSION_ROOT)/.make.cache
 
+VISUAL_CFG:=RELEASE
+ifeq "$(CFG_PATH)" "UDEB"
+VISUAL_CFG:=DEBUG
+endif
+
 define qmake_store_build
 FINAL:: $(STORE_BUILD_TARGET)
 
@@ -25,8 +30,7 @@ $(STORE_BUILD_TARGET):
 	echo "#                make sisx target." >> $(CACHE_FILENAME) && \
 	echo "#  Version     : " >> $(CACHE_FILENAME) && \
 	echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
-	echo QT_SISX_PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
-	echo QT_SISX_TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
+	echo QT_SISX_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \
 	$(call endrule,qmake_store_build)
 endef
 
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index aaa1903..48fc8ef 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -1650,7 +1650,7 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
     t << OK_SISX_TARGET ":" << endl;
 
     QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(QT_SISX_TARGET) " \
-                                 "$(QT_SISX_PLATFORM) $(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)")
+                                 "$(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)")
                           .arg(fixedTarget)
                           .arg("pkg");
     t << pkgcommand << endl;
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 254bf9c..d287106 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -88,9 +88,15 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         t << "# ==============================================================================" << "\n" << endl;
 
         t << endl << endl;
-
+        
         t << "MAKE = make" << endl;
         t << endl;
+        
+        t << "VISUAL_CFG = RELEASE" << endl;
+        t << "ifeq \"$(CFG)\" \"UDEB\"" << endl;        
+        t << "VISUAL_CFG = DEBUG" << endl;        
+        t << "endif" << endl;           
+        t << endl;        
 
         t << DO_NOTHING_TARGET " :" << endl;
         t << "\t" << "@rem " DO_NOTHING_TARGET << endl << endl;
@@ -147,9 +153,9 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
         foreach(QString target, wrapperTargets) {
             t << target << " : " << makefile << endl;
-            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SISX_PLATFORM=$(PLATFORM) QT_SISX_TARGET=$(CFG)" << endl << endl;
-        }
-
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << "QT_SISX_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;                    
+        }     
+        
         t << endl;
     } // if(ft.open(QIODevice::WriteOnly))
 }
@@ -427,7 +433,6 @@ void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t)
     t << "\t@echo # >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo # ============================================================================== >> " MAKE_CACHE_NAME <<  endl;
     t << "\t@echo. >> " MAKE_CACHE_NAME <<  endl;
-    t << "\t@echo QT_SISX_PLATFORM ?= $(QT_SISX_PLATFORM) >> " MAKE_CACHE_NAME << endl;
     t << "\t@echo QT_SISX_TARGET ?= $(QT_SISX_TARGET) >> " MAKE_CACHE_NAME << endl;
     t << endl;
 
-- 
cgit v0.12


From a72b61fa95f696a00e7598b12ac1745ff714d756 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Fri, 28 Aug 2009 13:16:42 +0300
Subject: Minor fix to space usage in makefile.

Reviewed-by: TrustMe
---
 qmake/generators/symbian/symmake_abld.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index d287106..49cd7ed 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -153,7 +153,7 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
         QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath()));
         foreach(QString target, wrapperTargets) {
             t << target << " : " << makefile << endl;
-            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << "QT_SISX_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;                    
+            t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SISX_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;                    
         }     
         
         t << endl;
-- 
cgit v0.12