--- a/sf-platform/build.xml	Wed Mar 03 19:46:30 2010 +0000
+++ b/sf-platform/build.xml	Thu Mar 04 18:54:21 2010 +0000
@@ -11,22 +11,22 @@
   
   <!-- import package references -->
   <import file="${sf.platform.config.dir}/platform_refs.ant.xml"  optional="true"/>
- 
-  <!-- make this conditional! -->
-  <import file="${sf.platform.config.dir}/compile.ant.xml"/>
-    <!-- pre helium 7+ should import compile targets from compile-hlm-5.ant.xml >
+  
+    <!-- pre helium 7+ should import compile targets from compile-hlm-5.ant.xml -->
     <if>
         <or>
-          <equals arg1="${helium.version}" arg2="7.0"/>
-          <equals arg1="${last.major.helium.version}" arg2="7.0"/>
+          <equals arg1="${helium.version}" arg2="5.0"/>
+          <equals arg1="${last.major.helium.version}" arg2="5.0"/>
         </or>
         <then>
-            
+            <echo>INFO Importing HLM5 compile targets</echo>
+            <import file="${sf.platform.config.dir}/compile-hlm-5.ant.xml"/>          
         </then>
         <else>
-            <import file="${sf.platform.config.dir}/compile-hlm-5.ant.xml"/>
+             <echo>INFO Importing HLM7 compile targets</echo>
+             <import file="${sf.platform.config.dir}/compile.ant.xml"/>
         </else>
-    </if-->
+    </if>
 
   <!-- MattD - workaround until generating a model from package definitions works-->
   <target name="sf-build-noprep" depends="sf-platform-bootstrap,sf-compile,sf-postbuild">
@@ -211,13 +211,13 @@
     
     <target name="sf-s60-cone-cenrep">
         <!-- TODO: Make this better, as multiple exec calls are a bit clunky -->
-        <if><available file="${helium.dir}/../ConE/" type="dir"/>
+        <if><available file="${env.PDT_HOME}/ConE/" type="dir"/>
         <then>
         <echo message="INFO Generating ConE CenRep"/>
 
             <exec executable="cmd" dir="${build.drive}/epoc32/rom/config" failonerror="false" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-c"/>
               <arg value="convert.confml"/>
@@ -227,7 +227,7 @@
 
             <exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-p"/>
               <arg value="\epoc32\rom\config"/>
@@ -241,7 +241,7 @@
             
             <exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-p"/>
               <arg value="\epoc32\rom\config"/>
@@ -255,7 +255,7 @@
 
             <exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-p"/>
               <arg value="\epoc32\rom\config"/>
@@ -269,7 +269,7 @@
             
             <exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-p"/>
               <arg value="\epoc32\rom\config"/>
@@ -283,7 +283,7 @@
             
             <exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-p"/>
               <arg value="\epoc32\rom\config"/>
@@ -297,7 +297,7 @@
             
             <exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
               <arg value="/c"/>
-              <arg value="cone"/>
+              <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
               <arg value="generate"/>
               <arg value="-p"/>
               <arg value="\epoc32\rom\config"/>
@@ -311,7 +311,7 @@
         
         </then>
         <else>
-            <echo message="WARNING ConE is required to run this target. ConE not found, please update your PDT."/>
+            <echo message="WARNING ConE is required to run this target. ConE not found in ${env.PDT_HOME}/ConE/, please update your PDT."/>
         </else>
         </if>
     </target>