prep for 2.0 maintenance builds
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index c113c95..f7848a1 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -81,23 +81,40 @@
<property
name="mapCvsRoot"
value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+
+ <!-- if not otherwise set, use these default values -->
<property
name="mapVersionTag"
value="HEAD" />
-
<property
- name="cvsPackage"
- value="releng.dali" />
- <echo message="${mapCvsRoot} ${mapVersionTag} " />
- <echo message="cvsPackage = ${cvsPackage} " />
+ name="releng.dali-mapVersionTag"
+ value="HEAD" />
- <cvs
- cvsRoot="${mapCvsRoot}"
- package="${cvsPackage}"
- dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
+ <!-- get primary maps first, since if there happens to be
+ duplicates, the first one "wins" (such as for dependancies.properties)
+ -->
- <!--tag the map files project-->
+ <!-- get releng/maps -->
+ <antcall target="checkOutMaps">
+ <param
+ name="cvsPackage"
+ value="releng" />
+ <param
+ name="versionTagParam"
+ value="${mapVersionTag}" />
+ </antcall>
+
+ <!-- get releng.dali/maps -->
+ <antcall target="checkOutMaps">
+ <param
+ name="cvsPackage"
+ value="releng.dali" />
+ <param
+ name="versionTagParam"
+ value="${releng.dali-mapVersionTag}" />
+ </antcall>
+
+ <!-- tag the map files project -->
<antcall target="tagMapFiles">
<param
name="mapCvsRoot"
@@ -109,13 +126,14 @@
<!-- Check out the cvsPackage -->
<!-- ===================================================================== -->
<target name="checkOutMaps">
- <echo message="${mapCvsRoot} ${mapVersionTag} " />
+ <echo message="mapCvsRoot: ${mapCvsRoot}" />
<echo message="cvsPackage = ${cvsPackage} " />
+ <echo message="versionTagParam: ${versionTagParam}" />
<cvs
cvsRoot="${mapCvsRoot}"
package="${cvsPackage}"
dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
+ tag="${versionTagParam}" />
</target>
<!-- ===================================================================== -->
@@ -145,6 +163,29 @@
<echo message="ant.file: ${ant.file}" />
<echo message="component.dir: ${component.dir}" />
+ <condition
+ property="daliLocalBuild"
+ value="true">
+ <equals
+ arg1="${build.distribution}"
+ arg2="dali"
+ casesensitive="false"
+ trim="true" />
+ </condition>
+
+ <!-- Get the dependencies -->
+ <antcall target="getDependencies" />
+
+ <!-- Get Dali dependencies -->
+ <antcall target="getDaliLocalDependencies" />
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Get the dependencies based on releng maps -->
+ <!-- ===================================================================== -->
+ <target name="getDependencies">
+
<ant
antfile="${component.dir}/dependency.xml"
target="get">
@@ -155,7 +196,25 @@
name="base.install.dir"
value="${buildRoot}" />
</ant>
+ </target>
+ <!-- ===================================================================== -->
+ <!-- Get Dali dependencies based on releng.dali maps -->
+ <!-- ===================================================================== -->
+ <target
+ name="getDaliLocalDependencies"
+ if="daliLocalBuild">
+
+ <ant
+ antfile="${component.dir}/localDependency.xml"
+ target="get">
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/releng.dali/maps/dependencies.properties" />
+ <property
+ name="base.install.dir"
+ value="${buildRoot}" />
+ </ant>
</target>
<!-- ===================================================================== -->
@@ -171,9 +230,11 @@
<!-- ===================================================================== -->
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
- <target name="postGenerate">
- <customizeAccessRules bundleDirectory="${buildDirectory}/plugins" defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
- </target>
+ <target name="postGenerate">
+ <customizeAccessRules
+ bundleDirectory="${buildDirectory}/plugins"
+ defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
<!-- ===================================================================== -->
@@ -248,7 +309,8 @@
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.jpt.sdk">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.jpt.sdk">
<include name="**/*.log.zip" />
</fileset>
</unzip>
@@ -268,7 +330,8 @@
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
- <echo message="You must specify a target when invoking this file" />
+ <echo
+ message="You must specify a target when invoking this file" />
</target>
</project>
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 128b714..23d3a5d 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -84,15 +84,27 @@
<property
name="mapCvsRoot"
value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+
+ <!-- if not otherwise set, use these default values -->
<property
name="mapVersionTag"
value="HEAD" />
+ <property
+ name="releng.dali-mapVersionTag"
+ value="HEAD" />
+
+ <!-- get primary maps first, since if there happens to be
+ duplicates, the first one "wins" (such as for dependancies.properties)
+ -->
<!-- get releng/maps -->
<antcall target="checkOutMaps">
<param
name="cvsPackage"
value="releng" />
+ <param
+ name="versionTagParam"
+ value="${mapVersionTag}" />
</antcall>
<!-- get releng.dali/maps -->
@@ -100,6 +112,9 @@
<param
name="cvsPackage"
value="releng.dali" />
+ <param
+ name="versionTagParam"
+ value="${releng.dali-mapVersionTag}" />
</antcall>
<!-- tag the map files project -->
@@ -114,20 +129,21 @@
<!-- Check out the cvsPackage -->
<!-- ===================================================================== -->
<target name="checkOutMaps">
- <echo message="${mapCvsRoot} ${mapVersionTag} " />
+ <echo message="mapCvsRoot: ${mapCvsRoot}" />
<echo message="cvsPackage = ${cvsPackage} " />
+ <echo message="versionTagParam: ${versionTagParam}" />
<cvs
cvsRoot="${mapCvsRoot}"
package="${cvsPackage}"
dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
-
+ tag="${versionTagParam}" />
</target>
<!-- ===================================================================== -->
<!-- Tag Map Files mapCvsRoot -->
<!-- ===================================================================== -->
- <target name="tagMapFiles"
+ <target
+ name="tagMapFiles"
if="tagMaps">
<cvs
cvsRoot="${mapCvsRoot}"
@@ -155,11 +171,15 @@
value="dependencies.combined.properties" />
<!-- Combine releng and releng.dali -->
- <delete file="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" failonerror="false" />
- <concat destfile="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}">
+ <delete
+ file="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}"
+ failonerror="false" />
+ <concat
+ destfile="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}">
<fileset dir="${buildDirectory}/maps">
<include name="releng/maps/dependencies.properties" />
- <include name="releng.dali/maps/dependencies.properties"/>
+ <include
+ name="releng.dali/maps/dependencies.properties" />
</fileset>
</concat>
@@ -211,7 +231,9 @@
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
<target name="postGenerate">
- <customizeAccessRules bundleDirectory="${buildDirectory}/plugins" defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
+ <customizeAccessRules
+ bundleDirectory="${buildDirectory}/plugins"
+ defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
@@ -222,16 +244,23 @@
<!-- ===================================================================== -->
<!-- Steps to do before running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
- <target name="preProcess"></target>
+ <target name="preProcess">
+ <replace
+ dir="${buildDirectory}/plugins"
+ value="${timestamp}"
+ token="@build@">
+ <include name="**/about.mappings" />
+ </replace>
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="postProcess">
<condition property="logsAvailable">
- <istrue value="${javacVerbose}" />
- </condition>
- <antcall target="gatherLogs" />
+ <istrue value="${javacVerbose}" />
+ </condition>
+ <antcall target="gatherLogs" />
</target>
@@ -317,7 +346,8 @@
<unzip
dest="${buildDirectory}/${buildLabel}/testcompilelogs"
overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.jpt.tests">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.jpt.tests">
<include name="**/*.log.zip" />
</fileset>
</unzip>
@@ -337,7 +367,8 @@
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
- <echo message="You must specify a target when invoking this file" />
+ <echo
+ message="You must specify a target when invoking this file" />
</target>
</project>
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index ac602da..054ea91 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -2,7 +2,6 @@
name="Build specific targets and properties"
default="noDefault">
-
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
@@ -39,7 +38,6 @@
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
-
</target>
<target name="prePackage" />
@@ -84,9 +82,14 @@
<property
name="mapCvsRoot"
value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+
+ <!-- if not otherwise set, use these default values -->
<property
name="mapVersionTag"
value="HEAD" />
+ <property
+ name="releng.dali-mapVersionTag"
+ value="HEAD" />
<!-- get primary maps first, since if there happens to be
duplicates, the first one "wins" (such as for dependancies.properties)
@@ -97,6 +100,9 @@
<param
name="cvsPackage"
value="releng" />
+ <param
+ name="versionTagParam"
+ value="${mapVersionTag}" />
</antcall>
<!-- get releng.dali/maps -->
@@ -104,6 +110,9 @@
<param
name="cvsPackage"
value="releng.dali" />
+ <param
+ name="versionTagParam"
+ value="${releng.dali-mapVersionTag}" />
</antcall>
@@ -119,13 +128,14 @@
<!-- Check out the cvsPackage -->
<!-- ===================================================================== -->
<target name="checkOutMaps">
- <echo message="${mapCvsRoot} ${mapVersionTag} " />
+ <echo message="mapCvsRoot: ${mapCvsRoot}" />
<echo message="cvsPackage = ${cvsPackage} " />
+ <echo message="versionTagParam: ${versionTagParam}" />
<cvs
cvsRoot="${mapCvsRoot}"
package="${cvsPackage}"
dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
+ tag="${versionTagParam}" />
</target>
<!-- ===================================================================== -->
@@ -155,8 +165,14 @@
<echo message="ant.file: ${ant.file}" />
<echo message="component.dir: ${component.dir}" />
- <condition property="daliLocalBuild" value="true">
- <equals arg1="${build.distribution}" arg2="dali" casesensitive="false" trim="true" />
+ <condition
+ property="daliLocalBuild"
+ value="true">
+ <equals
+ arg1="${build.distribution}"
+ arg2="dali"
+ casesensitive="false"
+ trim="true" />
</condition>
<!-- Get the dependencies -->
@@ -187,7 +203,8 @@
<!-- ===================================================================== -->
<!-- Get Dali dependencies based on releng.dali maps -->
<!-- ===================================================================== -->
- <target name="getDaliLocalDependencies"
+ <target
+ name="getDaliLocalDependencies"
if="daliLocalBuild">
<ant
@@ -217,7 +234,9 @@
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
<target name="postGenerate">
- <customizeAccessRules bundleDirectory="${buildDirectory}/plugins" defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
+ <customizeAccessRules
+ bundleDirectory="${buildDirectory}/plugins"
+ defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
@@ -244,7 +263,7 @@
<condition property="logsAvailable">
<istrue value="${javacVerbose}" />
</condition>
- <antcall target="gatherLogs" />
+ <antcall target="gatherLogs" />
</target>
@@ -312,7 +331,8 @@
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
- <echo message="You must specify a target when invoking this file" />
+ <echo
+ message="You must specify a target when invoking this file" />
</target>
</project>
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index 6d20fa1..e7a0210 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -103,7 +103,7 @@
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
+ tag="${releng-jsf-mapVersionTag}" />
<!--tag the map files project-->
<antcall target="tagMapFiles">
<param
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 5c5e504..5bf539d 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -96,7 +96,7 @@
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${buildDirectory}/maps"
- tag="${mapCvsRoot}" />
+ tag="${releng-jsf-mapVersionTag}" />
<!--tag the map files project-->
<antcall target="tagMapFiles">
<param
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 426526a..29b2799 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -103,7 +103,7 @@
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
+ tag="${releng-jsf-mapVersionTag}" />
<!--tag the map files project-->
<antcall target="tagMapFiles">
<param
diff --git a/releng.wtpbuilder/components/wtp-thirdparty/build.properties b/releng.wtpbuilder/components/wtp-thirdparty/build.properties
deleted file mode 100644
index 3d63de8..0000000
--- a/releng.wtpbuilder/components/wtp-thirdparty/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-# The CVS tag to use when fetching the map files from the repository
-mapVersionTag=HEAD
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder,
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=false
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=true
-
-##################################################
-# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
diff --git a/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml b/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml
deleted file mode 100644
index c9da5ce..0000000
--- a/releng.wtpbuilder/components/wtp-thirdparty/customTargets.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<project
- name="Build specific targets and properties"
- default="noDefault">
-
- <!-- ===================================================================== -->
- <!-- Run a given ${target} on all elements being built -->
- <!-- Add on <ant> task for each top level element being built. -->
- <!-- ===================================================================== -->
- <target name="allElements">
- <echo message="Target:${target} " />
- <echo message="basedir: ${basedir}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="baseLocation: ${baseLocation}" />
- <ant
- antfile="${genericTargets}"
- target="${target}">
- <property
- name="type"
- value="feature" />
- <property
- name="id"
- value="org.eclipse.thirdparty.assembly" />
- </ant>
- </target>
-
- <!-- ===================================================================== -->
- <!-- Targets to assemble the built elements for particular configurations -->
- <!-- These generally call the generated assemble scripts (named in -->
- <!-- ${assembleScriptName}) but may also add pre and post processing -->
- <!-- Add one target for each root element and each configuration -->
- <!-- ===================================================================== -->
-
- <target name="assemble.org.eclipse.thirdparty.assembly">
- <property
- name="archiveName"
- value="wtp-thirdpartyAssembly-${buildLabel}.zip" />
- <ant
- antfile="${assembleScriptName}"
- dir="${buildDirectory}" />
-
- </target>
-
- <target name="prePackage" />
-
- <target name="postPackage">
- <property
- name="archiveName"
- value="wtp-thirdpartyAssembly-${buildLabel}.zip" />
-
- <ant
- antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
- target="unpackUpdateJarsAndCreateZippedPackages">
- <property
- name="buildDirectory"
- value="${buildDirectory}" />
- <property
- name="buildLabel"
- value="${buildLabel}" />
- <property
- name="archiveName"
- value="${archiveName}" />
- </ant>
-
-
- </target>
-
-
-
- <!-- ===================================================================== -->
- <!-- Check out map files from correct repository -->
- <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
- <!-- ===================================================================== -->
- <target name="checkLocal">
- <available
- property="mapsLocal"
- file="${buildDirectory}/maps/releng-thirdparty" />
- </target>
- <target
- name="getMapFiles"
- depends="checkLocal"
- unless="mapsLocal">
-
- <!-- *** change the repo info -->
- <property
- name="mapCvsRoot"
- value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
- <property
- name="mapVersionTag"
- value="HEAD" />
- <echo message="${mapCvsRoot} ${mapVersionTag} " />
- <cvs
- cvsRoot="${mapCvsRoot}"
- package="releng-thirdparty"
- dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
- <!--tag the map files project-->
- <antcall target="tagMapFiles">
- <param
- name="mapCvsRoot"
- value="${mapCvsRoot}" />
- </antcall>
- </target>
-
- <target
- name="tagMapFiles"
- if="tagMaps">
- <cvs
- cvsRoot="${mapCvsRoot}"
- dest="${buildDirectory}/maps"
- command="tag v${buildType}${timestamp}" />
- </target>
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do before setup -->
- <!-- ===================================================================== -->
- <target name="preSetup"></target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after setup but before starting the build proper -->
- <!-- ===================================================================== -->
- <target name="postSetup">
- <dirname
- file="${ant.file}"
- property="component.dir" />
- <ant
- antfile="${component.dir}/dependency.xml"
- target="get">
- <property
- name="dependency.properties"
- value="${buildDirectory}/maps/releng-thirdparty/maps/dependencies.properties" />
- <property
- name="base.install.dir"
- value="${buildRoot}" />
- </ant>
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before fetching the build elements -->
- <!-- ===================================================================== -->
- <target name="preFetch"></target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after fetching the build elements -->
- <!-- ===================================================================== -->
- <target name="postFetch"></target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before generating the build scripts. -->
- <!-- ===================================================================== -->
- <target name="preGenerate"></target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after generating the build scripts. -->
- <!-- ===================================================================== -->
- <target name="postGenerate"></target>
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do before running the build.xmls for the elements being built. -->
- <!-- ===================================================================== -->
- <target name="preProcess">
- <replace
- dir="${buildDirectory}/plugins"
- value="${timestamp}"
- token="@build@">
- <include name="**/about.mappings" />
- </replace>
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after running the build.xmls for the elements being built. -->
- <!-- ===================================================================== -->
- <target name="postProcess">
- <condition property="logsAvailable">
- <istrue value="${javacVerbose}" />
- </condition>
- <antcall target="gatherLogs" />
- </target>
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do before running assemble. -->
- <!-- ===================================================================== -->
- <target name="preAssemble">
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after running assemble. -->
- <!-- ===================================================================== -->
- <target name="postAssemble"></target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the build is done. -->
- <!-- ===================================================================== -->
- <target name="postBuild">
-
- </target>
-
-
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do to test the build results -->
- <!-- ===================================================================== -->
- <target name="test"></target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do to publish the build results -->
- <!-- ===================================================================== -->
- <target name="publish"></target>
-
-
- <!-- ===================================================================== -->
- <!-- Helper targets -->
- <!-- ===================================================================== -->
- <target
- name="gatherLogs"
- if="logsAvailable">
- <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
- <antcall target="allElements">
- <param
- name="target"
- value="gatherLogs" />
- </antcall>
-
- <unzip
- dest="${buildDirectory}/${buildLabel}/compilelogs"
- overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.thirdparty.assembly">
- <include name="**/*.log.zip" />
- </fileset>
- </unzip>
-
-
- </target>
-
- <target
- name="clean"
- unless="noclean">
- <antcall target="allElements">
- <param
- name="target"
- value="cleanElement" />
- </antcall>
- </target>
-
- <!-- ===================================================================== -->
- <!-- Default target -->
- <!-- ===================================================================== -->
- <target name="noDefault">
- <echo message="You must specify a target when invoking this file" />
- </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml b/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml
deleted file mode 100644
index fc2f698..0000000
--- a/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!-- ======================================================================
- Properties that must be passed to this script:
- base.install.dir
- dependencyTargets
- local.cache.dir
- dependency.properties
-
-
- ====================================================================== -->
-<project name="test" default="get">
-
- <target name="get">
- <antcall target="getAndInstall">
- <param name="groupId" value="eclipse" />
- </antcall>
-
-
- <mkdir dir="${buildDirectory}/maps/releng/maps" />
- <antcall target="getAndInstall">
- <param name="groupId" value="orbitthirdpartymap" />
- <param name="base.install.dir" value="${buildDirectory}/maps/releng-thirdparty/maps/" />
- </antcall>
- </target>
-
-
- <target name="getAndInstall">
- <ant antfile="${dependencyTargets}" target="checkDependency">
- <property name="groupId" value="${groupId}" />
- </ant>
- <ant antfile="${dependencyTargets}" target="installDependency">
- <property name="groupId" value="${groupId}" />
- <property name="install.destination" value="${base.install.dir}" />
- </ant>
- </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml b/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml
deleted file mode 100644
index 69a4676..0000000
--- a/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<project default="build" basedir=".">
-
-
-
- <target name="build" depends="getBaseBuilder">
- <dirname file="${ant.file}"
- property="distribution.wtp.build.dir" />
- <property file="${wtp.builder.home}/build.properties" />
- <property name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-
-
- <ant antfile="${buildTargets}">
- <property name="component"
- value="wtp-thirdparty" />
- </ant>
-
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-
- <antcall target="updateSite" />
-
- </target>
-
- <target name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname file="${ant.file}"
- property="wtbuilder.dir" />
- <property name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml" />
- <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
- <ant antfile="${buildTargets}"
- target="getBaseBuilder" />
- </target>
-
-
- <target name="updateSite">
-
-
- <!-- get our authored, tokenized site.xml file -->
- <copy file="${wtp.builder.home}/distribution/wtp.site/templateFiles/siteEnablingFeatures.xml"
- tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
- overwrite="true"
- failonerror="true" />
- <!-- get the ${buildDirectory}/finalPluginsVersions.properties, and
- read as properties -->
- <!-- substitute property value for tokens -->
- <!--
- <replace file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
- propertyfile="${buildDirectory}/finalFeaturesVersions.properties"
- summary="true">
-
- </replace>
- -->
- </target>
-
-</project>
diff --git a/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml b/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml
deleted file mode 100644
index 73ffe67..0000000
--- a/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<project default="sync" basedir=".">
-
-
- <target name="sync">
-
- <ant antfile="${wtp.builder.home}/scripts/upload/upload.xml">
- <property name="site-sub-dir"
- value="committers" />
- </ant>
-
- </target>
-</project>