--- a/buildframework/helium/hlm.bat	Fri Feb 05 11:59:41 2010 +0000
+++ b/buildframework/helium/hlm.bat	Thu Mar 04 15:10:37 2010 +0200
@@ -44,8 +44,6 @@
 ) ELSE  set TESTED_JAVA=%JAVA_6_HOME%
 if exist "%TESTED_JAVA%" (set JAVA_HOME=%TESTED_JAVA%)
 if not exist "%JAVA_HOME%" ( echo *** Java cannot be found & goto :errorstop )
-REM set JEP_HOME=%HELIUM_HOME%\external\jep_1.6_2.5
-REM set PATH=%PATH%;%JEP_HOME%
 
 REM Needed by python logging
 set PID=1
@@ -66,12 +64,18 @@
 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" -logger com.nokia.ant.HeliumLogger  %DIAMONDS_ANT_ARGS% %INTERNAL_DATA_ANT_ARGS% %SIGNALING_ANT_ARGS% %LOGGING_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?
@@ -85,19 +89,15 @@
 set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\unxutils
 set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\Subversion\bin
 set PATH=%PATH%;%HELIUM_HOME%\extensions\nokia\external\graphviz\bin
-set PATH=%PATH%;\tools
-set PATH=%PATH%;\tools\ncp_tools
 
 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%\tools\common\python\lib;%HELIUM_HOME%\tools\common\python\scripts
+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;%SBS_HOME%\python
+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
@@ -114,7 +114,13 @@
 )
 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
@@ -138,8 +144,8 @@
 endlocal
 goto :eof
 
-
 :errorstop
 @echo *** Build aborted with error
 exit /b 1
 
+