cleanup and simplify

releng.wtpbuilder/scripts/dependency/template.xml

@@ -195,14 +195,14 @@
         <antcall
             target="cleanInstall"/>
         <property
-            file="${install.destination}/installmanifest.properties"/>
+            file="${installWorkingDirectory}/installmanifest.properties"/>
         <antcall
             target="callInstall"/>
         <echo
             level="info"
-            message="installmanifest.properties: ${install.destination}/installmanifest.properties"/>
+            message="installmanifest.properties: ${installWorkingDirectory}/installmanifest.properties"/>
         <echo
-            file="${install.destination}/installmanifest.properties"
+            file="${installWorkingDirectory}/installmanifest.properties"
             append="true">
             @dependencyGroupId@${dependency.file}.installed=true
 
@@ -224,7 +224,7 @@
         <antcall
             target="cleanInstall"/>
         <property
-            file="${install.destination}/installmanifest.properties"/>
+            file="${installWorkingDirectory}/installmanifest.properties"/>
     <!-- 
               We first unzip the repo, then use p2 directory app to install into the eclispe
               location.
@@ -239,7 +239,7 @@
             message="install repo for groupId: ${groupId}"/>
         <property
             name="tobeinstalledrepo"
-            value="${local.cache.dir}/repos/${groupId}"/>
+            value="${installWorkingDirectory}/temprepos/${groupId}"/>
         <echo
             message="tobeinstalledrepo:  ${tobeinstalledrepo}"/>
         <echo
@@ -257,13 +257,8 @@
             <arg
                 line="-o -qq ${local.cache.dir}/${dependency.file} -d ${tobeinstalledrepo}"/>
         </exec>
-              <!--
-               <unzip
-                   dest="${install.destination}"
-                   src="${local.cache.dir}/${dependency.file}"
-                   overwrite="true" />
-              -->
-
+             
+<!-- note we are deliberately running the eclipse we are installing into -->
         <java
             taskname="p2Director Install"
             fork="true"
@@ -332,7 +327,7 @@
         name="cleanInstall"
         if="clean">
         <available
-            file="${install.destination}/installmanifest.properties"
+            file="${installWorkingDirectory}/installmanifest.properties"
             property="installmanifest.exists"/>
         <antcall
             target="cleanInstall2"/>
@@ -342,7 +337,7 @@
         name="cleanInstall2"
         if="installmanifest.exists">
         <replace
-            file="${install.destination}/installmanifest.properties"
+            file="${installWorkingDirectory}/installmanifest.properties"
             token="@dependencyGroupId@${dependency.file}.installed=true"/>
     </target>