Skip to content
Snippets Groups Projects
Commit 92d59915 authored by david_williams's avatar david_williams
Browse files

prep for p2 updates

parent f26f536b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1016 additions and 833 deletions
releng.wtpbuilder/build.properties
+ 1
− 1
View file @ 92d59915
......@@ -46,4 +46,4 @@ parallelCompilation=true
generateSourceReferences=true
#repoBaseLocation=${buildDirectory}/${buildLabel}/repository
#transformedRepoLocation=${buildRoot}/eclipse
transformedRepoLocation=${buildDirectory}/transformedRepo
releng.wtpbuilder/build.xml
+ 6
− 2
View file @ 92d59915
......@@ -28,10 +28,13 @@
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
<!-- TODO: I don't think this is loaded here. Wrong basedir? -->
<property
file="${ant.project.name}.properties"/>
<!-- = = = end standard properties pattern = = = -->
<!-- = = = end standard properties pattern = = = -->
<fail
unless="build.distribution"
message="build.distribution must be specified"/>
......@@ -110,6 +113,7 @@
file="${ant.file}"
property="wtp.builder.home"/>
<!-- if not set above, assume R3.2.0 -->
<!-- this happens, for example, when using a "tempTest" branch -->
<property
......
releng.wtpbuilder/components/dali-sdk/allElements.xml 0 → 100644
+ 113
− 0
View file @ 92d59915
<project
name="allElements Delegator">
<property
name="defaultAssemblyEnabled"
value="true"/>
<!--
=====================================================================
-->
<!-- Run a given ${target} on all elements being built -->
<!--
By default ${topLevelElementType} and ${topLevelElementId}
should be
-->
<!--
defined in the builder's build.properties file. You can
customize by
-->
<!-- setting the type/id values directly here. -->
<!--
You can add additional calls to ${genericTargets} to build more
top
-->
<!-- level elements. -->
<!-- -->
<!--
The top level must exist in the ${buildDirectory},
${baseLocation} or
-->
<!-- ${pluginPath} locations. -->
<!--
=====================================================================
-->
<target
name="allElementsDelegator">
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="${topLevelElementType}"/>
<property
name="id"
value="${topLevelElementId}"/>
</ant>
</target>
<!--
======================================================================
-->
<!--
The default assemble target, this will be called to assemble
each
-->
<!-- config if a custom assemble target is not defined. -->
<!-- The following properties will be defined: -->
<!--
config : The configuration being assembled eg "win32.win32.x86"
-->
<!-- element: The element being assembled eg "org.eclipse.sdk" -->
<!-- assembleScriptName: The assemble script to be called -->
<!--
======================================================================
-->
<target
name="defaultAssemble">
<echo
message="defaultAssemble assembleScriptName: ${assembleScriptName}"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<!--
=====================================================================
-->
<!-- Custom 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 for
which
-->
<!--
custom processing is desired. Replace element.id with the id of
the
-->
<!--
top level element being built. A property with a matching name
must
-->
<!--
be defined for this custom target to be called instead of the
-->
<!-- defaultAssemble target above. -->
<!-- Example: name="assemble.org.eclipse.sdk" -->
<!-- Example: name="assemble.org.eclipse.sdk.win32.win32.x86" -->
<!--
======================================================================
-->
<property
name="assemble.element.id[.config.spec]"
value="true"/>
<target
name="assemble.element.id[.config.spec]">
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
</project>
\ No newline at end of file
releng.wtpbuilder/components/dali-sdk/build.properties
+ 10
− 2
View file @ 92d59915
......@@ -17,7 +17,7 @@ runPackager=true
# Set collectingFolder and archivePrefix to . if you want to create archives without
# trailing eclipse in the paths of the included files
collectingFolder=eclipse
logExtension=.xml
# 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
......@@ -25,7 +25,7 @@ archivePrefix=eclipse
# Whether or not to include debug info in the output jars
javacDebugInfo=true
logExtension=.xml
# Whether or not to fail the build if there are compiler errors
javacFailOnError=false
......@@ -35,3 +35,11 @@ javacFailOnError=false
javacVerbose=true
sign=true
p2.gathering=true
p2.compress=true
skipMirroring=true
compilelogsDir=compilelogs
topLevelElementType=feature
topLevelElementId=org.eclipse.jpt_sdk.assembly.feature
releng.wtpbuilder/components/dali-sdk/category.xml 0 → 100644
+ 52
− 0
View file @ 92d59915
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature
url="features/org.eclipse.jpt_sdk.feature_2.3.0.qualifier.jar"
id="org.eclipse.jpt_sdk.feature"
version="2.3.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jpt.eclipselink_sdk.feature_2.3.0.qualifier.jar"
id="org.eclipse.jpt.eclipselink_sdk.feature"
version="2.3.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jpt.feature_2.3.0.qualifier.jar"
id="org.eclipse.jpt.feature"
version="2.3.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jpt.eclipselink.feature_2.3.0.qualifier.jar"
id="org.eclipse.jpt.eclipselink.feature"
version="2.3.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<category-def
name="Web Tools Platform (WTP) 3.2.0"
label="Web Tools Platform (WTP) 3.2.0">
<description>
These features provide functionality with the executable code only and are recommended for most users.
</description>
</category-def>
<category-def
name="Web Tools Platform SDK (WTP SDK) 3.2.0"
label="Web Tools Platform SDK (WTP SDK) 3.2.0">
<description>
These features provide functionality with the executable code and the source code and are recommended for those
extending or debugging
WTP.
</description>
</category-def>
</site>
\ No newline at end of file
releng.wtpbuilder/components/dali-sdk/customTargets.xml
+ 141
− 132
View file @ 92d59915
......@@ -31,116 +31,91 @@
message="buildDirectory must be set"/>
<echo
message="buildDirectory: ${buildDirectory}"/>
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
<property
name="p2.metadata.repo.name"
value="WTP Build repository: ${buildLabel}/${component}"/>
<property
name="p2.artifact.repo.name"
value="WTP Build repository: ${buildLabel}/${component}"/>
<property
name="p2buildrepoDirectory"
value="${buildDirectory}/${buildLabel}/repository/${component}/"/>
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
<property
name="p2.category.definition"
value="file://${wtp.builder.home}/components/${component}/category.xml"/>
<echo
message="p2.build.repo: ${p2.build.repo}"/>
<echo
message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
<available
property="allElementsFile"
file="${builder}/allElements.xml"
value="${builder}/allElements.xml"/>
<property
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import
file="${allElementsFile}"/>
<target
name="allElements">
<echo
level="info"
message="Target:${target} "/>
message="target: ${target} "/>
<echo
level="debug"
level="info"
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}"/>
<echo
level="debug"
level="info"
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
level="info"
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
level="info"
message="generic target: ${genericTargets}"/>
<echo
level="info"
message="topLevelElementId: ${topLevelElementId}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature"/>
<property
name="id"
value="org.eclipse.jpt_sdk.assembly.feature"/>
</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.jpt_sdk.assembly.feature">
<property
name="archiveName"
value="wtp-jpt-sdk-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<target
name="prePackage"/>
<target
name="postPackage">
<property
name="archiveName"
value="wtp-jpt-sdk-${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>
<antcall
target="allElementsDelegator"/>
</target>
<!--
<!--
Check out map files from repository
-->
-->
<target
name="getMapFiles">
<!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
<property
name="mapcomponent"
value="${env.RELENG}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
</ant>
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
<property
name="mapcomponent"
value="${env.RELENGDALI}"/>
<property
name="mapTag"
value="${releng.dali-mapVersionTag}"/>
</ant>
target="fetchAllMaps"/>
</target>
<!--
<!--
Steps to do before setup
-->
<target
name="preSetup"></target>
name="preSetup">
</target>
<!--
Steps to do after setup but before starting the build proper
-->
......@@ -179,25 +154,36 @@
</target>
<!--
Steps to do before fetching the build elements
Steps to do before fetching the build elements
-->
<target
name="preFetch"></target>
<!--
Steps to do after fetching the build elements
name="preFetch">
</target>
<target
name="postFetch">
</target>
<!--
Steps to do before the repositories are being processed
-->
<target
name="preProcessRepos">
</target>
<!--
Steps to do after the repositories have been processed
-->
<target
name="postFetch"></target>
name="postProcessRepos">
</target>
<!--
Steps to do before generating the build scripts.
Steps to do before generating the build scripts.
-->
<target
name="preGenerate"></target>
name="preGenerate">
</target>
<!--
Steps to do after generating the build scripts.
Steps to do after generating the build scripts.
-->
<target
name="postGenerate">
......@@ -236,45 +222,70 @@
target="gatherLogs"/>
</target>
<!-- Steps to do before running assemble. -->
<target
name="preAssemble">
</target>
<!--
Steps to do before running assemble.
Steps to do after running assemble.
-->
<target
name="preAssemble"></target>
name="postAssemble">
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="conditionAndSignJars"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="finishPackages"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="createTraditionalZipFiles">
</ant>
</target>
<!--
Steps to do after running assemble.
Steps to do after the build is done.
-->
<target
name="postAssemble"></target>
name="prePackage">
</target>
<!-- Steps to do after running package. -->
<target
name="postPackage">
</target>
<!--
Steps to do after the build is done.
Steps to do after the build is done.
-->
<target
name="postBuild"></target>
name="postBuild">
</target>
<!--
Steps to do to test the build results
Steps to do to test the build results
-->
<target
name="test"></target>
name="test">
</target>
<!--
Steps to do to publish the build results
Steps to do to publish the build results
-->
<target
name="publish"></target>
name="publish">
</target>
<!--
Helper targets
Helper targets
-->
<target
name="gatherLogs"
if="logsAvailable">
<mkdir
dir="${buildDirectory}/${buildLabel}/compilelogs"/>
dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
<echo
level="debug"
message="logExtension: ${logExtension}"/>
......@@ -288,49 +299,47 @@
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
dest="${buildDirectory}/${buildLabel}/${compilelogsDir}"
overwrite="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.jpt_sdk.assembly.feature">
dir="${buildDirectory}/features/${topLevelElementId}">
<include
name="**/*.log.zip"/>
</fileset>
</unzip>
<!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-->
<copy
todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
overwrite="true">
<!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
<fileset
dir="${buildDirectory}/features/">
<include
name="**/feature.temp.folder/"/>
<exclude
name="**/*tests*feature*/feature.temp.folder/" />
</fileset>
<compositemapper>
<mapper
type="regexp"
from="(.*)/plugins/(.*)/@dot.xml"
to="/\2/@dot.xml"/>
<mapper
type="regexp"
from="(.*)/plugins/(.*)/(.*)bin.xml"
to="/\2/\3bin.xml"/>
</compositemapper>
</copy>
<!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-->
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
<!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
<fileset
dir="${buildDirectory}/features/">
<include
name="**/feature.temp.folder/"/>
<exclude
name="**/*tests*feature*/feature.temp.folder/"/>
</fileset>
<compositemapper>
<mapper
type="regexp"
from="(.*)/plugins/(.*)/@dot.xml"
to="/\2/@dot.xml"/>
<mapper
type="regexp"
from="(.*)/plugins/(.*)/(.*)bin.xml"
to="/\2/\3bin.xml"/>
</compositemapper>
</copy>
</target>
<target
name="clean"
......@@ -344,7 +353,7 @@
</target>
<!--
Default target
Default target
-->
<target
name="noDefault">
......
releng.wtpbuilder/components/dali-sdk/dependency.xml
+ 12
− 11
View file @ 92d59915
<?xml version="1.0"?>
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
<!--
======================================================================
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">
<!--
read in this properties, just so we can make sure our
requested pre-reqs are defined
requested pre-reqs are defined via {groupId}.url
-->
<property
file="${dependency.properties}"/>
<antcall
target="getAndInstall">
<param
......@@ -53,8 +53,9 @@
</antcall>
</target>
<target name="getAndInstall" if="${groupId}.url">
<target
name="getAndInstall"
if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
......
releng.wtpbuilder/components/dali.tests/allElements.xml 0 → 100644
+ 113
− 0
View file @ 92d59915
<project
name="allElements Delegator">
<property
name="defaultAssemblyEnabled"
value="true"/>
<!--
=====================================================================
-->
<!-- Run a given ${target} on all elements being built -->
<!--
By default ${topLevelElementType} and ${topLevelElementId}
should be
-->
<!--
defined in the builder's build.properties file. You can
customize by
-->
<!-- setting the type/id values directly here. -->
<!--
You can add additional calls to ${genericTargets} to build more
top
-->
<!-- level elements. -->
<!-- -->
<!--
The top level must exist in the ${buildDirectory},
${baseLocation} or
-->
<!-- ${pluginPath} locations. -->
<!--
=====================================================================
-->
<target
name="allElementsDelegator">
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="${topLevelElementType}"/>
<property
name="id"
value="${topLevelElementId}"/>
</ant>
</target>
<!--
======================================================================
-->
<!--
The default assemble target, this will be called to assemble
each
-->
<!-- config if a custom assemble target is not defined. -->
<!-- The following properties will be defined: -->
<!--
config : The configuration being assembled eg "win32.win32.x86"
-->
<!-- element: The element being assembled eg "org.eclipse.sdk" -->
<!-- assembleScriptName: The assemble script to be called -->
<!--
======================================================================
-->
<target
name="defaultAssemble">
<echo
message="defaultAssemble assembleScriptName: ${assembleScriptName}"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<!--
=====================================================================
-->
<!-- Custom 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 for
which
-->
<!--
custom processing is desired. Replace element.id with the id of
the
-->
<!--
top level element being built. A property with a matching name
must
-->
<!--
be defined for this custom target to be called instead of the
-->
<!-- defaultAssemble target above. -->
<!-- Example: name="assemble.org.eclipse.sdk" -->
<!-- Example: name="assemble.org.eclipse.sdk.win32.win32.x86" -->
<!--
======================================================================
-->
<property
name="assemble.element.id[.config.spec]"
value="true"/>
<target
name="assemble.element.id[.config.spec]">
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
</project>
\ No newline at end of file
releng.wtpbuilder/components/dali.tests/build.properties
+ 11
− 2
View file @ 92d59915
......@@ -17,12 +17,12 @@ runPackager=true
# Set collectingFolder and archivePrefix to . if you want to create archives without
# trailing eclipse in the paths of the included files
collectingFolder=eclipse
logExtension=.xml
# 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
logExtension=.xml
# Whether or not to include debug info in the output jars
javacDebugInfo=true
......@@ -35,3 +35,12 @@ javacFailOnError=false
javacVerbose=true
sign=false
p2.gathering=true
p2.compress=true
skipMirroring=true
compilelogsDir=testcompilelogs
topLevelElementType=feature
topLevelElementId=org.eclipse.jpt.tests.assembly.feature
releng.wtpbuilder/components/dali.tests/category.xml 0 → 100644
+ 19
− 0
View file @ 92d59915
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature
url="features/org.eclipse.jpt.tests_2.1.0.qualifier.jar"
id="org.eclipse.jpt.tests"
version="2.1.0.qualifier">
<category
name="Web Tools Platform Tests (WTP Tests) 3.2.0"/>
</feature>
<category-def
name="Web Tools Platform Tests (WTP Tests) 3.2.0"
label="Web Tools Platform Tests (WTP Tests) 3.2.0">
<description>
These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
their PDE Targets.
</description>
</category-def>
</site>
releng.wtpbuilder/components/dali.tests/customTargets.xml
+ 154
− 151
View file @ 92d59915
......@@ -31,115 +31,91 @@
message="buildDirectory must be set"/>
<echo
message="buildDirectory: ${buildDirectory}"/>
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
<property
name="p2.metadata.repo.name"
value="WTP Build repository: ${buildLabel}/${component}"/>
<property
name="p2.artifact.repo.name"
value="WTP Build repository: ${buildLabel}/${component}"/>
<property
name="p2buildrepoDirectory"
value="${buildDirectory}/${buildLabel}/repository/${component}/"/>
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
<property
name="p2.category.definition"
value="file://${wtp.builder.home}/components/${component}/category.xml"/>
<echo
message="p2.build.repo: ${p2.build.repo}"/>
<echo
message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
<available
property="allElementsFile"
file="${builder}/allElements.xml"
value="${builder}/allElements.xml"/>
<property
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import
file="${allElementsFile}"/>
<target
name="allElements">
<echo
level="info"
message="Target: ${target} "/>
message="target: ${target} "/>
<echo
level="debug"
level="info"
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}"/>
<echo
level="debug"
level="info"
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
level="info"
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
level="info"
message="generic target: ${genericTargets}"/>
<echo
level="info"
message="topLevelElementId: ${topLevelElementId}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature"/>
<property
name="id"
value="org.eclipse.jpt.tests.assembly.feature"/>
</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.jpt.tests.assembly.feature">
<property
name="archiveName"
value="wtp-jpt-Automated-Tests-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<target
name="prePackage"/>
<target
name="postPackage">
<property
name="archiveName"
value="wtp-jpt-Automated-Tests-${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>
<antcall
target="allElementsDelegator"/>
</target>
<!--
<!--
Check out map files from repository
-->
-->
<target
name="getMapFiles">
<!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
<property
name="mapcomponent"
value="${env.RELENG}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
</ant>
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
<property
name="mapcomponent"
value="${env.RELENGDALI}"/>
<property
name="mapTag"
value="${releng.dali-mapVersionTag}"/>
</ant>
target="fetchAllMaps"/>
</target>
<!--
<!--
Steps to do before setup
-->
<target
name="preSetup"></target>
name="preSetup">
</target>
<!--
Steps to do after setup but before starting the build proper
-->
......@@ -154,6 +130,20 @@
<echo
level="debug"
message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall
target="getDependencies"/>
</target>
<!--
=====================================================================
-->
<!-- Get the dependencies based on releng maps -->
<!--
=====================================================================
-->
<target
name="getDependencies">
<ant
antfile="${component.dir}/dependency.xml"
target="get">
......@@ -161,49 +151,39 @@
name="base.install.dir"
value="${buildRoot}"/>
</ant>
<!--fetch the additional pieces to build tests -->
<property
name="featureOnly"
value="false"/>
<property
name="featureAndPlugins"
value="true"/>
<property
name="featuresRecursively"
value="true"/>
<ant
antfile="${genericTargets}"
dir="${eclipse.pdebuild.scripts}"
target="fetchElement">
<property
name="type"
value="feature"/>
<property
name="id"
value="org.eclipse.jpt.feature"/>
</ant>
</target>
<!--
Steps to do before fetching the build elements
Steps to do before fetching the build elements
-->
<target
name="preFetch"></target>
<!--
Steps to do after fetching the build elements
name="preFetch">
</target>
<target
name="postFetch">
</target>
<!--
Steps to do before the repositories are being processed
-->
<target
name="postFetch"></target>
name="preProcessRepos">
</target>
<!--
Steps to do after the repositories have been processed
-->
<target
name="postProcessRepos">
</target>
<!--
Steps to do before generating the build scripts.
Steps to do before generating the build scripts.
-->
<target
name="preGenerate"></target>
name="preGenerate">
</target>
<!--
Steps to do after generating the build scripts.
Steps to do after generating the build scripts.
-->
<target
name="postGenerate">
......@@ -242,78 +222,70 @@
target="gatherLogs"/>
</target>
<!-- Steps to do before running assemble. -->
<target
name="preAssemble">
</target>
<!--
Steps to do before running assemble.
Steps to do after running assemble.
-->
<target
name="preAssemble"></target>
name="postAssemble">
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="conditionAndSignJars"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="finishPackages"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="createTraditionalZipFiles">
</ant>
</target>
<!--
Steps to do after running assemble.
Steps to do after the build is done.
-->
<target
name="postAssemble"></target>
name="prePackage">
</target>
<!-- Steps to do after running package. -->
<target
name="postPackage">
</target>
<!--
Steps to do after the build is done.
Steps to do after the build is done.
-->
<target
name="postBuild"></target>
name="postBuild">
</target>
<!--
Steps to do to test the build results
Steps to do to test the build results
-->
<target
name="test"
unless="dontRunTests">
<property
name="eclipseAutomatedTestHome"
value="${buildDirectory}/plugins/org.eclipse.jpt.utility.tests"/>
<echo
level="info"
message="Setting up tests in ${eclipseAutomatedTestHome}"/>
<copy
file="${buildDirectory}/${buildLabel}/wtp-jpt-${buildLabel}.zip"
tofile="${eclipseAutomatedTestHome}/eclipse-SDK-wtp-jpt-${buildLabel}.zip"/>
<copy
file="${buildDirectory}/${buildLabel}/wtp-jpt-Automated-Tests-${buildLabel}.zip"
tofile="${eclipseAutomatedTestHome}/eclipse-junit-tests-wtp-jpt-${buildLabel}.zip"/>
<ant
antfile="${eclipseAutomatedTestHome}/test.xml"
target="run"
dir="${eclipseAutomatedTestHome}">
<property
name="os"
value="${baseos}"/>
<property
name="ws"
value="${basews}"/>
<property
name="arch"
value="${basearch}"/>
<property
name="eclipse-home"
value="${baseLocation}"/>
</ant>
name="test">
</target>
<!--
Steps to do to publish the build results
Steps to do to publish the build results
-->
<target
name="publish"></target>
name="publish">
</target>
<!--
Helper targets
Helper targets
-->
<target
name="gatherLogs"
if="logsAvailable">
<mkdir
dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
<echo
level="debug"
message="logExtension: ${logExtension}"/>
......@@ -327,14 +299,45 @@
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/testcompilelogs"
dest="${buildDirectory}/${buildLabel}/${compilelogsDir}"
overwrite="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.jpt.tests.assembly.feature">
dir="${buildDirectory}/features/${topLevelElementId}">
<include
name="**/*.log.zip"/>
</fileset>
</unzip>
<!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-->
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
<!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
<fileset
dir="${buildDirectory}/features/">
<include
name="**/*tests*feature*/feature.temp.folder/"/>
</fileset>
<compositemapper>
<mapper
type="regexp"
from="(.*)/plugins/(.*)/@dot.xml"
to="/\2/@dot.xml"/>
<mapper
type="regexp"
from="(.*)/plugins/(.*)/(.*)bin.xml"
to="/\2/\3bin.xml"/>
</compositemapper>
</copy>
</target>
<target
name="clean"
......@@ -348,7 +351,7 @@
</target>
<!--
Default target
Default target
-->
<target
name="noDefault">
......
releng.wtpbuilder/components/dali.tests/dependency.xml
+ 7
− 7
View file @ 92d59915
<?xml version="1.0"?>
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
======================================================================
-->
======================================================================
-->
<project
name="test"
default="get">
......@@ -16,7 +16,7 @@
<!--
read in this properties, just so we can make sure our
requested pre-reqs are defined
requested pre-reqs are defined via {groupId}.url
-->
<property
file="${dependency.properties}"/>
......
releng.wtpbuilder/components/dali/build.properties deleted 100644 → 0
+ 0
− 37
View file @ f26f536b
###############################################################################
# Copyright (c) 2006 Oracle.
# 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:
# Oracle - initial API and implementation
###############################################################################
# This property file is used automatically by the PDE build process
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=true
logExtension=.xml
# Whether or not to fail the build if there are compiler errors
javacFailOnError=false
##################################################
# 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
sign=true
releng.wtpbuilder/components/dali/customTargets.xml deleted 100644 → 0
+ 0
− 320
View file @ f26f536b
<project
name="PDECustomTargets"
default="noDefault"
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"/>
<!-- let this project specify properties, if not already set -->
<property
file="build.properties"/>
<fail
message="dependency.properties must be specified by distribution script"
unless="dependency.properties"/>
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
<echo
message="buildDirectory: ${buildDirectory}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
<target
name="allElements">
<echo
level="info"
message="Target: ${target} "/>
<echo
level="debug"
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}"/>
<echo
level="debug"
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
message="generic target: ${genericTargets}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature"/>
<property
name="id"
value="org.eclipse.jpt.assembly.feature"/>
</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.jpt.assembly.feature">
<property
name="archiveName"
value="wtp-jpt-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<target
name="prePackage"/>
<target
name="postPackage">
<property
name="archiveName"
value="wtp-jpt-${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 repository
-->
<target
name="getMapFiles">
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
<property
name="mapcomponent"
value="${env.RELENG}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
</ant>
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
<property
name="mapcomponent"
value="${env.RELENGDALI}"/>
<property
name="mapTag"
value="${releng.dali-mapVersionTag}"/>
</ant>
</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"/>
<echo
level="debug"
message="ant.file: ${ant.file}"/>
<echo
level="debug"
message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall
target="getDependencies"/>
</target>
<!--
=====================================================================
-->
<!-- Get the dependencies based on releng maps -->
<!--
=====================================================================
-->
<target
name="getDependencies">
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<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">
<echo
message="buildDirectory: ${buildDirectory}"/>
<customizeAccessRules
bundleDirectory="${buildDirectory}/plugins"
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
</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"/>
<echo
level="debug"
message="logExtension: ${logExtension}"/>
<antcall
target="allElements">
<param
name="target"
value="gatherLogs"/>
<param
name="logExtension"
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.jpt.assembly.feature">
<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
level="error"
message="You must specify a target when invoking this file"/>
</target>
</project>
\ No newline at end of file
releng.wtpbuilder/components/dali/dependency.xml deleted 100644 → 0
+ 0
− 75
View file @ f26f536b
<?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">
<!-- read in this properties, just so we can make sure our requested pre-reqs are defined -->
<property
file="${dependency.properties}"/>
<antcall
target="getAndInstall">
<param
name="groupId"
value="emf"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="emfxsd"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="dtp"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse"/>
</antcall>
</target>
<target name="getAndInstall" if="${groupId}.url">
<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>
releng.wtpbuilder/components/jst-sdk/allElements.xml 0 → 100644
+ 113
− 0
View file @ 92d59915
<project
name="allElements Delegator">
<property
name="defaultAssemblyEnabled"
value="true"/>
<!--
=====================================================================
-->
<!-- Run a given ${target} on all elements being built -->
<!--
By default ${topLevelElementType} and ${topLevelElementId}
should be
-->
<!--
defined in the builder's build.properties file. You can
customize by
-->
<!-- setting the type/id values directly here. -->
<!--
You can add additional calls to ${genericTargets} to build more
top
-->
<!-- level elements. -->
<!-- -->
<!--
The top level must exist in the ${buildDirectory},
${baseLocation} or
-->
<!-- ${pluginPath} locations. -->
<!--
=====================================================================
-->
<target
name="allElementsDelegator">
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="${topLevelElementType}"/>
<property
name="id"
value="${topLevelElementId}"/>
</ant>
</target>
<!--
======================================================================
-->
<!--
The default assemble target, this will be called to assemble
each
-->
<!-- config if a custom assemble target is not defined. -->
<!-- The following properties will be defined: -->
<!--
config : The configuration being assembled eg "win32.win32.x86"
-->
<!-- element: The element being assembled eg "org.eclipse.sdk" -->
<!-- assembleScriptName: The assemble script to be called -->
<!--
======================================================================
-->
<target
name="defaultAssemble">
<echo
message="defaultAssemble assembleScriptName: ${assembleScriptName}"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<!--
=====================================================================
-->
<!-- Custom 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 for
which
-->
<!--
custom processing is desired. Replace element.id with the id of
the
-->
<!--
top level element being built. A property with a matching name
must
-->
<!--
be defined for this custom target to be called instead of the
-->
<!-- defaultAssemble target above. -->
<!-- Example: name="assemble.org.eclipse.sdk" -->
<!-- Example: name="assemble.org.eclipse.sdk.win32.win32.x86" -->
<!--
======================================================================
-->
<property
name="assemble.element.id[.config.spec]"
value="true"/>
<target
name="assemble.element.id[.config.spec]">
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
</project>
\ No newline at end of file
releng.wtpbuilder/components/jst-sdk/build.properties
+ 11
− 3
View file @ 92d59915
###############################################################################
# Copyright (c) 2003, 2006 IBM Corporation and others.
# Copyright (c) 2003, 2010 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
......@@ -17,12 +17,12 @@ runPackager=true
# Set collectingFolder and archivePrefix to . if you want to create archives without
# trailing eclipse in the paths of the included files
collectingFolder=eclipse
logExtension=.xml
# 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
logExtension=.xml
# Whether or not to include debug info in the output jars
javacDebugInfo=true
......@@ -35,3 +35,11 @@ javacFailOnError=false
javacVerbose=true
sign=true
p2.gathering=true
p2.compress=true
skipMirroring=true
compilelogsDir=compilelogs
topLevelElementType=feature
topLevelElementId=org.eclipse.jst.sdk
releng.wtpbuilder/components/jst-sdk/category.xml 0 → 100644
+ 132
− 0
View file @ 92d59915
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature
url="features/org.eclipse.jst.enterprise_ui.feature_3.2.0.qualifier.jar"
id="org.eclipse.jst.enterprise_ui.feature"
version="3.2.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jsf.feature_3.2.0.qualifier.jar"
id="org.eclipse.jsf.feature"
version="3.2.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.enterprise_sdk.feature_3.2.0.qualifier.jar"
id="org.eclipse.jst.enterprise_sdk.feature"
version="3.2.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jsf_sdk.feature_3.2.0.qualifier.jar"
id="org.eclipse.jsf_sdk.feature"
version="3.2.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.jaxws_sdk.feature_1.0.0.qualifier.jar"
id="org.eclipse.jst.ws.jaxws_sdk.feature"
version="1.0.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.jaxws.dom_sdk.feature_1.0.0.qualifier.jar"
id="org.eclipse.jst.ws.jaxws.dom_sdk.feature"
version="1.0.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.cxf_sdk.feature_1.0.0.qualifier.jar"
id="org.eclipse.jst.ws.cxf_sdk.feature"
version="1.0.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.2.100.qualifier.jar"
id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
version="2.2.100.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.1.100.qualifier.jar"
id="org.eclipse.jst.ws.axis2tools_sdk.feature"
version="1.1.100.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.3.0.qualifier.jar"
id="org.eclipse.jst.webpageeditor_sdk.feature"
version="2.3.0.qualifier">
<category
name="Web Tools Platform SDK (WTP SDK) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.axis2tools.feature_1.1.100.qualifier.jar"
id="org.eclipse.jst.ws.axis2tools.feature"
version="1.1.100.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.webpageeditor.feature_2.3.0.qualifier.jar"
id="org.eclipse.jst.webpageeditor.feature"
version="2.3.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.jaxws.feature_1.0.0.qualifier.jar"
id="org.eclipse.jst.ws.jaxws.feature"
version="1.0.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.jaxws.dom.feature_1.0.0.qualifier.jar"
id="org.eclipse.jst.ws.jaxws.dom.feature"
version="1.0.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.2.100.qualifier.jar"
id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
version="2.2.100.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<feature
url="features/org.eclipse.jst.ws.cxf.feature_1.0.0.qualifier.jar"
id="org.eclipse.jst.ws.cxf.feature"
version="1.0.0.qualifier">
<category
name="Web Tools Platform (WTP) 3.2.0"/>
</feature>
<category-def
name="Web Tools Platform (WTP) 3.2.0"
label="Web Tools Platform (WTP) 3.2.0">
<description>
These features provide functionality with the executable code only and are recommended for most users.
</description>
</category-def>
<category-def
name="Web Tools Platform SDK (WTP SDK) 3.2.0"
label="Web Tools Platform SDK (WTP SDK) 3.2.0">
<description>
These features provide functionality with the executable code and the source code and are recommended for those
extending or debugging
WTP.
</description>
</category-def>
</site>
releng.wtpbuilder/components/jst-sdk/customTargets.xml
+ 115
− 78
View file @ 92d59915
......@@ -31,84 +31,73 @@
message="buildDirectory must be set"/>
<echo
message="buildDirectory: ${buildDirectory}"/>
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
<property
name="p2.metadata.repo.name"
value="WTP Build repository: ${buildLabel}/${component}"/>
<property
name="p2.artifact.repo.name"
value="WTP Build repository: ${buildLabel}/${component}"/>
<property
name="p2buildrepoDirectory"
value="${buildDirectory}/${buildLabel}/repository/${component}/"/>
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
<property
name="p2.category.definition"
value="file://${wtp.builder.home}/components/${component}/category.xml"/>
<echo
message="p2.build.repo: ${p2.build.repo}"/>
<echo
message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
<available
property="allElementsFile"
file="${builder}/allElements.xml"
value="${builder}/allElements.xml"/>
<property
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import
file="${allElementsFile}"/>
<target
name="allElements">
<echo
level="info"
message="Target:${target} "/>
message="target: ${target} "/>
<echo
level="debug"
level="info"
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}"/>
<echo
level="debug"
level="info"
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
level="info"
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
level="info"
message="generic target: ${genericTargets}"/>
<echo
level="info"
message="topLevelElementId: ${topLevelElementId}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature"/>
<property
name="id"
value="org.eclipse.jst.sdk"/>
</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.jst.sdk">
<property
name="archiveName"
value="wtp-jst-sdk-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
</target>
<target
name="prePackage"/>
<target
name="postPackage">
<property
name="archiveName"
value="wtp-jst-sdk-${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>
<antcall
target="allElementsDelegator"/>
</target>
<!--
<!--
Check out map files from repository
-->
<target
......@@ -121,11 +110,12 @@
</target>
<!--
<!--
Steps to do before setup
-->
<target
name="preSetup"></target>
name="preSetup">
</target>
<!--
Steps to do after setup but before starting the build proper
-->
......@@ -164,25 +154,36 @@
</target>
<!--
Steps to do before fetching the build elements
Steps to do before fetching the build elements
-->
<target
name="preFetch"></target>
<!--
Steps to do after fetching the build elements
name="preFetch">
</target>
<target
name="postFetch">
</target>
<!--
Steps to do before the repositories are being processed
-->
<target
name="postFetch"></target>
name="preProcessRepos">
</target>
<!--
Steps to do after the repositories have been processed
-->
<target
name="postProcessRepos">
</target>
<!--
Steps to do before generating the build scripts.
Steps to do before generating the build scripts.
-->
<target
name="preGenerate"></target>
name="preGenerate">
</target>
<!--
Steps to do after generating the build scripts.
Steps to do after generating the build scripts.
-->
<target
name="postGenerate">
......@@ -221,45 +222,70 @@
target="gatherLogs"/>
</target>
<!-- Steps to do before running assemble. -->
<target
name="preAssemble">
</target>
<!--
Steps to do before running assemble.
Steps to do after running assemble.
-->
<target
name="preAssemble"></target>
name="postAssemble">
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="conditionAndSignJars"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="finishPackages"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
target="createTraditionalZipFiles">
</ant>
</target>
<!--
Steps to do after running assemble.
Steps to do after the build is done.
-->
<target
name="postAssemble"></target>
name="prePackage">
</target>
<!-- Steps to do after running package. -->
<target
name="postPackage">
</target>
<!--
Steps to do after the build is done.
Steps to do after the build is done.
-->
<target
name="postBuild"></target>
name="postBuild">
</target>
<!--
Steps to do to test the build results
Steps to do to test the build results
-->
<target
name="test"></target>
name="test">
</target>
<!--
Steps to do to publish the build results
Steps to do to publish the build results
-->
<target
name="publish"></target>
name="publish">
</target>
<!--
Helper targets
Helper targets
-->
<target
name="gatherLogs"
if="logsAvailable">
<mkdir
dir="${buildDirectory}/${buildLabel}/compilelogs"/>
dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
<echo
level="debug"
message="logExtension: ${logExtension}"/>
......@@ -272,14 +298,24 @@
name="logExtension"
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/${compilelogsDir}"
overwrite="true">
<fileset
dir="${buildDirectory}/features/${topLevelElementId}">
<include
name="**/*.log.zip"/>
</fileset>
</unzip>
<!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-->
<copy
todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
<!--
we want all @dot.xml files, but assumes a certain
......@@ -303,6 +339,7 @@
to="/\2/\3bin.xml"/>
</compositemapper>
</copy>
</target>
<target
name="clean"
......@@ -316,7 +353,7 @@
</target>
<!--
Default target
Default target
-->
<target
name="noDefault">
......
releng.wtpbuilder/components/jst-sdk/dependency.xml
+ 6
− 12
View file @ 92d59915
<?xml version="1.0"?>
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
======================================================================
-->
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
======================================================================
-->
<project
name="test"
default="get">
......@@ -51,12 +51,6 @@
name="groupId"
value="emfxsd"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="emfvalidation"/>
</antcall>
<antcall
target="getAndInstall">
<param
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent