diff options
| author | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-05-27 13:08:57 +1000 |
|---|---|---|
| committer | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-05-27 13:08:57 +1000 |
| commit | 5bd9b000ee881970542089d18726ed577c764a50 (patch) | |
| tree | d975efbb3325315a274e5505d79fdf5dd0cf815c /configure | |
| parent | 1df6435e7dc1928ce02ac35427c15690eaad3dc1 (diff) | |
| parent | c3b8e010719d54b0af79bf8149e204d7cc2b2a5d (diff) | |
Merge branch 'master' of ../qtm-contacts
Conflicts:
plugins/plugins.pro
src/versit/qversitreader_p.cpp
src/versit/qversitreader_p.h
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 24 insertions, 2 deletions
@@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## @@ -86,6 +86,7 @@ QT_MOBILITY_PREFIX=$shadowpath/install QT_MOBILITY_INCLUDE= QT_MOBILITY_LIB= QT_MOBILITY_BIN= +QT_MOBILITY_PLUGINS= BUILD_UNITTESTS= BUILD_EXAMPLES= BUILD_DOCS=yes @@ -96,6 +97,7 @@ LINUX_TARGET= QMAKE_CACHE="$shadowpath/.qmake.cache" LIB_PATH="lib" BIN_PATH="bin" +PLUGIN_PATH="plugins" MAC_SDK= MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors organizer" MOBILITY_MODULES_UNPARSED= @@ -119,6 +121,8 @@ usage() echo " (default PREFIX/lib)" echo "-bindir <dir> ..... Executables will be installed to <dir>" echo " (default PREFIX/bin)" + echo "-plugindir <dir> .. Plug-ins will be installed to <dir>" + echo " (default PREFIX/plugins)" echo "-debug ............ Build with debugging symbols" echo "-release .......... Build without debugging symbols" echo "-silent ........... Reduces build output" @@ -171,6 +175,10 @@ while [ "$#" -gt 0 ]; do QT_MOBILITY_BIN="$2" shift ;; + -plugindir) + QT_MOBILITY_PLUGINS="$2" + shift + ;; -tests) BUILD_UNITTESTS="yes" ;; @@ -338,7 +346,7 @@ else fi echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB" >> "$CONFIG_IN" -#process binary path +#process bin path if [ -z "$QT_MOBILITY_BIN" ]; then QT_MOBILITY_BIN="$QT_MOBILITY_PREFIX/$BIN_PATH" elif [ -d "$QT_MOBILITY_BIN" ]; then @@ -350,6 +358,19 @@ else fi echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN" >> "$CONFIG_IN" +#process plugin path +if [ -z "$QT_MOBILITY_PLUGINS" ]; then + QT_MOBILITY_PLUGINS="$QT_MOBILITY_PREFIX/$PLUGIN_PATH" +elif [ -d "$QT_MOBILITY_PLUGINS" ]; then + QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET` +else + mkdir -p "$QT_MOBILITY_PLUGINS" + QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET` + rm -rf "$QT_MOBILITY_PLUGINS" +fi +echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN" + + echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE" echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE" @@ -448,6 +469,7 @@ compileTest NetworkManager networkmanager compileTest "CoreWLAN (MacOS 10.6)" corewlan compileTest "Maemo ICD" maemo-icd compileTest "Maemo ICD WLAN" maemo-icd-network-wlan +compileTest "Maemo5 contacts dependencies" maemo5-contacts if [ "$LINUX_TARGET" = maemo6 ]; then compileTest sensord sensord else |