diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-06-30 17:05:00 +1000 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-06-30 17:05:00 +1000 |
commit | 4525d6fa9d75500766aab508688ea317dcaec38e (patch) | |
tree | d15085a90b47b8147c16bd14c2e4799c1f6744de /configure | |
parent | fc72e4295528f532f63578afe19df5d0e0291b92 (diff) | |
parent | 43c31f591a9ae9261ee869a617d39e1ab6cf66ee (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
configure
configure.bat
doc/html/annotated.html
doc/html/classes.html
doc/html/fetchgooglemaps.html
doc/html/functions.html
doc/html/hierarchy.html
doc/html/index.html
doc/html/installation.html
doc/html/lightmaps.html
doc/html/location-overview.html
doc/html/location.html
doc/html/logfilepositionsource.html
doc/html/multimedia.html
doc/html/qabstractvideobuffer.html
doc/html/qabstractvideosurface.html
doc/html/qaudiocapturesource.html
doc/html/qaudioencodercontrol.html
doc/html/qaudioencodersettings.html
doc/html/qaudioendpointselector.html
doc/html/qcontactfilter.html
doc/html/qgeoareamonitor.html
doc/html/qgeocoordinate.html
doc/html/qgeopositioninfo.html
doc/html/qgeopositioninfosource.html
doc/html/qgeosatelliteinfo.html
doc/html/qgeosatelliteinfosource.html
doc/html/qgraphicsvideoitem.html
doc/html/qimageencodercontrol.html
doc/html/qimageencodersettings.html
doc/html/qmediabindableinterface.html
doc/html/qmediacontainercontrol.html
doc/html/qmediacontent.html
doc/html/qmediacontrol.html
doc/html/qmediaimageviewer.html
doc/html/qmediaobject.html
doc/html/qmediaplayer.html
doc/html/qmediaplayercontrol.html
doc/html/qmediaplaylist.html
doc/html/qmediaplaylistcontrol.html
doc/html/qmediaplaylistnavigator.html
doc/html/qmediaplaylistprovider.html
doc/html/qmediaplaylistreader.html
doc/html/qmediaplaylistsourcecontrol.html
doc/html/qmediarecorder.html
doc/html/qmediarecordercontrol.html
doc/html/qmediaresource.html
doc/html/qmediaservice.html
doc/html/qmediaserviceprovider.html
doc/html/qmediaserviceproviderhint.html
doc/html/qmediaservicesupportedformatsinterface.html
doc/html/qmediastreamscontrol.html
doc/html/qmediatimeinterval.html
doc/html/qmetadatareadercontrol.html
doc/html/qmetadatawritercontrol.html
doc/html/qml-audio.html
doc/html/qml-video.html
doc/html/qmlcontacts-contents-default-svg.html
doc/html/qmlcontacts-imageprovider-cpp.html
doc/html/qmlcontacts-imageprovider-h.html
doc/html/qmlcontacts-plugin-cpp.html
doc/html/qmlcontacts-qmlcontactdetail-cpp.html
doc/html/qmlcontacts-qmlcontactdetail-h.html
doc/html/qmlcontacts-qmlcontactdetailfield-cpp.html
doc/html/qmlcontacts-qmlcontactdetailfield-h.html
doc/html/qmlcontacts-qmlcontactmodel-cpp.html
doc/html/qmlcontacts-qmlcontactmodel-h.html
doc/html/qmlcontacts-qmlcontacts-pro.html
doc/html/qmlcontacts.html
doc/html/qnmeapositioninfosource.html
doc/html/qradiotuner.html
doc/html/qradiotunercontrol.html
doc/html/qservicefilter.html
doc/html/qserviceinterfacedescriptor.html
doc/html/qservicemanager.html
doc/html/qsystemdeviceinfo-members.html
doc/html/qsystemdeviceinfo.html
doc/html/qsystemdisplayinfo-members.html
doc/html/qsystemdisplayinfo.html
doc/html/qsysteminfo-members.html
doc/html/qsysteminfo.html
doc/html/qsystemnetworkinfo-members.html
doc/html/qsystemnetworkinfo.html
doc/html/qsystemscreensaver-members.html
doc/html/qsystemscreensaver.html
doc/html/qsystemstorageinfo-members.html
doc/html/qsystemstorageinfo.html
doc/html/qt-mobility-project-library.dcf
doc/html/qt-mobility-project-library.index
doc/html/qtmobility-known-issues.html
doc/html/qtmobility.qhp
doc/html/qtmultimediakit.html
doc/html/quickstart.html
doc/html/qvideodevicecontrol.html
doc/html/qvideoencodercontrol.html
doc/html/qvideoencodersettings.html
doc/html/qvideoframe.html
doc/html/qvideorenderercontrol.html
doc/html/qvideosurfaceformat.html
doc/html/qvideowidgetcontrol.html
doc/html/qvideowindowcontrol.html
doc/html/service-frameworks.html
doc/html/servicefw.html
doc/src/qtmobility.qdocconf
examples/examples.pro
features/mobility.prf.template
plugins/declarative/declarative.pro
src/global/qmobilityglobal.h
src/src.pro
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 71 |
1 files changed, 57 insertions, 14 deletions
@@ -55,7 +55,7 @@ isAbsPath() { # Returns the absolute path for $1 for target $2 # as an example $2 might have value "maemo5". # This is required because when building in scratchbox for -# maemo we do not want to follow symbolic links that are +# maemo we do not want to follow symbolic links that are # introduced by scratchbox absPath() { if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then @@ -86,6 +86,8 @@ QT_MOBILITY_INCLUDE= QT_MOBILITY_LIB= QT_MOBILITY_BIN= QT_MOBILITY_PLUGINS= +QT_MOBILITY_EXAMPLES= +QT_MOBILITY_DEMOS= BUILD_UNITTESTS= BUILD_EXAMPLES= BUILD_DEMOS= @@ -99,7 +101,7 @@ LIB_PATH="lib" BIN_PATH="bin" PLUGIN_PATH="plugins" MAC_SDK= -MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery" +MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery organizer telephony" MOBILITY_MODULES_UNPARSED= QMKSPEC= OS="other" @@ -123,6 +125,10 @@ usage() echo " (default PREFIX/bin)" echo "-plugindir <dir> .. Plug-ins will be installed to <dir>" echo " (default PREFIX/plugins)" + echo "-demosdir <dir> ... Demos will be installed to <dir>" + echo " (default PREFIX/bin)" + echo "-examplesdir <dir> Examples will be installed to <dir>" + echo " (default PREFIX/bin)" echo "-debug ............ Build with debugging symbols" echo "-release .......... Build without debugging symbols" echo "-silent ........... Reduces build output" @@ -135,15 +141,15 @@ usage() echo "-no-tools ......... Do not build tools (build by default)" echo "-modules <list> ... Restrict list of modules to build (default all supported)" echo " Choose from: bearer contacts gallery location publishsubscribe" - echo " messaging multimedia systeminfo serviceframework versit" - echo " sensors" + echo " messaging multimedia systeminfo serviceframework telephony" + echo " sensors versit organizer" echo " Modules should be separated by a space and surrounded" echo " by double quotation. If a" echo " selected module depends on other modules dependencies" echo " will automatically be enabled." echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)." echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Freemantle)." - echo "-sdk <sdk>..........Build using Apple provided SDK <path/to/sdk>." + echo "-sdk <sdk>......... Build using Apple provided SDK <path/to/sdk>." echo " example: -sdk /Developer/SDKs/MacOSX10.6.sdk" echo @@ -180,6 +186,14 @@ while [ "$#" -gt 0 ]; do QT_MOBILITY_PLUGINS="$2" shift ;; + -examplesdir) + QT_MOBILITY_EXAMPLES="$2" + shift + ;; + -demosdir) + QT_MOBILITY_DEMOS="$2" + shift + ;; -tests) BUILD_UNITTESTS="yes" ;; @@ -220,7 +234,7 @@ while [ "$#" -gt 0 ]; do MOBILITY_MODULES= for m in $MOBILITY_MODULES_UNPARSED; do case "$m" in - bearer|contacts|location|messaging|multimedia|publishsubscribe|serviceframework|systeminfo|versit|sensors|gallery) + bearer|contacts|location|messaging|multimedia|publishsubscribe|serviceframework|systeminfo|sensors|gallery|telephony|versit|organizer) MOBILITY_MODULES="$MOBILITY_MODULES $m"; ;; *) @@ -248,7 +262,7 @@ done checkostype() { - match="darwin" + match="darwin" if [ "$OSTYPE" = "${match}"* ]; then OS="darwin" QMKSPEC="-spec macx-g++" @@ -273,7 +287,7 @@ findframeworks() findUniversal() { - if [ -e "mac.inc" ]; then + if [ -e "mac.inc" ]; then rm mac.inc fi echo "contains(QT_CONFIG,x86): system(echo CONFIG+=x86 >> mac.inc)" > 2.pro @@ -282,7 +296,7 @@ findUniversal() echo "contains(QT_CONFIG,x86_64): system(echo CONFIG+=x86_64 >> mac.inc)" >> 2.pro SOMETIME=`qmake -spec macx-g++ 2.pro 2>&1` rm 2.pro - if [ -e "mac.inc" ]; then + if [ -e "mac.inc" ]; then echo "exists(mac.inc): include(mac.inc)" >> "$CONFIG_IN" fi } @@ -367,6 +381,28 @@ else fi echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN" +#process examples path +if [ -z "$QT_MOBILITY_EXAMPLES" ]; then + QT_MOBILITY_EXAMPLES="$QT_MOBILITY_PREFIX/$BIN_PATH" +else + QT_MOBILITY_EXAMPLES=`absPath $QT_MOBILITY_EXAMPLES $LINUX_TARGET` + if [ "$?" -eq "1" ]; then + exit 1 + fi +fi +echo "QT_MOBILITY_EXAMPLES = $QT_MOBILITY_EXAMPLES" >> "$CONFIG_IN" + +#process demos path +if [ -z "$QT_MOBILITY_DEMOS" ]; then + QT_MOBILITY_DEMOS="$QT_MOBILITY_PREFIX/$BIN_PATH" +else + QT_MOBILITY_DEMOS=`absPath $QT_MOBILITY_DEMOS $LINUX_TARGET` + if [ "$?" -eq "1" ]; then + exit 1 + fi +fi +echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS" >> "$CONFIG_IN" + echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE" echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE" @@ -456,7 +492,7 @@ compileTest() printf "." "$MAKE" >> "$CONFIG_LOG" 2>&1 printf ". " - if ./$2 >> "$CONFIG_LOG" 2>&1; then + if [ -e ./$2 ]; then echo "OK" echo "$2_enabled = yes" >> "$CONFIG_IN" else @@ -473,6 +509,7 @@ 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 +compileTest "Bluez" bluez if [ "$LINUX_TARGET" = maemo6 ]; then compileTest sensord sensord else @@ -481,7 +518,7 @@ fi # It's a lot easier to make qmake do the dependency checking... echo "mobility_modules = $MOBILITY_MODULES" >> "$CONFIG_IN" -echo "contains(mobility_modules,versit): mobility_modules *= contacts" >> "$CONFIG_IN" +echo "contains(mobility_modules,versit): mobility_modules *= contacts organizer" >> "$CONFIG_IN" echo "maemo5|maemo6:contains(maemo-icd_enabled, no): mobility_modules -= bearer" >> "$CONFIG_IN" # If libicd-network-wlan-dev.h is not present, use own copy. @@ -524,13 +561,17 @@ for module in $MOBILITY_MODULES; do messaging) $relpath/bin/syncheaders $shadowpath/include/QtMessaging $relpath/src/messaging ;; + telephony) + $relpath/bin/syncheaders $shadowpath/include/QtmTelephony $relpath/src/telephony + ;; versit) - #versit implies contacts + #versit implies contacts & organizer $relpath/bin/syncheaders $shadowpath/include/QtVersit $relpath/src/versit $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/details $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/requests $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/filters + $relpath/bin/syncheaders $shadowpath/include/QtOrganizer $relpath/src/organizer ;; sensors) $relpath/bin/syncheaders $shadowpath/include/QtSensors $relpath/src/sensors @@ -538,6 +579,9 @@ for module in $MOBILITY_MODULES; do gallery) $relpath/bin/syncheaders $shadowpath/include $relpath/src/gallery ;; + organizer) + $relpath/bin/syncheaders $shadowpath/include/QtOrganizer $relpath/src/organizer + ;; *) echo "Cannot generate headers for $module" ;; @@ -546,7 +590,7 @@ done mv "$CONFIG_IN" config.pri mkdir -p "$shadowpath/features" -if [ "$shadowpath" != "$relpath" ]; then +if [ "$shadowpath" != "$relpath" ]; then cp -f "$relpath/features/strict_flags.prf" "$shadowpath/features" fi @@ -558,4 +602,3 @@ else echo "" echo "configure failed." fi - |