Added support for smart installer package generation in Symbian

Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them

Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.

This commit is still missing properly signed bootstrap.sis package.

Task-number: QTBUG-7908
Reviewed-by: Shane Kearns

4 files changed, 45 insertions, 24 deletions

diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 8ba106c..575a6dc 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1573,18 +1573,13 @@
     By default \c .pkg file generated by \c qmake adds support for all
     S60 3rd edition FP1, S60 3rd edition FP2 and S60 5th edition devices.
 
-    As a last step we will embed the \c qt_installer.sis file to the Wiggly
-    deployment file:
+    As a last step we will instruct qmake to generate smart installer \c .pkg file by defining
+    the UID of the installation package. The UID needs to be different than the application UID,
+    and should be reserved via normal Symbian mechanisms. You can use a random UID starting with
+    \c 0xE for testing purposes:
 
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 58
 
-    When \c qt_installer.sis is embedded to the application deployment file, the
-    end-user does not need to download and install all dependencies separately.
-    The drawback of \c .sis embedding is that the application \c .sis file size becomes
-    big. To address these problems Forum Nokia is planning to release a smart installer
-    which will take care of downloading and installing the necessary dependencies
-    over-the-air. The expected availability of smart installer is 1Q 2010.
-
     Now we are ready to compile the application and create the application
     deployment file. Run \c qmake to create Symbian specific makefiles, resources (\.rss)
     and deployment packaging files (\c .pkg). And do build to create the
@@ -1593,13 +1588,26 @@
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 59
 
     If everything compiled and linked without any errors, we are now ready to create
-    an application installation file:
+    an application package (\c wiggly.sis):
 
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 60
 
-    If all binaries and dependencies were found, we should now have a self-signed
-    \c wiggly_release-gcce.sis ready to be installed on a device. For more information
-    about creating a \c .sis file and installing it to device see also
+    Now you can create the smart installer package for the application:
+
+    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 61
+
+    If all binaries and dependencies were found, you should now have a self signed
+    \c wiggly_installer.sis ready to be installed on a device. The smart installer
+    contained in the in the installer package will download the necessary dependencies
+    such as Qt libraries to the device.
+
+    \note If you want to have your application properly Symbian Signed for distribution,
+    you will have to properly sign both the application and the application installer packages.
+    Please see
+    \l{http://developer.symbian.org/wiki/index.php/Category:Symbian_Signed}
+    {Symbian Signed wiki} for more information about Symbian Signed.
+
+    For more information about creating a \c .sis file and installing it to device see also
     \l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}.
 
 */
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d7aa0db..49e1e71 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1431,6 +1431,18 @@ is the application private directory on the drive it is installed to.
     
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141
     
+    On the Symbian platform, you can use \c{DEPLOYMENT.installer_header}
+    variable to generate smart installer wrapper for your application.
+    If you specify just UID of the installer package as the value, then
+    installer package name and version will be autogenerated:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 146
+
+    If autogenerated values are not suitable, you can also specify the sis
+    header yourself using this variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 147
+
     \target DEPLOYMENT_PLUGIN
     \section1 DEPLOYMENT_PLUGIN
 
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
index 7eb8808..9c00681 100644
--- a/doc/src/snippets/code/doc_src_deployment.qdoc
+++ b/doc/src/snippets/code/doc_src_deployment.qdoc
@@ -475,11 +475,7 @@ default_deployment.pkg_prerules += supported_platforms
 //! [57]
 
 //! [58]
-embedded_deployments = \
-    "; Embed Qt dependencies" \
-    "@\"$$[QT_INSTALL_PREFIX]/qt_installer.sis\",(0x2001E62D)"
-
-default_deployment.pkg_prerules += embedded_deployments
+DEPLOYMENT.installer_header = 0xE2345678
 //! [58]
 
 //! [59]
@@ -489,4 +485,9 @@ make release-gcce
 
 //! [60]
 make sis
-//! [60]
\ No newline at end of file
+ren wiggly_release-gcce.sis wiggly.sis
+//! [60]
+
+//! [61]
+createpackage wiggly_installer.pkg
+//! [61]
\ No newline at end of file
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index b1cbc72..a48b53f 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -963,9 +963,9 @@ RSS_RULES += myrssrules
 //! [145]
 
 //! [146]
-BLD_INF_RULES.prj_exports += \
-    "$${LITERAL_HASH}include <platform_paths.hrh>" \
-    "rom/my.iby  APP_LAYER_PUBLIC_EXPORT_PATH(my.iby)" \
-    "inc/myheader.h mycomp/myheader.h" \
-    ":zip my_api.zip my_api"
+DEPLOYMENT.installer_header = 0x12345678
 //! [146]
+
+//! [147]
+DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
+//! [147]