move to use p2 "packaging" instead of zip tasks.
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index e1baef9..60a6de1 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project
default="build"
basedir=".">
@@ -47,20 +48,7 @@
level="info"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
- <!-- minimal runtimes -->
- <!--
- <ant antfile="${buildTargets}"> <property name="component"
- value="common" /> </ant> <ant antfile="${buildTargets}">
- <property name="component" value="jsdt" /> </ant> <ant
- antfile="${buildTargets}"> <property name="component"
- value="xml" /> </ant>
- -->
- <ant
- antfile="${buildTargets}">
- <property
- name="component"
- value="wst"/>
- </ant>
+
<ant
antfile="${buildTargets}">
<property
@@ -80,12 +68,6 @@
antfile="${buildTargets}">
<property
name="component"
- value="jst"/>
- </ant>
- <ant
- antfile="${buildTargets}">
- <property
- name="component"
value="jst-sdk"/>
</ant>
<ant
@@ -97,15 +79,6 @@
name="eclipseBuildFailOnError"
value="true"/>
</ant>
- <ant
- antfile="${buildTargets}">
- <property
- name="component"
- value="dali"/>
- <property
- name="eclipseBuildFailOnError"
- value="true"/>
- </ant>
<!-- extender (SDK) versions -->
<!--
@@ -175,313 +148,22 @@
post, post packaging, for WTP ... "manually" assemble the
desired zips
-->
- <antcall
- target="combineArchives">
- <param
- name="corename"
- value=""/>
- </antcall>
- <antcall
- target="combineArchives">
- <param
- name="corename"
- value="-sdk"/>
- </antcall>
- <antcall
- target="combineArchives">
- <param
- name="corename"
- value="-Automated-Tests"/>
- </antcall>
- <antcall
- target="createNoOptionalZip">
- <param
- name="newarchiveName"
- value="wtp-noop-${buildLabel}.zip"/>
- </antcall>
- <antcall
- target="createNoOptionalSDKZip">
- <param
- name="newarchiveName"
- value="wtp-sdk-noop-${buildLabel}.zip"/>
- </antcall>
- <antcall
- target="createNoOptionalTestZip">
- <param
- name="newarchiveName"
- value="wtp-tests-noop-${buildLabel}.zip"/>
- </antcall>
+
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
+ <property
+ name="antrunnerfile"
+ value="${wtp.builder.home}/distribution/wtp.build/createmainzips.xml"/>
+ </ant>
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
+ <property
+ name="antrunnerfile"
+ value="${wtp.builder.home}/distribution/wtp.build/createnoopzips.xml"/>
+ </ant>
<antcall
target="createFprojZips"/>
</target>
- <target
- name="createNoOptionalZip">
- <p2.mirror
- source="${buildDirectory}/${buildLabel}/updateSite"
- destination="tmprepo"
- log="mirror.log"
- verbose="true">
- <slicingOptions
- followStrict="true"/>
- <iu
- id="org.eclipse.wst.web_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jpt.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.xml_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.jsdt.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.common.fproj.feature.group"/>
- <iu
- id="org.eclipse.wst.server_adapters.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
- <iu
- id="org.eclipse.jst.server_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.web_ui.feature.feature.group"/>
- </p2.mirror>
- <p2.repo2runnable>
- <repository
- location="tmprepo/eclipse"/>
- <source>
- <repository
- location="tmpdir"/>
- </source>
- </p2.repo2runnable>
- <copy
- todir="tmprepo/eclipse"
- overwrite="false">
- <fileset
- dir="${wtp.builder.home}/rootfiles">
- </fileset>
- </copy>
- <zip
- destfile="${buildDirectory}/${buildLabel}/${newarchiveName}"
- basedir="tempdir"/>
- <delete
- dir="tempnooprepo"
- quiet="true"
- failonerror="false"/>
- <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="createNoOptionalSDKZip">
- <p2.mirror
- source="${buildDirectory}/${buildLabel}/updateSite"
- destination="tmprepo"
- log="mirror.log"
- verbose="true">
- <slicingOptions
- followStrict="true"/>
- <iu
- id="org.eclipse.wst.web_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jpt_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
- <iu
- id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
- <iu
- id="org.eclipse.jst.server_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.web_sdk.feature.feature.group"/>
- </p2.mirror>
- <p2.repo2runnable>
- <repository
- location="tmprepo/eclipse"/>
- <source>
- <repository
- location="tmpdir"/>
- </source>
- </p2.repo2runnable>
- <copy
- todir="tmprepo/eclipse"
- overwrite="false">
- <fileset
- dir="${wtp.builder.home}/rootfiles">
- </fileset>
- </copy>
- <zip
- destfile="${buildDirectory}/${buildLabel}/${newarchiveName}"
- basedir="tempdir"/>
- <delete
- dir="tempnooprepo"
- quiet="true"
- failonerror="false"/>
- <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="createNoOptionalTestZip">
- <p2.mirror
- source="${buildDirectory}/${buildLabel}/updateSite"
- destination="tmprepo"
- log="mirror.log"
- verbose="true">
- <slicingOptions
- followStrict="true"/>
- <iu
- id="org.eclipse.jpt.tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.enterprise_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.jsf.tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.web_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.common_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.server_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.web_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.ws_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.xml_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
- </p2.mirror>
- <p2.repo2runnable>
- <repository
- location="tmprepo/eclipse"/>
- <source>
- <repository
- location="tmpdir"/>
- </source>
- </p2.repo2runnable>
- <copy
- todir="tmprepo/eclipse"
- overwrite="false">
- <fileset
- dir="${wtp.builder.home}/rootfiles">
- </fileset>
- </copy>
- <zip
- destfile="${buildDirectory}/${buildLabel}/${newarchiveName}"
- basedir="tempdir"/>
- <delete
- dir="tempnooprepo"
- quiet="true"
- failonerror="false"/>
- <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"/>
- <!--
- make an empty directory. Can prevent a failure later, when
- doing some test builds
- -->
- <mkdir
- dir="${buildDirectory}/tempforrezipping"/>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg
- line="-o -qq wtp-wst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping"/>
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg
- line="-o -qq wtp-jst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping"/>
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg
- line="-o -qq wtp-jpt${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping"/>
- </exec>
- <zip
- destfile="${buildDirectory}/${buildLabel}/${archiveName}"
- basedir="${buildDirectory}/tempforrezipping"
- whenempty="create"/>
- <delete
- dir="${buildDirectory}/tempforrezipping"
- failonerror="false"/>
- <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="${archiveName}"/>
- </ant>
- </target>
<!--
Handles packaging of individual Faceted Project Framework
distributions.
diff --git a/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml b/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml
new file mode 100644
index 0000000..ed8a8f6
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ This script is to create some zips with core features only.
+ Limited, specialized usefulness, so they are not linked or
+ advertised. That is, could change at any time.
+ -->
+<project
+ default="build"
+ basedir=".">
+ <!--
+ These properties are normally set by calling task, but for
+ "local" tests from command line, they can be set here
+ -->
+ <property
+ name="buildDirectory"
+ value="/shared/webtools/committers/wtp-R3.2.0-I/20091029001529"/>
+ <property
+ name="buildLabel"
+ value="I-3.2.0-20091029030635"/>
+ <property
+ name="wtp.builder.home"
+ value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
+ <echo
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ message="buildLabel: ${buildLabel}"/>
+ <echo
+ message="wtp.builder.home: ${wtp.builder.home}"/>
+ <!--
+ three convenience variables to help avoid typos, etc. Should
+ never need to be changed
+ -->
+ <property
+ name="tempDir"
+ value="${buildDirectory}/${buildLabel}/tempdir"/>
+ <property
+ name="tempRunnableEclipse"
+ value="${tempDir}/eclipse"/>
+ <property
+ name="tempRepo"
+ value="${tempRepo}"/>
+ <target
+ name="build">
+ <antcall
+ target="createCodeZip">
+ <param
+ name="newarchiveName"
+ value="wtp-${buildLabel}.zip"/>
+ </antcall>
+ <antcall
+ target="createSDKZip">
+ <param
+ name="newarchiveName"
+ value="wtp-sdk-${buildLabel}.zip"/>
+ </antcall>
+ <antcall
+ target="createTestZip">
+ <param
+ name="newarchiveName"
+ value="wtp-tests-${buildLabel}.zip"/>
+ </antcall>
+ </target>
+ <target
+ name="createCodeZip">
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="preziptasks"/>
+ <p2.mirror
+ source="${buildDirectory}/${buildLabel}/updateSite"
+ destination="${tempRepo}"
+ log="${buildDirectory}/${buildLabel}/${newarchiveName}-mirror.log"
+ verbose="true">
+ <slicingoptions
+ followstrict="true"
+ includeOptional="true"/>
+ <iu
+ id="org.eclipse.wst.web_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jpt.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xml_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.jsdt.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.common.fproj.feature.group"/>
+ <iu
+ id="org.eclipse.wst.server_adapters.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.web_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xsl.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.cxf.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jpt.eclipselink.feature.feature.group"/>
+ </p2.mirror>
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="postziptasks"/>
+ </target>
+ <target
+ name="createSDKZip">
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="preziptasks"/>
+ <p2.mirror
+ source="${buildDirectory}/${buildLabel}/updateSite"
+ destination="${tempRepo}"
+ log="${buildDirectory}/${buildLabel}/${newarchiveName}-mirror.log"
+ verbose="true">
+ <slicingoptions
+ followstrict="true"
+ includeOptional="true"/>
+ <iu
+ id="org.eclipse.wst.web_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jpt_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
+ <iu
+ id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.web_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xsl_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.jaxws_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.cxf_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jpt.eclipselink_sdk.feature.feature.group"/>
+ </p2.mirror>
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="postziptasks"/>
+ </target>
+ <target
+ name="createTestZip">
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="preziptasks"/>
+ <p2.mirror
+ source="${buildDirectory}/${buildLabel}/updateSite"
+ destination="${tempRepo}"
+ log="${buildDirectory}/${buildLabel}/${newarchiveName}-mirror.log"
+ verbose="true">
+ <slicingoptions
+ followstrict="true"
+ includeOptional="true"/>
+ <iu
+ id="org.eclipse.jpt.tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.enterprise_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.jsf.tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.web_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.common_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.server_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.web_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.ws_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xml_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xsl_tests.feature.feature.group"/>
+ <!--
+ <iu
+ id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group"/>
+ -->
+ <!--
+ <iu
+ id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group"/>
+ -->
+ <iu
+ id="org.eclipse.jst.ws.jaxws_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.cxf_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group"/>
+ <!--
+ <iu
+ id="org.eclipse.jpt.eclipselink_tests.feature.feature.group"/>
+ -->
+ </p2.mirror>
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="postziptasks"/>
+ </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml b/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
new file mode 100644
index 0000000..bd25e61
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ This script is to create some zips with core features only.
+ Limited, specialized usefulness, so they are not linked or
+ advertised. That is, could change at any time.
+ -->
+<project
+ default="build"
+ basedir=".">
+ <!--
+ These properties are normally set by calling task, but for
+ "local" tests from command line, they can be set here
+ -->
+ <property
+ name="buildDirectory"
+ value="/shared/webtools/committers/wtp-R3.2.0-I/20091029001529"/>
+ <property
+ name="buildLabel"
+ value="I-3.2.0-20091029030635"/>
+ <property
+ name="wtp.builder.home"
+ value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
+ <echo
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ message="buildLabel: ${buildLabel}"/>
+ <echo
+ message="wtp.builder.home: ${wtp.builder.home}"/>
+ <!--
+ three convenience variables to help avoid typos, etc. Should
+ never need to be changed
+ -->
+ <property
+ name="tempDir"
+ value="${buildDirectory}/${buildLabel}/tempdir"/>
+ <property
+ name="tempRunnableEclipse"
+ value="${tempDir}/eclipse"/>
+ <property
+ name="tempRepo"
+ value="${buildDirectory}/${buildLabel}/temprepo"/>
+ <target
+ name="build">
+ <antcall
+ target="createNoOptionalZip">
+ <param
+ name="newarchiveName"
+ value="wtp-noop-${buildLabel}.zip"/>
+ </antcall>
+ <antcall
+ target="createNoOptionalSDKZip">
+ <param
+ name="newarchiveName"
+ value="wtp-sdk-noop-${buildLabel}.zip"/>
+ </antcall>
+ <antcall
+ target="createNoOptionalTestZip">
+ <param
+ name="newarchiveName"
+ value="wtp-tests-noop-${buildLabel}.zip"/>
+ </antcall>
+ </target>
+ <target
+ name="createNoOptionalZip">
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="preziptasks"/>
+ <p2.mirror
+ source="${buildDirectory}/${buildLabel}/updateSite"
+ destination="${tempRepo}"
+ log="mirror.log"
+ verbose="true">
+ <slicingoptions
+ followstrict="true"
+ includeOptional="true"/>
+ <iu
+ id="org.eclipse.wst.web_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jpt.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xml_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.jsdt.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.common.fproj.feature.group"/>
+ <iu
+ id="org.eclipse.wst.server_adapters.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_ui.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.web_ui.feature.feature.group"/>
+ </p2.mirror>
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="postziptasks"/>
+ </target>
+ <target
+ name="createNoOptionalSDKZip">
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="preziptasks"/>
+ <p2.mirror
+ source="${buildDirectory}/${buildLabel}/updateSite"
+ destination="${tempRepo}"
+ log="mirror.log"
+ verbose="true">
+ <slicingoptions
+ followstrict="true"
+ includeOptional="true"/>
+ <iu
+ id="org.eclipse.wst.web_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jpt_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
+ <iu
+ id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.web_sdk.feature.feature.group"/>
+ </p2.mirror>
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="postziptasks"/>
+ </target>
+ <target
+ name="createNoOptionalTestZip">
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="preziptasks"/>
+ <p2.mirror
+ source="${buildDirectory}/${buildLabel}/updateSite"
+ destination="${tempRepo}"
+ log="mirror.log"
+ verbose="true">
+ <slicingoptions
+ followstrict="true"
+ includeOptional="true"/>
+ <iu
+ id="org.eclipse.jpt.tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.enterprise_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.jsf.tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.server_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.jst.web_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.common_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.server_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.web_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.ws_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wst.xml_tests.feature.feature.group"/>
+ <iu
+ id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
+ </p2.mirror>
+ <ant
+ antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+ target="postziptasks"/>
+ </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/p2work.shsource b/releng.wtpbuilder/distribution/wtp.build/p2work.shsource
new file mode 100644
index 0000000..4fc072c
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.build/p2work.shsource
@@ -0,0 +1,18 @@
+# minor utility to aid running test scripts from command line
+
+# the top level directory, that should "contain" all else involved with build, control and output
+export BUILD_HOME=${HOME}/p2work
+
+# platform install. One level above what will contain the 'eclipse' directory.
+export ECLIPSE_HOME=/shared/webtools/basebuilders/R35_RC4/org.eclipse.releng.basebuilder
+
+export ANT_HOME=/shared/webtools/apps/apache-ant-1.7.1
+
+export JAVA_5_HOME=/shared/webtools/apps/ibm-java2-i386-50
+export JAVA_6_HOME=/shared/webtools/apps/ibm-java-i386-605
+
+export JAVA_HOME=${JAVA_6_HOME}
+
+export JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin/
+
+export PDE_BUILDER_PATH=/home/shared/webtools/basebuilders/R36_M2/org.eclipse.releng.basebuilder
diff --git a/releng.wtpbuilder/distribution/wtp.build/runEclipseAntRunner.sh b/releng.wtpbuilder/distribution/wtp.build/runEclipseAntRunner.sh
new file mode 100644
index 0000000..c61ed63
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.build/runEclipseAntRunner.sh
@@ -0,0 +1,10 @@
+# minor utility to aid running test scripts from command line
+
+echo "p2work"
+
+source ./p2work.shsource
+
+echo ECLIPSE_HOME: ${ECLIPSE_HOME}
+
+#"${ECLIPSE_HOME}"/eclipse -consolelog -data ./mirrorWorkWorkspace -nosplash --launcher.suppressErrors -vm "${JAVA_EXEC_DIR}" -application org.eclipse.ant.core.antRunner -f createnoopzips.xml "$@"
+"${JAVA_EXEC_DIR}"/java -jar ${pde_builder_path}/plugins/org.eclipse.equinox.launcher.jar -consolelog -data ./mirrorWorkWorkspace -nosplash --launcher.suppressErrors -vm "${JAVA_EXEC_DIR}" -application org.eclipse.ant.core.antRunner -f createnoopzips.xml "$@"
diff --git a/releng.wtpbuilder/distribution/wtp.build/ziputils.xml b/releng.wtpbuilder/distribution/wtp.build/ziputils.xml
new file mode 100644
index 0000000..d822245
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.build/ziputils.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ default="nodefault"
+ basedir=".">
+ <target
+ name="preziptasks">
+ <!--
+ if desired zip already exists, remove it. It normally would
+ not exist, but might if restarting a build, or something
+ -->
+ <delete
+ file="${buildDirectory}/${buildLabel}/${newarchiveName}"
+ quiet="true"
+ failonerror="false"/>
+ </target>
+ <target
+ name="postziptasks">
+ <p2.repo2runnable>
+ <repository
+ location="${tempRunnableEclipse}"/>
+ <source>
+ <repository
+ location="${tempRepo}"/>
+ </source>
+ </p2.repo2runnable>
+ <!--
+ remove content.jar and artifacts.jar, since not in
+ traditional zips
+ -->
+ <delete
+ file="${tempRunnableEclipse}/artifacts.jar"
+ quiet="true"
+ failonerror="false"/>
+ <delete
+ file="${tempRunnableEclipse}/content.jar"
+ quiet="true"
+ failonerror="false"/>
+ <!-- copy in standard root license files -->
+ <copy
+ todir="${tempRunnableEclipse}"
+ overwrite="false">
+ <fileset
+ dir="${wtp.builder.home}/rootfiles">
+ </fileset>
+ </copy>
+ <zip
+ destfile="${buildDirectory}/${buildLabel}/${newarchiveName}"
+ basedir="${tempDir}"/>
+ <delete
+ dir="${tempDir}"
+ quiet="true"
+ failonerror="false"/>
+ <delete
+ dir="${tempRepo}"
+ quiet="true"
+ failonerror="false"/>
+ <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="nodefault">
+ <fail
+ message="There is do default task. Must be specified when calling."/>
+ </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/runAntRunner.xml b/releng.wtpbuilder/scripts/build/runAntRunner.xml
new file mode 100644
index 0000000..99a31c4
--- /dev/null
+++ b/releng.wtpbuilder/scripts/build/runAntRunner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ A utility ant script to invoke AntRunner application with
+ Eclipse. This is handy since some ant scripts are running in
+ plain ant, but we'd like to use Eclipse's ant tasks for things
+ like p2 operations.
+ -->
+<project
+ name="runAntRunner"
+ default="runAntRunner"
+ basedir=".">
+
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only
+ appropriate for some variables, e.g. ones we set, since
+ properties are case sensitive, even if the environment variables
+ on your operating system are not, e.g. it will be ${env.Path}
+ not ${env.PATH} on Windows
+ -->
+ <property
+ environment="env"/>
+ <!--
+ Let users override standard properties, if desired. If
+ directory, file, or some properties do not exist, then standard
+ properties will be used.
+ -->
+ <property
+ file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
+
+ <!-- = = = end standard properties pattern = = = -->
+ <fail
+ unless="env.BUILD_HOME"
+ message="all scripts need a BUILD_HOME"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <property
+ name="keyCfgFile"
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+ <echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}"/>
+ <property
+ file="${keyCfgFile}"/>
+ <fail
+ unless="builderVersion"
+ message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
+ <fail
+ unless="eclipse.builder.version"
+ message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?"/>
+ <property
+ name="basebuilder.path"
+ value="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
+ <property
+ name="failOnError"
+ value="true"/>
+
+ <!-- if not set by caller, be sure it is empty string -->
+ <property
+ name="antrunnertarget"
+ value="build"/>
+ <fail
+ unless="antrunnerfile"
+ message="Must provide ant file to run"/>
+ <target
+ name="runAntRunner">
+
+ <!-- long term we should make this sensitive to if already running in eclipse, and if so,
+ just invoke the script? check if="eclipse.running" -->
+
+ <java
+ taskname="AntRunner"
+ jar="${eclipse.launcher}"
+ fork="true"
+ failonerror="${failOnError}">
+ <jvmarg
+ value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
+ <jvmarg
+ value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromcodebuild.log"/>
+ <jvmarg
+ value="-Dosgi.ws=${env.BASEWS}"/>
+ <jvmarg
+ value="-Dosgi.os=${env.BASEOS}"/>
+ <jvmarg
+ value="-Dosgi.arch=${env.BASEARCH}"/>
+ <jvmarg
+ value="-Dbuild.home=${env.BUILD_HOME}"/>
+ <jvmarg
+ value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
+ <jvmarg
+ value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
+ <jvmarg
+ value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
+ <jvmarg
+ value="-Declipse.builder.version=${eclipse.builder.version}"/>
+ <jvmarg
+ value="-Declipse.builder=${eclipse.builder}"/>
+ <jvmarg
+ value="-Dprojectname=${projectname}"/>
+ <jvmarg
+ value="-DbuildDirectory=${buildDirectory}"/>
+ <jvmarg
+ value="-DbuildLabel=${buildLabel}"/>
+ <jvmarg
+ value="-Dwtp.builder.home=${wtp.builder.home}"/>
+ <jvmarg
+ value="-Dbuild.distribution=${build.distribution}"/>
+ <jvmarg
+ value="-Dcomponent=${component}"/>
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+ <arg
+ value="-application"/>
+ <arg
+ value="org.eclipse.ant.core.antRunner"/>
+ <arg
+ value="-buildfile"/>
+ <arg
+ value="${antrunnerfile}"/>
+ <arg
+ value="${antrunnertarget}"/>
+ </java>
+ </target>
+</project>
\ No newline at end of file