MCL/sf/mw/qt: comparison configure

equal deleted inserted replaced

-:dee5afe5301f
+:3f74d0d4af4c
 #!/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)
 ##
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 #-------------------------------------------------------------------------------
 PLATFORM_X11=no
 PLATFORM_MAC=no
 PLATFORM_QWS=no
+PLATFORM_SYMBIAN=no
 if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then
 # Qt/Mac
 # ~ the Carbon SDK exists
 # ~ src/gui/base/qapplication_mac.cpp is present
 CFG_FONTCONFIG=auto
 CFG_QWS_FREETYPE=no
 CFG_LIBFREETYPE=no
 CFG_SQL_AVAILABLE=
 QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations"
-CFG_BUILD_PARTS=""
+#QTP change for lRelease app. Need for Symbian
+CFG_BUILD_PARTS="translations"
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
 CFG_PHONON=yes
 CFG_PHONON_BACKEND=yes
 CFG_MULTIMEDIA=yes
 #For Symbian it should be enabled by default
 CFG_STL=yes
 CFG_S60=yes
 CFG_RTTI=yes
 CFG_NATIVE_GESTURES=yes
+CFG_DEFFILES=yes
 #end symbian flags
 CFG_PRECOMPILE=auto
 CFG_SEPARATE_DEBUG_INFO=auto
 CFG_REDUCE_EXPORTS=no
 OPT_VERBOSE=no
 OPT_HELP=
 CFG_SILENT=no
 CFG_GRAPHICS_SYSTEM=default
 CFG_ALSA=auto
+#flags for qmake running
+CFG_NOPROCESS=no
 # initalize variables used for installation
-QT_INSTALL_PREFIX= "$outpath"
+QT_INSTALL_PREFIX="$outpath"
 QT_INSTALL_DOCS=
 QT_INSTALL_HEADERS=
 QT_INSTALL_LIBS=
 QT_INSTALL_BINS=
 QT_INSTALL_PLUGINS=
 else
 shift;
 VAL=$1
 fi
 	;;
+-usedeffiles)
+VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+VAL=yes
+;;
 -hostprefix)
 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
 # this option may or may not be followed by an argument
 if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
 VAL=$outpath
 else
 UNKNOWN_OPT=yes
 fi
 ;;
 #QTP: QTPPROD-7
+usedeffiles)
+CFG_DEFFILES="$VAL"
+;;
 style-s60)
 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 QT_SYMBIAN_STYLE_FLAGS="$VAL"
 else
 UNKNOWN_OPT=yes
 debug)
 CFG_DEBUG="$VAL"
 ;;
 developer-build|commercial|opensource|nokia-developer)
 # These switches have been dealt with already
+CFG_DEFFILES=no
 ;;
 static)
 if [ "$VAL" = "yes" ]; then
 CFG_SHARED=no
 elif [ "$VAL" = "no" ]; then
 CFG_MULTIMEDIA="$VAL"
 else
 UNKNOWN_OPT=yes
 fi
 ;;
+dont-process)
+CFG_NOPROCESS=yes
+;;
+process)
+CFG_NOPROCESS=no
+;;
 *)
 UNKNOWN_OPT=yes
 ;;
 esac
 if [ "$UNKNOWN_OPT" = "yes" ]; then
 echo "${CURRENT_OPT}: invalid command-line switch"
 OPT_HELP=yes
 ERROR=yes
 fi
 done
+#QTP Symbian release on the Linux platform
+if [ "$XPLATFORM"="symbian-sbsv2" ]; then
+PLATFORM_SYMBIAN=yes
+fi
 if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then
 echo "Warning: '-qconfig $CFG_QCONFIG' will disable the qt3support library."
 CFG_QT3SUPPORT="no"
 fi
 if [ "$PLATFORM_QWS" = "yes" ]; then
 	echo "Host architecture: '$CFG_HOST_ARCH'"
 fi
 fi
+#QTP configuration for the Symbian compilation on Linux platform
+if [ "$CFG_S60" = "yes" ]; then
+QMakeVar add styles "s60"
+fi
 #-------------------------------------------------------------------------------
 # tests that don't need qmake (must be run before displaying help)
 #-------------------------------------------------------------------------------
 if [ -z "$PKG_CONFIG" ]; then
 (available on some XScale CPUs).
 EOF
 fi
+if [ "$XPLATFORM"="symbian-sbsv2" ]; then
+-no-s60..............Do not compile in S60 support.
+-s60.................Compile with support for the S60 UI Framework
+-no-usedeffiles......Disable the usage of DEF files.
+-usedeffiles.........Enable the usage of DEF files.
+cat << EOF
+EOF
+fi
 if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then
 if [ "$CFG_GLIB" = "no" ]; then
 GBY=" "
 GBN="+"
 echo "/* All features enabled while building qmake */" >"$QMAKE_QCONFIG_H"
 fi
 mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H"
 for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
-if [ '!' -f "$conf" ]; then
+[ -e "$conf" ] && rm -rf "$conf"
-ln -s "$QCONFIG_H" "$conf"
+cp -a "$QCONFIG_H" "$conf"
-fi
 done
 #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
-rm -f mkspecs/default
+rm -rf mkspecs/default
-ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
+cp -a `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
 # fix makefiles
 for mkfile in GNUmakefile Makefile; do
 EXTRA_LFLAGS=
 EXTRA_CFLAGS=
 in_mkfile="${mkfile}.in"
 #for the symbian we need add sql_lite support
 QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
 QMAKE_CONFIG="$QMAKE_CONFIG minimal-config small-config medium-config large-config full-config"
+if [ "$PLATFORM_SYMBIAN" = "yes" ]; then
+if [ "$CFG_DEFFILES" = "yes" ]; then
+QMakeVar add CONFIG def_files
+else
+QMakeVar add CONFIG def_files_disabled
+fi
+fi
 # auto-detect NIS support
 if [ "$CFG_NIS" != "no" ]; then
 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
 CFG_NIS=yes
 else
 else
 [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h"
 mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
 chmod -w "$outpath/src/corelib/global/qconfig.h"
 for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
-if [ '!' -f "$conf" ]; then
+cp -f "$outpath/src/corelib/global/qconfig.h" "$conf"
-ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
-fi
 done
 fi
 #-------------------------------------------------------------------------------
 # save configuration into qconfig.pri
 #-------------------------------------------------------------------------------
 # build makefiles based on the configuration
 #-------------------------------------------------------------------------------
+#: QTPRO for Symbian compilation it is necessary to replace qmake with standard qmake handling
 echo "Finding project files. Please wait..."
-#: QTPRO for Symbian compilation it is necessary to replace qmake with standard qmake handling
+if [ "$CFG_NOPROCESS" != "yes" ]; then
 if [ "$XPLATFORM" != "symbian-sbsv2" ]; then
 "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
 fi
 if [ -f "${relpath}/projects.pro" ]; then
 echo "parsing projects.pro file and generate make files"
 mkfile="${outpath}/Makefile"
 [ -f "$mkfile" ] && chmod +w "$mkfile"
 QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro"
 fi
+fi
 # .projects      -> projects to process
 # .projects.1    -> qt and moc
 # .projects.2    -> subdirs and libs
 # .projects.3    -> the rest
 rm -f .projects .projects.1 .projects.2 .projects.3
 QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
 if [ -z "$AWK" ]; then
 for p in `echo $QMAKE_PROJECTS`; do
 echo "$p" >> .projects
 PART_ROOTS=
 for part in $CFG_BUILD_PARTS; do
 case "$part" in
 tools) PART_ROOTS="$PART_ROOTS tools" ;;
 libs) PART_ROOTS="$PART_ROOTS src" ;;
-translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
+translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease" ;;
 examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
 *) ;;
 esac
 done
 	done
 [ "$IN_ROOT" = "no" ] && continue
 case $a in
 *winmain/winmain.pro) continue ;;
-*s60main/s60main.pro)  if [ "$XPLATFORM" != "symbian-sbsv2" ]; then
+*s60main/s60main.pro)  if [ "$PLATFORM_SYMBIAN" != "yes" -o  "$CFG_NOPROCESS" = "yes" ]; then
 continue
 fi;;
 *examples/activeqt/*) continue ;;
 */qmake/qmake.pro) continue ;;
 *tools*|*tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
-*) SPEC=$XQMAKESPEC ;;
+*) if [ "$CFG_NOPROCESS" = "yes" ]; then
+continue
+else
+SPEC=$XQMAKESPEC
+fi;;
 esac
 dir=`dirname "$a" | sed -e "s;$sepath;.;g"`
 test -d "$dir" || mkdir -p "$dir"
 OUTDIR="$outpath/$dir"
 if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then

branch	RCL_3
changeset 7	3f74d0d4af4c
parent 4	3b1da2848fc7