--- a/qtmobility/configure.bat Thu Jul 15 19:34:35 2010 +0300
+++ b/qtmobility/configure.bat Thu Aug 19 10:43:30 2010 +0300
@@ -59,11 +59,19 @@
set BUILD_TOOLS=yes
set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
set MOBILITY_MODULES_UNPARSED=
-set MOBILITY_MULTIMEDIA=yes
set VC_TEMPLATE_OPTION=
set QT_PATH=
set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
+REM We use these variables to indicate which modules are selected
+REM They are used for example to see which modules need config.tests built
+set CONTACTS_SELECTED=yes
+set BEARER_SELECTED=yes
+set SYSTEMINFO_SELECTED=yes
+set SENSORS_SELECTED=yes
+set MESSAGING_SELECTED=yes
+set MULTIMEDIA_SELECTED=yes
+set LOCATION_SELECTED=yes
if exist "%QMAKE_CACHE%" del /Q %QMAKE_CACHE%
if exist "%PROJECT_LOG%" del /Q %PROJECT_LOG%
if exist "%PROJECT_CONFIG%" del /Q %PROJECT_CONFIG%
@@ -72,22 +80,6 @@
echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH% >> %QMAKE_CACHE%
set QMAKE_CACHE=
-if %BUILD_PATH% == %SOURCE_PATH% (
- cd %SOURCE_PATH%\config.tests\qtmultimedia
- if exist make del qtmultimedia
-) else (
- rmdir /S /Q config.tests\qtmultimedia
- mkdir config.tests\qtmultimedia
- cd config.tests\qtmultimedia
-)
-for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\qtmultimedia\qtmultimedia.pro 2^>^&1 1^>NUL') do set QTMULTIMEDIA=%%i
-if %QTMULTIMEDIA% == no-multimedia (
- set MOBILITY_MULTIMEDIA=yes
-) else (
- set MOBILITY_MULTIMEDIA=no
-)
-cd /D %BUILD_PATH%
-
:cmdline_parsing
if "%1" == "" goto startProcessing
if "%1" == "-debug" goto debugTag
@@ -264,6 +256,13 @@
REM reset default modules as we expect a modules list
set MOBILITY_MODULES=
+set CONTACTS_SELECTED=
+set BEARER_SELECTED=
+set SYSTEMINFO_SELECTED=
+set SENSORS_SELECTED=
+set MESSAGING_SELECTED=
+set MULTIMEDIA_SELECTED=
+set LOCATION_SELECTED=
echo Checking selected modules:
:modulesTag2
@@ -276,38 +275,38 @@
: distinguish between false and correct module names being passed
if %FIRST% == bearer (
echo Bearer Management selected
+ set BEARER_SELECTED=yes
) else if %FIRST% == contacts (
echo Contacts selected
+ set CONTACTS_SELECTED=yes
) else if %FIRST% == location (
echo Location selected
+ set LOCATION_SELECTED=yes
) else if %FIRST% == messaging (
echo Messaging selected
+ set MESSAGING_SELECTED=yes
) else if %FIRST% == multimedia (
echo Multimedia selected
+ set MULTIMEDIA_SELECTED=yes
) else if %FIRST% == publishsubscribe (
echo PublishSubscribe selected
) else if %FIRST% == systeminfo (
echo Systeminfo selected
+ set SYSTEMINFO_SELECTED=yes
) else if %FIRST% == serviceframework (
echo ServiceFramework selected
) else if %FIRST% == versit (
echo Versit selected ^(implies Contacts^)
+ set CONTACTS_SELECTED=yes
) else if %FIRST% == sensors (
echo Sensors selected
+ set SENSORS_SELECTED=yes
) else (
echo Unknown module %FIRST%
goto errorTag
)
-if %FIRST% == multimedia (
- if %MOBILITY_MULTIMEDIA% == yes (
- set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
- ) else (
- echo "Only one multimedia module allowed, please rebuild Qt with -no-multimedia"
- )
-) else (
- set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
-)
+set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
if "%REMAINING%" == "" (
shift
@@ -320,41 +319,8 @@
SET FIRST=
goto cmdline_parsing
-:removeMultimedia
-set MOBILITY_MODULES_TEMP=%MOBILITY_MODULES%
-set MOBILITY_MODULES=
-
-:removeMultimedia2
-
-for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_TEMP%") do (
- set FIRST=%%a
- set REMAINING=%%b
-)
-if NOT %FIRST% == multimedia (
- set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
-)
-if "%REMAINING%" == "" (
- goto startProcessing2
-) else (
- set MOBILITY_MODULES_TEMP=%REMAINING%
- goto removeMultimedia2
-)
-
-goto startProcessing2
-
:startProcessing
-for %%a in (%MOBILITY_MODULES%) do (
- if %%a == multimedia (
- if %MOBILITY_MULTIMEDIA% == no (
- echo "Only one multimedia module allowed, please rebuild Qt with -no-multimedia"
- goto removeMultimedia
- )
- )
-)
-
-:startProcessing2
-
echo CONFIG += %RELEASEMODE% >> %PROJECT_CONFIG%
echo CONFIG_WIN32 += %WIN32_RELEASEMODE% %RELEASEMODE% >> %PROJECT_CONFIG%
set RELEASEMODE=
@@ -397,10 +363,10 @@
echo qmf_enabled = no >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
+echo !symbian:isEmpty(QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
+echo isEmpty(QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
+echo isEmpty(QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+echo isEmpty(QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
echo mobility_modules = %MOBILITY_MODULES% >> %PROJECT_CONFIG%
REM no Sysinfo support on Maemo yet
@@ -505,9 +471,11 @@
if "%MOBILITY_BUILDSYSTEM%" == "symbian-sbsv2" (
call %MOBILITY_MAKE% release-armv5 >> %PROJECT_LOG% 2>&1
for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-armv5 SBS^="@sbs --check"') do set FAILED=1
+ call %MOBILITY_MAKE% clean >> %PROJECT_LOG% 2>&1
) else if "%MOBILITY_BUILDSYSTEM%" == "symbian-abld" (
call %MOBILITY_MAKE% release-gcce >> %PROJECT_LOG% 2>&1
for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-gcce ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
+ call %MOBILITY_MAKE% clean >> %PROJECT_LOG% 2>&1
) else {
REM Make for other builds
call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1
@@ -536,20 +504,47 @@
for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
if "%BUILDSYSTEM%" == "symbian-abld" goto symbianTests
if "%BUILDSYSTEM%" == "symbian-sbsv2" goto symbianTests
-goto noTests
+goto windowsTests
:symbianTests
-call :compileTest LBT lbt
-call :compileTest SNAP snap
-call :compileTest OCC occ
-call :compileTest SymbianContactSIM symbiancntsim
-call :compileTest S60_Sensor_API sensors_s60_31
-call :compileTest Symbian_Sensor_Framework sensors_symbian
-call :compileTest Audiorouting_s60 audiorouting_s60
-call :compileTest Tunerlibrary_for_3.1 tunerlib_s60
-call :compileTest RadioUtility_for_post_3.1 radioutility_s60
-call :compileTest OpenMaxAl_support openmaxal_symbian
-call :compileTest Surfaces_s60 surfaces_s60
+
+if "%MULTIMEDIA_SELECTED%" == "yes" (
+ call :compileTest Audiorouting_s60 audiorouting_s60
+ call :compileTest Tunerlibrary_for_3.1 tunerlib_s60
+ call :compileTest RadioUtility_for_post_3.1 radioutility_s60
+ call :compileTest OpenMaxAl_support openmaxal_symbian
+ call :compileTest Surfaces_s60 surfaces_s60
+)
+if "%CONTACTS_SELECTED%" == "yes" (
+ call :compileTest SymbianContactSIM symbiancntsim
+)
+if "%BEARER_SELECTED%" == "yes" (
+ call :compileTest SNAP snap
+ call :compileTest OCC occ
+)
+if "%SENSORS_SELECTED%" == "yes" (
+ call :compileTest S60_Sensor_API sensors_s60_31
+ call :compileTest Symbian_Sensor_Framework sensors_symbian
+)
+if "%MESSAGING_SELECTED%" == "yes" (
+ call :compileTest Symbian_Messaging_Freestyle messaging_freestyle
+)
+if "%SYSTEMINFO_SELECTED%" == "yes" (
+ call :compileTest Symbian_Hb hb_symbian
+)
+if "%LOCATION_SELECTED%" == "yes" (
+ call :compileTest LBT lbt
+)
+goto noTests
+
+:windowsTests
+
+if "%MULTIMEDIA_SELECTED%" == "yes" (
+ call :compileTest DirectShow directshow
+ call :compileTest WindowsMediaSDK wmsdk
+ call :compileTest WindowMediaPlayer wmp
+ call :compileTest EnhancedVideoRenderer evr
+)
:noTests
@@ -575,37 +570,35 @@
)
if %FIRST% == bearer (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmBearer %SOURCE_PATH%\src\bearer
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtBearer %SOURCE_PATH%\src\bearer
) else if %FIRST% == contacts (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts\requests
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts\filters
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts\details
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\requests
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\filters
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\details
) else if %FIRST% == location (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmLocation %SOURCE_PATH%\src\location
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location
) else if %FIRST% == messaging (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmMessaging %SOURCE_PATH%\src\messaging
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMessaging %SOURCE_PATH%\src\messaging
) else if %FIRST% == multimedia (
- if %MOBILITY_MULTIMEDIA% == yes (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimedia %SOURCE_PATH%\src\multimedia
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimedia %SOURCE_PATH%\src\multimedia\audio
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimedia %SOURCE_PATH%\src\multimedia\video
- )
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia\audio
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia\video
) else if %FIRST% == publishsubscribe (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmPubSub %SOURCE_PATH%\src\publishsubscribe
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtPublishSubscribe %SOURCE_PATH%\src\publishsubscribe
) else if %FIRST% == systeminfo (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmSystemInfo %SOURCE_PATH%\src\systeminfo
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtSystemInfo %SOURCE_PATH%\src\systeminfo
) else if %FIRST% == serviceframework (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmServiceFramework %SOURCE_PATH%\src\serviceframework
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtServiceFramework %SOURCE_PATH%\src\serviceframework
) else if %FIRST% == versit (
REM versit implies contacts
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmVersit %SOURCE_PATH%\src\versit
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts\requests
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts\filters
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmContacts %SOURCE_PATH%\src\contacts\details
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtVersit %SOURCE_PATH%\src\versit
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\requests
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\filters
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\details
) else if %FIRST% == sensors (
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmSensors %SOURCE_PATH%\src\sensors
+ perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtSensors %SOURCE_PATH%\src\sensors
)
if "%REMAINING%" == "" (
@@ -650,6 +643,13 @@
SET REMAINING=
SET FIRST=
SET MODULES_TEMP=
+set CONTACTS_SELECTED=
+set BEARER_SELECTED=
+set SYSTEMINFO_SELECTED=
+set SENSORS_SELECTED=
+set MESSAGING_SELECTED=
+set MULTIMEDIA_SELECTED=
+set LOCATION_SELECTED=
exit /b 1
:exitTag
@@ -667,4 +667,11 @@
SET REMAINING=
SET FIRST=
SET MODULES_TEMP=
+set CONTACTS_SELECTED=
+set BEARER_SELECTED=
+set SYSTEMINFO_SELECTED=
+set SENSORS_SELECTED=
+set MESSAGING_SELECTED=
+set MULTIMEDIA_SELECTED=
+set LOCATION_SELECTED=
exit /b 0