--- a/buildframework/helium/hlm	Thu Mar 04 15:10:37 2010 +0200
+++ b/buildframework/helium/hlm	Tue Apr 27 08:33:08 2010 +0300
@@ -19,19 +19,10 @@
     export HELIUM_HOME=$(dirname $(readlink /proc/$$/fd/255))
 fi
 
-# For nokia specific enviroment configurations.
-if [ -f $HELIUM_HOME/extensions/nokia/env.sh ] ; then
-    . $HELIUM_HOME/extensions/nokia/env.sh
-fi
+export LANG="en_US.UTF-8"
+export ANT_ARGS="-lib $HELIUM_HOME/extensions/nokia/external/antlibs2 -lib $HELIUM_HOME/external/antlibs2 -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"
 
-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 -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/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_PYTHONPATH="$HELIUM_HOME/external/python/lib/common:$HELIUM_HOME/external/python/lib/auto:$HELIUM_HOME/tools/common/python/scripts:$HELIUM_HOME/extensions/nokia/external/python/lib/2.5:$HELIUM_HOME/extensions/nokia/tools/common/python/lib"
 
 TEMP_PERL5LIB="$HELIUM_HOME/tools/common/packages"
 if [ ! $PERL5LIB ] ; then
@@ -49,41 +40,6 @@
     export COMPUTERNAME=$(hostname)
 fi
 
-CWD=`pwd`
-
-if [ ! -e "$PYTHONLIB" ] ; then
-    mkdir $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
-    cd $PYTHONLIB/4Suite-XML-1.0.2
-    python setup.py bdist_egg > /dev/null
-    mv dist/*.egg $PYTHONLIB/4Suite_XML-1.0.2.egg
-fi
-
-if [ ! -e "$PYTHONLIB/lxml-1.3.6.egg" ] ; then
-    cp $HELIUM_HOME/external/python/lib/linux/easy-install.pth $PYTHONLIB
-    tar xvfz $HELIUM_HOME/external/python/lib/linux/lxml-1.3.6.tgz -C $PYTHONLIB > /dev/null
-    cd $PYTHONLIB/lxml-1.3.6
-    python setup.py bdist_egg > /dev/null
-    mv dist/*.egg $PYTHONLIB/lxml-1.3.6.egg
-fi
-
-if [ ! -e "$PYTHONLIB/PyXML-0.8.4.egg" ] ; then
-    cp $HELIUM_HOME/external/python/lib/linux/easy-install.pth $PYTHONLIB
-    tar xvfz $HELIUM_HOME/external/python/lib/linux/PyXML-0.8.4.tar.gz -C $PYTHONLIB > /dev/null
-    cd $PYTHONLIB/PyXML-0.8.4
-    python setup.py bdist > /dev/null
-    mv build/lib* $PYTHONLIB/PyXML-0.8.4.egg
-fi
-
-cd $CWD
-
 if [ ! $PYTHONPATH ] ; then
     export PYTHONPATH=$TEMP_PYTHONPATH
 else
@@ -92,10 +48,11 @@
 
 TEMP_JYTHONPATH="$HELIUM_HOME/external/python/lib/2.5/jython-2.5-py2.5.egg:$PYTHONPATH"
 
+. $HELIUM_HOME/external/python/configure_jython.sh
 if [ ! $JYTHONPATH ] ; then
-    export JYTHONPATH=$TEMP_JYTHONPATH
+    export JYTHONPATH="$TEMP_JYTHONPATH:$HLM_EGG_JYTHONPATH"
 else
-    export JYTHONPATH="$JYTHONPATH:$TEMP_JYTHONPATH"
+    export JYTHONPATH="$JYTHONPATH:$TEMP_JYTHONPATH:$HLM_EGG_JYTHONPATH"
 fi
 
 export USERNAME=$USER
@@ -116,10 +73,11 @@
     export EPOCROOT="/"
 fi 
 
-if [ ! -f "$HELIUM_HOME/external/helium-antlib/bin/helium-checktools.jar" ] ; then
-    echo helium-checktools.jar not found
+if [ ! -f "$HELIUM_HOME/external/antlibs2/helium-checktools-1.0.jar" ] ; then
+    echo A required jar '$HELIUM_HOME/external/antlibs2/helium-checktools-1.0.jar' is missing. Verification of basic tools used by Helium cannot be done. Contact Helium support.
+    exit 1
 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"
+    java -cp "$HELIUM_HOME/external/antlibs2/helium-checktools-1.0.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 $*