move to improved p2 functions
diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index 6a0f57f..19362ac 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -160,7 +160,8 @@
repositoryPath="${p2.build.repo}"
pack="true"/>
<!--
- now add this repo to our overall repo, via composite. Note we depend on relative location.
+ now add this repo to our overall repo, via composite. Note
+ we depend on relative location.
-->
<p2.composite.repository>
<repository
@@ -349,9 +350,12 @@
<target
name="createTraditionalZipFiles"
depends="init">
+ <property
+ name="temprunnabledir"
+ value="${buildDirectory}/runnable/${component}/"/>
<p2.repo2runnable>
<repository
- location="file:/${buildDirectory}/${buildLabel}/runnable/${component}/"/>
+ location="file:/${temprunnabledir}"/>
<source>
<repository
location="${p2.build.repo}"/>
@@ -361,7 +365,7 @@
name="ziparchiveName"
value="${component}-${buildLabel}.zip"/>
<copy
- todir="${buildDirectory}/${buildLabel}/runnable/${component}/"
+ todir="${temprunnabledir}"
overwrite="false">
<fileset
dir="${wtp.builder.home}/rootfiles">
@@ -370,7 +374,7 @@
<zip
destfile="${buildDirectory}/${buildLabel}/${ziparchiveName}">
<zipfileset
- dir="${buildDirectory}/${buildLabel}/runnable/${component}/"
+ dir="${temprunnabledir}"
excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
</zip>
<antcall