diff -r 1248e8f6a72d -r db59fc762214 buildframework/helium/hlm.bat --- a/buildframework/helium/hlm.bat Tue Mar 16 17:16:51 2010 +0000 +++ b/buildframework/helium/hlm.bat Thu Mar 18 15:06:42 2010 +0000 @@ -42,10 +42,8 @@ if not defined JAVA_6_HOME ( set TESTED_JAVA=C:\Apps\j2sdk_1.6.0_02 ) ELSE set TESTED_JAVA=%JAVA_6_HOME% -if exist %TESTED_JAVA% (set JAVA_HOME=%TESTED_JAVA%) +if exist "%TESTED_JAVA%" (set JAVA_HOME=%TESTED_JAVA%) if not exist "%JAVA_HOME%" ( echo *** Java cannot be found & goto :errorstop ) -set JEP_HOME=%HELIUM_HOME%\external\jep_1.6_2.5 -set PATH=%PATH%;%JEP_HOME% REM Needed by python logging set PID=1 @@ -54,22 +52,30 @@ REM Configure Apache Ant set TESTED_ANT=C:\APPS\ant_1.7 -if exist %TESTED_ANT% (set ANT_HOME=%TESTED_ANT%) +if exist "%TESTED_ANT%" (set ANT_HOME=%TESTED_ANT%) if not exist "%ANT_HOME%" ( echo *** Ant cannot be found & goto :errorstop ) if not defined ANT_OPTS ( set ANT_OPTS=-Xmx896M -Dlog4j.configuration=com/nokia/log4j.xml ) set SIGNALING_ANT_ARGS= -Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor +set LOGGING_ANT_ARGS= -listener com.nokia.helium.logger.ant.listener.StatusAndLogListener +REM -listener com.nokia.helium.logger.ant.listener.StatusAndLogListener set DIAMONDS_ANT_ARGS= -listener com.nokia.helium.diamonds.ant.HeliumListener if not defined HLM_DISABLE_INTERNAL_DATA ( -set INTERNAL_DATA_ANT_ARGS= -listener com.nokia.ant.listener.internaldata.Listener +set INTERNAL_DATA_ANT_ARGS= -listener com.nokia.helium.internaldata.ant.listener.Listener echo Internal data listening enabled. ) + +REM Configure listener to generate target times csv file. +REM **Note: Comment below line if you want to skip the target times csv file generation +set TARGET_TIMES_GENERATOR= -listener com.nokia.helium.core.ant.listener.TargetTimesLogGeneratorListener + + if not defined ANT_ARGS ( -set ANT_ARGS=-lib "%HELIUM_HOME%\extensions\nokia\external\antlibs" -lib "%HELIUM_HOME%\extensions\nokia\external\helium-nokia-antlib\bin" -lib "%HELIUM_HOME%\external\helium-antlib\bin" -lib "%HELIUM_HOME%\tools\common\java\lib" -lib "%HELIUM_HOME%\external\antlibs" -lib "%JEP_HOME%" -logger com.nokia.ant.HeliumLogger %DIAMONDS_ANT_ARGS% %INTERNAL_DATA_ANT_ARGS% %SIGNALING_ANT_ARGS% +set ANT_ARGS=-lib "%HELIUM_HOME%\extensions\nokia\external\antlibs" -lib "%HELIUM_HOME%\extensions\nokia\external\helium-nokia-antlib\bin" -lib "%HELIUM_HOME%\external\helium-antlib\bin" -lib "%HELIUM_HOME%\tools\common\java\lib" -lib "%HELIUM_HOME%\external\antlibs" -logger com.nokia.ant.HeliumLogger %DIAMONDS_ANT_ARGS% %INTERNAL_DATA_ANT_ARGS% %SIGNALING_ANT_ARGS% %LOGGING_ANT_ARGS% %TARGET_TIMES_GENERATOR% ) REM Shall we impose the EPOCROOT? @@ -80,24 +86,18 @@ REM Symbian Build area path related settings set PATH=%PATH%;%EPOCROOT%epoc32\tools;%EPOCROOT%epoc32\gcc\bin;%EPOCROOT%epoc32\tools\build;%EPOCROOT%epoc32\rombuild -REM Helium specific settings -set PATH=%PATH%;%HELIUM_HOME%\tools\common\bin -set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\doxygen set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\unxutils -set PATH=%PATH%;%HELIUM_HOME%\external\filedisk -set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\info-zip set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\Subversion\bin set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\graphviz\bin -set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\LSC_5.2 -set PATH=%PATH%;\tools -set PATH=%PATH%;\tools\ncp_tools -set PYTHONPATH=%PYTHONPATH%;%HELIUM_HOME%\external\python\lib\2.5;%HELIUM_HOME%\tools\common\python\lib -set PYTHONPATH=%PYTHONPATH%;%HELIUM_HOME%\extensions\nokia\external\python\lib\2.5 -set PYTHONPATH=%PYTHONPATH%;%HELIUM_HOME%\extensions\nokia\tools\common\python\lib;%SBS_HOME%\python + +for /f "tokens=2" %%a in ('"python -V 2>&1"') do (set pythonversion=%%a) +for /f "tokens=1-2 delims=." %%a in ("%pythonversion%") do (set pythonversion=%%a.%%b) + +set PYTHONPATH=%PYTHONPATH%;%HELIUM_HOME%\external\python\lib\%pythonversion%;%HELIUM_HOME%\external\python\lib\common;%HELIUM_HOME%\external\helium-antlib\python\pythoncore\lib;%HELIUM_HOME%\tools\common\python\scripts +set PYTHONPATH=%PYTHONPATH%;%HELIUM_HOME%\extensions\nokia\external\python\lib\%pythonversion% +set PYTHONPATH=%PYTHONPATH%;%HELIUM_HOME%\extensions\nokia\tools\common\python\lib;%HELIUM_HOME%\extensions\nokia\external\helium-nokia-antlib\python;%HELIUM_HOME%\extensions\nokia\external\helium-nokia-antlib\python\pythonnokia\lib;%SBS_HOME%\python set PERL5LIB=%HELIUM_HOME%\tools\common\packages set COPYCMD=/y -set spp_tools=\tools\ -set ppd_tools=\tools\ REM Should be done that SYMSEE? set PATH=%PATH%;C:\APPS\ctc @@ -107,10 +107,6 @@ set ARMROOT=\ -REM Setting the Visual Studio environment -REM if not exist "%HELIUM_HOME%\tools\common\bin\call_vcvars32.bat" ( echo *** "%HELIUM_HOME%\tools\common\bin\call_vcvars32.bat" cannot be found & goto :errorstop ) -REM call "%HELIUM_HOME%\tools\common\bin\call_vcvars32.bat" > nul - REM Manage RVCT switching. if defined HLM_RVCT_VERSION ( if not exist "C:\APPS\rvct%HLM_RVCT_VERSION%\rvctcmdprompt.bat" ( echo *** "C:\APPS\rvct%HLM_RVCT_VERSION%\rvctcmdprompt.bat" cannot be found & goto :errorstop ) @@ -118,11 +114,20 @@ ) TITLE Helium -call "%JAVA_HOME%\bin\java" -cp "%HELIUM_HOME%\tools\common\bin" CheckTools +if not exist "%HELIUM_HOME%\external\helium-antlib\bin\helium-checktools.jar" ( +echo *** Error: helium-checktools.jar not found +goto errorstop +) + +REM call java -cp "%HELIUM_HOME%\external\helium-antlib\bin\helium-checktools.jar" com.nokia.helium.checktools.HeliumToolsCheckerMain -config "%HELIUM_HOME%\config\helium.basic.tools.config" +REM if "%ERRORLEVEL%" neq "0" (goto errorstop) REM Call the Helium generated batch file if it exists REM This must match with the cache.dir property in helium.ant.xml -set HELIUM_CACHE_DIR=%TEMP%\helium\%USERNAME% +if defined JOB_ID ( + set HELIUM_CACHE_DIR=%TEMP%\helium\%USERNAME%\%JOB_ID% +)ELSE set HELIUM_CACHE_DIR=%TEMP%\helium\%USERNAME% + if not exist %HELIUM_CACHE_DIR% ( md %HELIUM_CACHE_DIR% ) @@ -132,15 +137,15 @@ set ANT_OPTS=%ANT_OPTS% -Dlog4j.cache.dir=%HELIUM_CACHE_DIR% -Dpython.path=%PYTHONPATH%;%HELIUM_HOME%\external\python\lib\2.5\jython-2.5-py2.5.egg ) -call "%HELIUM_HOME%\precompile_py.bat" +call "%HELIUM_HOME%\precompile_py.bat" > %HELIUM_CACHE_DIR%\precompile_output.txt -call ant -Dhelium.dir="%HELIUM_HOME%" %* +call ant -Dhelium.dir="%HELIUM_HOME%" -Dcache.dir="%HELIUM_CACHE_DIR%" %* endlocal goto :eof - :errorstop @echo *** Build aborted with error exit /b 1 +