summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-31 13:11:28 +0300
committerJanne Anttila <janne.anttila@digia.com>2009-08-31 13:11:28 +0300
commitc9e10372b59584c99f225bdf5453f0f03b9d5f59 (patch)
tree2a5f2531c3da582fc0faab097d80d2fec9342841 /src/s60installs
parent43cf31a43a5359c83b7851554f6df5fe75e1c285 (diff)
Install only the required S60 SDK version specific plugin to the HW.
qmake has been lately expanded with pkg_prerules / pkg_postrules support which make it possible to customize .pkg file content via pro file. In addition we have got template package file support which takes care of expanding TARGET and PLATFORM variables from .pkg files before creating .sis file. With help of these features and since .pkg format supports conditional install statements, we can now install only the S60 version specific plugin to each HW. This saves disk usage a bit. Task-number: 248061 Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/s60installs.pro30
1 files changed, 19 insertions, 11 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 390cc1177f..62661ede3a 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -6,7 +6,7 @@ symbian: {
SUBDIRS=
# WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
- # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
+ # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
TARGET = "Qt for S60"
TARGET.UID3 = 0x2001E61C
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
@@ -20,19 +20,27 @@ symbian: {
QtGui.dll \
QtNetwork.dll \
QtTest.dll \
- QtSql.dll \
- qts60plugin_3_1.dll \
- qts60plugin_3_2.dll \
- qts60plugin_5_0.dll
-
-
+ QtSql.dll
+
+ qts60plugindeployment = \
+ "IF package(0x1028315F)" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+ "ELSEIF package(0x102752AE)" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"!:\\sys\\bin\\qts60plugin_3_2.dll\"" \
+ "ELSEIF package(0x102032BE)" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"!:\\sys\\bin\\qts60plugin_3_1.dll\"" \
+ "ELSE" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+ "ENDIF"
+ qtlibraries.pkg_postrules += qts60plugindeployment
+
sqlitedeployment = \
- "; EXISTS statement does not resolve!. Lets check the most common drives" \
+ "; 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\")" \
- "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\"-\"!:\\sys\\bin\\sqlite3.dll\"" \
+ "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\" - \"!:\\sys\\bin\\sqlite3.dll\"" \
"ENDIF"
- qtlibraries.pkg_postrules = sqlitedeployment
-
+ qtlibraries.pkg_postrules += sqlitedeployment
+
qtlibraries.path = /sys/bin
vendorinfo = \