move to improved p2 functions
diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index 48cb882..b876770 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -72,17 +72,16 @@
value="${buildDirectory}/tmpsite-${archiveName}-temp"/>
<target
name="conditionAndSignJars"
- depends="init">
-<!--
+ depends="init"
if="doSign">
- -->
- <!--
+ <!--
get zip for signing exclude content* artifacts* add
pack.properties send to eclipse and wait write over
p2.build.repo, but update content and artifacts files remove
temp file
-->
- <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo
+ message="p2.build.repo: ${p2.build.repo}"/>
<zip
destfile="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip">
<zipfileset
@@ -94,32 +93,33 @@
<!--
comment out when debugging, for original zip files, before
updatePackProperties ran
-
+ -->
<delete
file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip.bak"/>
- -->
<!--
==================================================================================
sign the jars in archive file
==================================================================================
-->
- <!--
- <ant
+ <ant
antfile="${wtp.builder.home}/scripts/build/signjars.xml">
<property
name="archiveName"
value="temp-${buildLabel}-${component}.zip"/>
</ant>
- -->
<unzip
dest="${buildDirectory}/${buildLabel}/${component}/repository/"
src="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"
- overwrite="true"/>
+ overwrite="true">
+ <exclude
+ name="pack.properties"/>
+ </unzip>
<!-- TODO we could add 'pack' to this task, if desierd -->
<p2.process.artifacts
- repositoryPath="${p2.build.repo}"/>
+ repositoryPath="${p2.build.repo}"
+ pack="true"/>
<!--
remove our temp zip file, once tested, debugged <delete
file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>