--- a/common/build.xml	Mon May 18 11:39:37 2009 +0100
+++ b/common/build.xml	Tue May 19 14:51:44 2009 +0100
@@ -420,21 +420,43 @@
         </hlm:fastcopy>
         </then>
     </if>
-  </target>
+    </target>
   
-    <target name="sf-send-testpkg">
-        <echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name}"/>
-        <exec executable="perl" dir="${sf.common.config.dir}/tools/" failonerror="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+    <target name ="sf-make-junction">
+        
+        <mkdir dir="${sf.spec.test.epocroot}"/>
+
+        <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_make_junction.log">
+        <arg value="make_junction.pl"/>
+        <arg value="--link=${sf.spec.test.epocroot}/epoc32"/>
+        <arg value="--target=${build.drive}/epoc32"/>
+        <arg value="--force"/>
+      </exec>
+    </target>
+
+    <target name ="sf-delete-junction">
+        <exec executable="junction.exe" dir="${sf.spec.test.epocroot}" failonerror="false" output="${build.log.dir}/ATS_${build.id}_delete_junction.log">
+        <arg value="-d"/>
+        <arg value="epoc32"/>
+      </exec>
+    </target>  
+    
+    <target name="sf-send-testpkg" depends="sf-make-junction">
+        <mkdir dir="${sf.spec.test.package.droppath}"/>
+        <echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name} path ${sf.spec.test.host.droppath}"/>
+        <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_testdrop.log">
             <arg value="ats3_testdrop.pl"/>
-            <arg value="${sf.spec.test.host.name}"/>
-            <arg value="${sf.spec.test.host.path}"/>
-            <arg value="${sf.spec.test.package.name}"/>
-            <arg value="${sf.spec.test.package.path}"/>
+            <arg value="--host=${sf.spec.test.host.name}"/>
+            <arg value="--username=${sf.spec.test.host.username}"/>
+            <arg value="--password=${sf.spec.test.host.password}"/>
+            <arg value="--local-test-pkg=${sf.spec.test.package.name}"/>
+            <arg value="--local-drop-path=${sf.spec.test.package.droppath}"/>
+            <arg value="--host-drop-path=${sf.spec.test.host.droppath}"/>
         </exec>
-  </target>
+    </target>
   
-  <!-- runs analysis of missing bins and source -->
-  <target name="sf-run-analysis">
+    <!-- runs analysis of missing bins and source -->
+    <target name="sf-run-analysis">
         <mkdir dir="${build.log.dir}/analysis"/>
 
         <echo message="Running source analysis of ANT output"/>
@@ -461,9 +483,7 @@
             <arg value="${build.id}_list_results.log"/>
             <arg value="${build.id}_what_results.log"/>
         </exec>
-
-
-  </target>
+    </target>
   
 </project>