From 1a4f72da5aefa92b2bb78cf1ff96c34d7c3c303c Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Tue, 6 Apr 2010 15:39:39 +0200
Subject: Make shipped symbian scripts available from the build-dir bin dir.
Reviewed-by: Denis Dzyubenko
---
configure | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/configure b/configure
index 0dbf98f..30bc564 100755
--- a/configure
+++ b/configure
@@ -2315,6 +2315,17 @@ if [ "$OPT_SHADOW" = "yes" ]; then
chmod 755 "$outpath/bin/syncqt"
fi
+ for i in createpackage patch_capabilities; do
+ rm -f "$outpath/bin/$i"
+ if [ -x "$relpath/bin/$i" ]; then
+ mkdir -p "$outpath/bin"
+ echo "#!/bin/sh" >"$outpath/bin/$i"
+ echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/$i"
+ echo "\"$relpath/bin/$i\" \"\$@\"" >>"$outpath/bin/$i"
+ chmod 755 "$outpath/bin/$i"
+ fi
+ done
+
# symlink the mkspecs directory
mkdir -p "$outpath/mkspecs"
rm -f "$outpath"/mkspecs/*
--
cgit v0.12
From 443f8e21b8217d80fa323d20ec163df5a3adcbc0 Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Tue, 6 Apr 2010 15:40:54 +0200
Subject: Fix 'make sis' working on symbian makefile based system again.
Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2
---
src/s60installs/s60installs.pro | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index ffd15e6..dfce7d2 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -16,9 +16,15 @@ symbian: {
BLD_INF_RULES.prj_exports += \
"sqlite3.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis" \
"sqlite3_selfsigned.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3_selfsigned.sis"
- sqlitedeployment = \
- "; Deploy sqlite onto phone that does not have it already" \
- "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
+ symbian-abld|symbian-sbsv2 {
+ sqlitedeployment = \
+ "; Deploy sqlite onto phone that does not have it already" \
+ "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
+ } else {
+ sqlitedeployment = \
+ "; Deploy sqlite onto phone that does not have it already" \
+ "@\"$${PWD}/sqlite3.sis\", (0x2002af5f)"
+ }
qtlibraries.pkg_postrules += sqlitedeployment
} else {
# Always use experimental UID for infixed configuration to avoid UID clash
--
cgit v0.12