--- a/buildframework/helium/hlm	Fri Feb 05 11:59:41 2010 +0000
+++ b/buildframework/helium/hlm	Thu Mar 04 15:10:37 2010 +0200
@@ -25,27 +25,13 @@
 fi
 
 export LANG="en_US.UTF-8"
-export 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/external/antlibs -lib $HELIUM_HOME/tools/common/java/lib -logger com.nokia.ant.HeliumLogger -Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor -listener com.nokia.helium.diamonds.ant.HeliumListener -listener com.nokia.helium.logger.ant.listener.StatusAndLogListener"
+export 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/external/antlibs -lib $HELIUM_HOME/tools/common/java/lib -logger com.nokia.ant.HeliumLogger -Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor -listener com.nokia.helium.diamonds.ant.HeliumListener -listener com.nokia.helium.logger.ant.listener.StatusAndLogListener -listener com.nokia.helium.core.ant.listener.TargetTimesLogGeneratorListener"
 
 PYTHON_VERSION=`python -c "import sys; print sys.version[:3]"`
 PYTHON_VERSION2=$PYTHON_VERSION$HOSTTYPE
 PYTHONLIB=$HELIUM_HOME/external/python/lib/linux/$PYTHON_VERSION2
 
-TEMP_PYTHONPATH="$PYTHONLIB:$HELIUM_HOME/external/python/lib/common:$HELIUM_HOME/tools/common/python/lib:$HELIUM_HOME/tools/common/python/scripts:$HELIUM_HOME/extensions/nokia/external/python/lib/2.5:$HELIUM_HOME/extensions/nokia/tools/common/python/lib"
-
-if [ ! $PYTHONPATH ] ; then
-    export PYTHONPATH=$TEMP_PYTHONPATH
-else
-    export PYTHONPATH="$PYTHONPATH:$TEMP_PYTHONPATH"
-fi
-
-TEMP_JYTHONPATH="$HELIUM_HOME/external/python/lib/2.5/jython-2.5-py2.5.egg:$PYTHONPATH"
-
-if [ ! $JYTHONPATH ] ; then
-    export JYTHONPATH=$TEMP_JYTHONPATH
-else
-    export JYTHONPATH="$JYTHONPATH:$TEMP_JYTHONPATH"
-fi
+TEMP_PYTHONPATH="$PYTHONLIB:$HELIUM_HOME/external/python/lib/common:$HELIUM_HOME/external/helium-antlib/python/pythoncore/lib:$HELIUM_HOME/tools/common/python/scripts:$HELIUM_HOME/extensions/nokia/external/python/lib/2.5:$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"
 
 TEMP_PERL5LIB="$HELIUM_HOME/tools/common/packages"
 if [ ! $PERL5LIB ] ; then
@@ -67,9 +53,11 @@
 
 if [ ! -e "$PYTHONLIB" ] ; then
     mkdir $PYTHONLIB
-    cp $HELIUM_HOME/external/python/lib/linux/site.py $PYTHONLIB
+    cp $HELIUM_HOME/external/python/lib/common/site.py $PYTHONLIB
 fi
 
+export PYTHONPATH=$HELIUM_HOME/external/python/lib/common/setuptools-0.6c5-py2.5.egg
+
 if [ ! -e "$PYTHONLIB/4Suite_XML-1.0.2.egg" ] ; then
     cp $HELIUM_HOME/external/python/lib/linux/easy-install.pth $PYTHONLIB
     tar xvfz $HELIUM_HOME/external/python/lib/linux/4Suite-XML-1.0.2.tar.gz -C $PYTHONLIB > /dev/null
@@ -96,6 +84,20 @@
 
 cd $CWD
 
+if [ ! $PYTHONPATH ] ; then
+    export PYTHONPATH=$TEMP_PYTHONPATH
+else
+    export PYTHONPATH="$PYTHONPATH:$TEMP_PYTHONPATH"
+fi
+
+TEMP_JYTHONPATH="$HELIUM_HOME/external/python/lib/2.5/jython-2.5-py2.5.egg:$PYTHONPATH"
+
+if [ ! $JYTHONPATH ] ; then
+    export JYTHONPATH=$TEMP_JYTHONPATH
+else
+    export JYTHONPATH="$JYTHONPATH:$TEMP_JYTHONPATH"
+fi
+
 export USERNAME=$USER
 export SYMSEE_VERSION="not_in_use"
 export PID=$$
@@ -113,4 +115,15 @@
 if [ ! $EPOCROOT ]; then
     export EPOCROOT="/"
 fi 
-exec ant -Dpython.cachedir=$PYTHON_CACHEDIR -Dhelium.dir=$HELIUM_HOME -Dpython.path=$PYTHONPATH -Dcache.dir=$HELIUM_CACHE_DIR $* 
+
+if [ ! -f "$HELIUM_HOME/external/helium-antlib/bin/helium-checktools.jar" ] ; then
+    echo helium-checktools.jar not found
+else 
+    java -cp "$HELIUM_HOME/external/helium-antlib/bin/helium-checktools.jar" com.nokia.helium.checktools.HeliumToolsCheckerMain -config "$HELIUM_HOME/config/helium.basic.tools.config"
+
+    if [ $? -eq 0 ] ; then
+      exec ant -Dpython.cachedir=$PYTHON_CACHEDIR -Dhelium.dir=$HELIUM_HOME -Dpython.path=$PYTHONPATH -Dcache.dir=$HELIUM_CACHE_DIR $*
+    else
+        echo Build aborted with error
+    fi    
+fi