move to improved p2 functions
diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index ddb5f28..3bcc4ca 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -219,7 +219,6 @@
recreate zip file now, same name, traditional content, which
is mix of folders and jars
-->
-
<zip
destfile="${buildDirectory}/${buildLabel}/${archiveName}"
basedir="${tmpsite}/unpacked"
@@ -482,14 +481,15 @@
<checksum
file="${buildDirectory}/${buildLabel}/${archiveName}"
todir="${buildDirectory}/${buildLabel}/checksum/"
- pattern="${0} *${1}"
- algorithm="MD5"/>
- <checksum
- file="${buildDirectory}/${buildLabel}/${archiveName}"
- todir="${buildDirectory}/${buildLabel}/checksum/"
- pattern="${0} *${1}"
- algorithm="SHA1"/>
-
+ pattern="{0} *{1}"
+ fileext=".md5"
+ algorithm="MD5"/>
+ <checksum
+ file="${buildDirectory}/${buildLabel}/${archiveName}"
+ todir="${buildDirectory}/${buildLabel}/checksum/"
+ pattern="{0} *{1}"
+ fileext=".sha1"
+ algorithm="SHA1"/>
</target>
<target
name="check.sign">
@@ -537,12 +537,11 @@
<!-- 1. Generate the P2 metadata -->
<!--
- initial generation now hanlded by
- p2.gathering=true
- in build.properties
+ initial generation now hanlded by p2.gathering=true in
+ build.properties
-->
<!--
- TODO: should "merge" component repos into main one here?
+ TODO: should "merge" component repos into main one here?
-->
<!--
2. Create zip of P2 repo. Note we put it in
@@ -608,35 +607,37 @@
<target
name="createTraditionalZipFiles"
depends="init">
-
- <p2.repo2runnable>
- <repository
- location="file:/${buildDirectory}/${buildLabel}/${component}/runnable"/>
- <source>
- <repository
- location="${p2.build.repo}"/>
- </source>
- </p2.repo2runnable>
- <property
- name="ziparchiveName"
- value="${component}-${buildLabel}.zip"/>
- <copy
- todir="${buildDirectory}/${buildLabel}/${component}/runnable"
- overwrite="false">
- <fileset
- dir="${wtp.builder.home}/rootfiles">
- </fileset>
- </copy>
- <zip
- destfile="${buildDirectory}/${buildLabel}/${ziparchiveName}">
- <zipfileset
- dir="${buildDirectory}/${buildLabel}/${component}/runnable"
- excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
- </zip>
- <antcall target="createChecksums">
- <param name="archiveName" value="${ziparchiveName}" />
- </antcall>
- </target>
+ <p2.repo2runnable>
+ <repository
+ location="file:/${buildDirectory}/${buildLabel}/${component}/runnable"/>
+ <source>
+ <repository
+ location="${p2.build.repo}"/>
+ </source>
+ </p2.repo2runnable>
+ <property
+ name="ziparchiveName"
+ value="${component}-${buildLabel}.zip"/>
+ <copy
+ todir="${buildDirectory}/${buildLabel}/${component}/runnable"
+ overwrite="false">
+ <fileset
+ dir="${wtp.builder.home}/rootfiles">
+ </fileset>
+ </copy>
+ <zip
+ destfile="${buildDirectory}/${buildLabel}/${ziparchiveName}">
+ <zipfileset
+ dir="${buildDirectory}/${buildLabel}/${component}/runnable"
+ excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
+ </zip>
+ <antcall
+ target="createChecksums">
+ <param
+ name="archiveName"
+ value="${ziparchiveName}"/>
+ </antcall>
+ </target>
<target
name="nodefault">
<echo