diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 8a0da5fcf122e37a8632f5611fb29f1ea6ae34d4..28fa2a396436b8108386f18d855506f8a1d6e017 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -1,39 +1,38 @@
<project
default="build"
basedir=".">
+ <fail
+ unless="wtp.builder.home" />
+ <property
+ file="${wtp.builder.home}/build.properties" />
-
- <fail unless="wtp.builder.home" />
- <property file="${wtp.builder.home}/build.properties" />
-
- <!-- main -->
+ <!-- main -->
<target
name="build"
depends="getBaseBuilder">
<dirname
file="${ant.file}"
property="distribution.wtp.build.dir" />
-
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-
- <echo
+ <echo
level="info"
message="invoking buildTargets: ${buildTargets} to build for each component" />
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="wst" />
</ant>
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="wst-sdk" />
</ant>
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="wst.tests" />
@@ -41,18 +40,20 @@
name="eclipseBuildFailOnError"
value="false" />
</ant>
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="jst" />
</ant>
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="jst-sdk" />
</ant>
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="jst.tests" />
@@ -60,8 +61,8 @@
name="eclipseBuildFailOnError"
value="false" />
</ant>
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="dali" />
@@ -69,8 +70,8 @@
name="eclipseBuildFailOnError"
value="false" />
</ant>
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="dali-sdk" />
@@ -78,8 +79,8 @@
name="eclipseBuildFailOnError"
value="false" />
</ant>
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="dali.tests" />
@@ -88,12 +89,13 @@
value="false" />
</ant>
- <!-- calling label.xml to createg label.properties file -->
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-
- <!-- package -->
- <antcall target="package" />
+ <!-- calling label.xml to createg label.properties file -->
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/label.xml" />
+ <!-- package -->
+ <antcall
+ target="package" />
</target>
<!-- invoking runbuild.xml targetting getBaseBuilder -->
@@ -113,38 +115,76 @@
antfile="${buildTargets}"
target="getBaseBuilder" />
</target>
-
- <target name="package">
- <!-- post, post packaging, for WTP ... "manually" assemble the desired zips -->
-
- <antcall target="combineArchives">
+ <target
+ name="package">
+ <!-- post, post packaging, for WTP ... "manually" assemble the desired zips -->
+ <antcall
+ target="combineArchives">
<param
name="corename"
value="" />
</antcall>
-
- <antcall target="combineArchives">
+ <antcall
+ target="combineArchives">
<param
name="corename"
value="-sdk" />
</antcall>
-
- <antcall target="combineArchives">
+ <antcall
+ target="combineArchives">
<param
name="corename"
value="-Automated-Tests" />
</antcall>
-
-
+ <antcall
+ target="createNoOptionalZip">
+ <param
+ name="archiveName"
+ value="wtp-${buildLabel}.zip" />
+ <param
+ name="newarchiveName"
+ value="wtp-noopt-${buildLabel}.zip" />
+ </antcall>
+ <antcall
+ target="createNoOptionalZip">
+ <param
+ name="archiveName"
+ value="wtp-sdk-${buildLabel}.zip" />
+ <param
+ name="newarchiveName"
+ value="wtp-sdk-noopt-${buildLabel}.zip" />
+ </antcall>
</target>
- <target name="combineArchives">
+ <target
+ name="createNoOptionalZip">
+ <zip
+ destfile="${buildDirectory}/${buildLabel}/${newarchiveName}">
+ <zipfileset
+ src="${archiveName}"
+ excludes="/eclipse/plugins/org.eclipse.jst.ws.axis2.**,/eclipse/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport**,/eclipse/plugins/org.eclipse.jst.pagedesigner**,/eclipse/features/org.eclipse.jst.ws.axis2tools**,/eclipse/features/org.eclipse.jst.webpageeditor**,/eclipse/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature**" />
+ </zip>
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
+ target="createChecksums">
+ <property
+ name="buildDirectory"
+ value="${buildDirectory}" />
+ <property
+ name="buildLabel"
+ value="${buildLabel}" />
+ <property
+ name="archiveName"
+ value="${newarchiveName}" />
+ </ant>
+ </target>
+ <target
+ name="combineArchives">
<property
name="archiveName"
value="wtp${corename}-${buildLabel}.zip" />
<delete
dir="${buildDirectory}/tempforrezipping"
failonerror="false" />
-
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
@@ -152,7 +192,6 @@
<arg
line="-o -qq wtp-wst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
-
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
@@ -161,7 +200,7 @@
line="-o -qq wtp-jst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
- <!-- there is no jsf zip, any longer, so this results in spurious error messages in log
+ <!-- there is no jsf zip, any longer, so this results in spurious error messages in log
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
@@ -170,7 +209,6 @@
line="-o -qq wtp-jsf${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
-->
-
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
@@ -178,16 +216,12 @@
<arg
line="-o -qq wtp-jpt${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
-
-
<zip
destfile="${buildDirectory}/${buildLabel}/${archiveName}"
basedir="${buildDirectory}/tempforrezipping" />
-
<delete
dir="${buildDirectory}/tempforrezipping"
failonerror="false" />
-
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="createChecksums">
@@ -202,4 +236,4 @@
value="${archiveName}" />
</ant>
</target>
-</project>
+</project>
\ No newline at end of file