Skip to content
Snippets Groups Projects
Commit 7e568c78 authored by david_williams's avatar david_williams
Browse files

323245 - Include the JST Server features in the Web Tools Platform (WTP)... 

323245 -  Include the JST Server features in the Web Tools Platform (WTP) 3.2.x update site category
parent 1fc961ed
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 578 additions and 429 deletions
releng.wtpbuilder/.project
+ 24
− 24
View file @ 7e568c78
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>releng.wtpbuilder</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.dltk.core.scriptbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.php.core.PHPNature</nature>
</natures>
<name>releng.wtpbuilder</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.dltk.core.scriptbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.php.core.PHPNature</nature>
</natures>
</projectDescription>
releng.wtpbuilder/build.xml
+ 12
− 8
View file @ 7e568c78
......@@ -80,11 +80,15 @@
value="${env.LOCAL_PREREQS_CACHE}"/>
</ant>
</target>
<target name="markIfNoTests" unless="tests_distro_target_exists">
<echo message="This build for ${distribution} (${projectname}) provided no unit tests" file="${buildDirectory}/${buildLabel}/noTestsProvided.txt" />
</target>
<target
name="markIfNoTests"
unless="tests_distro_target_exists">
<echo
message="This build for ${distribution} (${projectname}) provided no unit tests"
file="${buildDirectory}/${buildLabel}/noTestsProvided.txt"/>
</target>
<!-- we dont' use 'upload' any longer ... TODO: remove? -->
<target
......@@ -136,9 +140,9 @@
level="info"
message="label file: ${buildDirectory}/label.properties"/>
<property
<property
name="build.distribution"
value="${wtp.builder.home}/distribution/${wtp.builder.home}/distribution/${build.distribution}"/>
<available
......
releng.wtpbuilder/buildtemplates/build.xml
+ 4
− 2
View file @ 7e568c78
......@@ -155,8 +155,10 @@
arg1="${testsuffix}"
arg2="NONE"/>
</condition>
<echo message="testsuffix: ${testsuffix}" />
<echo message="notest: ${notest}" />
<echo
message="testsuffix: ${testsuffix}"/>
<echo
message="notest: ${notest}"/>
</target>
<!-- replace tokens -->
<target
......
releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+ 5
− 1
View file @ 7e568c78
......@@ -41,7 +41,11 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
<jvmarg
value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
......
releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php
+ 21
− 21
View file @ 7e568c78
......@@ -46,31 +46,31 @@ function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDes
}
function displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
echo $zipfilesize;
echo "</td>";
echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
echo $zipfilesize;
echo "</td>";
}
function displayp2repoarchives($zipfilename, $downloadprefix, $fileShortDescription, $label, $description) {
$filename=$zipfilename.".zip";
if (file_exists($filename)) {
echo "<tr>";
echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
echo "<td align=\"left\" valign=\"top\">";
echo "<p>".$description."</p>";
echo "</td>";
$zipfilesize=fileSizeForDisplay($filename);
displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
echo "</tr>";
}
$filename=$zipfilename.".zip";
if (file_exists($filename)) {
echo "<tr>";
echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
echo "<td align=\"left\" valign=\"top\">";
echo "<p>".$description."</p>";
echo "</td>";
$zipfilesize=fileSizeForDisplay($filename);
displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
echo "</tr>";
}
}
......
releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
+ 65
− 59
View file @ 7e568c78
......@@ -570,23 +570,23 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
echo " </tr>";
}
?>
<?php
if ("true" === $prereq_dltk) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
echo "<td>";
<?php
if ("true" === $prereq_dltk) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
echo "<td>";
echo $dltkName . "&nbsp;" . $dltkDescription;
echo $dltkName . "&nbsp;" . $dltkDescription;
echo "</td>";
echo "<td align=\"right\">";
echo "</td>";
echo "<td align=\"right\">";
echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
echo " </tr>";
}
?>
echo " </tr>";
}
?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
......@@ -684,62 +684,68 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
<!-- *********** P2 Zips ************** -->
<?php
$bellwether_name="repos";
if (file_exists($bellwether_name)) {
// if-then-include section
// include this whole section if (and only if) the bellwether file exists.
// For example, it may not exist on builds for "old" streams.
?>
<table border=0 cellspacing=2 cellpadding=2 width="100%">
<tr>
<td align=left valign=top colspan="2" bgcolor="#0080C0"><font
face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2 repositories in zipped format files.</font></td>
</tr>
<tr>
<td align="left" valign="top" colspan="5">
<p>These are archive versions of P2 repositories that can be downloaded and installed into a development environment or PDE target. Its is recommended to install, rather than to to unzip the traditional packages, since
it is more informative of missing prerequites or conflicting dependencies.</p>
</td>
</tr>
<tr>
<td>
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
<?php
$shortname="@shortname@";
$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname , "Minimal", "Executable code");
$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname." sdk" , "SDK", "Executable code and source");
$zipfilename=$bellwether_name."/".$shortname."_tests-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname." tests", "Tests", "Unit tests");
?>
</table>
</tr>
</table>
<?php } ?>
<?php
$bellwether_name="repos";
if (file_exists($bellwether_name)) {
// if-then-include section
// include this whole section if (and only if) the bellwether file exists.
// For example, it may not exist on builds for "old" streams.
?>
<table border=0 cellspacing=2 cellpadding=2 width="100%">
<tr>
<td align=left valign=top colspan="2" bgcolor="#0080C0"><font
face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
repositories in zipped format files.</font></td>
</tr>
<tr>
<td align="left" valign="top" colspan="5">
<p>These are archive versions of P2 repositories that can be
downloaded and installed into a development environment or PDE target.
Its is recommended to install, rather than to to unzip the traditional
packages, since it is more informative of missing prerequites or
conflicting dependencies.</p>
</td>
</tr>
<tr>
<td>
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
<?php
$shortname="@shortname@";
$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname , "Minimal", "Executable code");
$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname." sdk" , "SDK", "Executable code and source");
$zipfilename=$bellwether_name."/".$shortname."_tests-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname." tests", "Tests", "Unit tests");
?>
</table>
</tr>
</table>
<?php } ?>
<!-- *********** Traditional Zips ************** -->
<table border=0 cellspacing=2 cellpadding=2 width="100%">
<tr>
<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Traditional Zip Files</font></td>
face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Traditional
Zip Files</font></td>
</tr>
<tr>
<td align="left" valign="top" colspan="5">
<p>@longdescription@ Note: These traditional zip files should be considered deprecated, in favor of using the archived P2 repositories.
<p>@longdescription@ Note: These traditional zip files should be
considered deprecated, in favor of using the archived P2 repositories.
The tradtional zip files will one day disappear.</p>
</td>
</tr>
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+ 5
− 1
View file @ 7e568c78
......@@ -236,7 +236,11 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
<jvmarg
value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
+ 8
− 4
View file @ 7e568c78
......@@ -14,21 +14,25 @@
<style
type="text/css"> body { font:normal 68%
verdana,arial,helvetica; color:#000000; } table tr
td, table tr th { font-size: 68%; } table.details tr
td, table tr th { font-size: 68%;
} table.details tr
th{ font-weight: bold; text-align:left;
background:#a6caf0; } table.details tr td{
background:#eeeee0; } p { line-height:1.5em;
margin-top:0.5em; margin-bottom:1.0em; } h1 {
margin: 0px 0px 5px; font: 165%
margin: 0px 0px 5px;
font: 165%
verdana,arial,helvetica } h2 { margin-top: 1em;
margin-bottom: 0.5em; font: bold 125%
verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
font: bold 115% verdana,arial,helvetica } h4 {
margin-bottom: 0.5em; font: bold 100%
verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
font: bold 100% verdana,arial,helvetica } h6 {
font: bold 100%
verdana,arial,helvetica } h6 {
margin-bottom: 0.5em; font: bold 100%
verdana,arial,helvetica } .Error { font-weight:bold;
verdana,arial,helvetica } .Error {
font-weight:bold;
color:red; } .Failure { font-weight:bold;
color:purple; } .Properties { text-align:right; } </style>
<script
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
+ 3
− 3
View file @ 7e568c78
......@@ -49,9 +49,9 @@
value=""/>
<!-- TODO: The framework apps might need this. But we should elmimnate if posslbe. -->
<property
name="eclipse-home"
value="${testRoot}/eclipse"/>
<property
name="eclipse-home"
value="${testRoot}/eclipse"/>
<!--
The directory that will contain the xml and html results from
the tests that are run
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+ 1
− 1
View file @ 7e568c78
......@@ -194,7 +194,7 @@
<jvmarg
value="-Xmx256m"/>
<jvmarg
value="-Xverify"/>
value="-Xverify"/>
<jvmarg
value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+ 2
− 2
View file @ 7e568c78
......@@ -108,8 +108,8 @@
target="prereq.jst"/>
<antcall
target="prereq.wtp"/>
<antcall
target="prereq.dltk"/>
<antcall
target="prereq.dltk"/>
<antcall
target="getAndInstallBase">
<param
......
releng.wtpbuilder/components/common-sdk/customTargets.xml
+ 96
− 65
View file @ 7e568c78
......@@ -9,60 +9,64 @@
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" />
<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" />
<property
file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
<!-- let this project specify properties, if not already set -->
<property file="build.properties" />
<property
file="build.properties"/>
<fail
unless="buildDirectory"
message="buildDirectory must be set" />
<echo message="buildDirectory: ${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">
<target
name="allElements">
<echo
level="info"
message="Target:${target} " />
message="Target:${target} "/>
<echo
level="debug"
message="basedir: ${basedir}" />
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}" />
message="component: ${component}"/>
<echo
level="debug"
message="buildDirectory: ${buildDirectory}" />
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
message="baseLocation: ${baseLocation}" />
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
message="generic target: ${genericTargets}" />
<echo
message="compilerArg: ${compilerArg}" />
<echo
message="individualSourceBundles: ${individualSourceBundles}" />
message="generic target: ${genericTargets}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature" />
value="feature"/>
<property
name="id"
value="org.eclipse.wst.common_sdk.feature" />
value="org.eclipse.wst.common_sdk.feature"/>
</ant>
</target>
......@@ -73,35 +77,38 @@
Add one target for each root element and each configuration
-->
<target name="assemble.org.eclipse.wst.common_sdk.feature">
<target
name="assemble.org.eclipse.wst.common_sdk.feature">
<property
name="archiveName"
value="wtp-common-sdk-${buildLabel}.zip" />
value="wtp-common-sdk-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
dir="${buildDirectory}"/>
</target>
<target name="prePackage" />
<target
name="prePackage"/>
<target name="postPackage">
<target
name="postPackage">
<property
name="archiveName"
value="wtp-common-sdk-${buildLabel}.zip" />
value="wtp-common-sdk-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
<property
name="buildDirectory"
value="${buildDirectory}" />
value="${buildDirectory}"/>
<property
name="buildLabel"
value="${buildLabel}" />
value="${buildLabel}"/>
<property
name="archiveName"
value="${archiveName}" />
value="${archiveName}"/>
</ant>
</target>
......@@ -109,13 +116,14 @@
<!--
Check out map files from repository
-->
<target name="getMapFiles">
<target
name="getMapFiles">
<!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps" />
target="fetchAllMaps"/>
</target>
......@@ -123,57 +131,64 @@
<!--
Steps to do before setup
-->
<target name="preSetup"></target>
<target
name="preSetup"></target>
<!--
Steps to do after setup but before starting the build proper
-->
<target name="postSetup">
<target
name="postSetup">
<dirname
file="${ant.file}"
property="component.dir" />
property="component.dir"/>
<echo
level="debug"
message="ant.file: ${ant.file}" />
message="ant.file: ${ant.file}"/>
<echo
level="debug"
message="component.dir: ${component.dir}" />
message="component.dir: ${component.dir}"/>
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<property
name="base.install.dir"
value="${buildRoot}" />
value="${buildRoot}"/>
</ant>
</target>
<!--
Steps to do before fetching the build elements
-->
<target name="preFetch"></target>
<target
name="preFetch"></target>
<!-- ===================================================================== -->
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
<target name="postFetch"></target>
<target
name="postFetch"></target>
<!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate"></target>
<target
name="preGenerate"></target>
<!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<echo message="buildDirectory: ${buildDirectory}" />
<target
name="postGenerate">
<echo
message="buildDirectory: ${buildDirectory}"/>
<customizeAccessRules
bundleDirectory="${buildDirectory}/plugins"
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
</target>
......@@ -181,50 +196,61 @@
<!--
Steps to do before running the build.xmls for the elements being built.
-->
<target name="preProcess">
<target
name="preProcess">
<replace
dir="${buildDirectory}/plugins"
value="${timestamp}"
token="@build@">
<include name="**/about.mappings" />
<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}" />
<target
name="postProcess">
<condition
property="logsAvailable">
<istrue
value="${javacVerbose}"/>
</condition>
<antcall target="gatherLogs" />
<antcall
target="gatherLogs"/>
</target>
<!--
Steps to do before running assemble.
-->
<target name="preAssemble"></target>
<target
name="preAssemble"></target>
<!--
Steps to do after running assemble.
-->
<target name="postAssemble"></target>
<target
name="postAssemble"></target>
<!--
Steps to do after the build is done.
-->
<target name="postBuild"></target>
<target
name="postBuild"></target>
<!--
Steps to do to test the build results
-->
<target name="test"></target>
-->
<target
name="test"></target>
<!--
Steps to do to publish the build results
-->
<target name="publish"></target>
<target
name="publish"></target>
<!--
Helper targets
......@@ -232,24 +258,27 @@
<target
name="gatherLogs"
if="logsAvailable">
<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
<mkdir
dir="${buildDirectory}/${buildLabel}/compilelogs"/>
<echo
level="debug"
message="logExtension: ${logExtension}" />
<antcall target="allElements">
message="logExtension: ${logExtension}"/>
<antcall
target="allElements">
<param
name="target"
value="gatherLogs" />
value="gatherLogs"/>
<param
name="logExtension"
value="${logExtension}" />
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.wst.common_sdk.feature">
<include name="**/*.log.zip" />
<include
name="**/*.log.zip"/>
</fileset>
</unzip>
......@@ -259,20 +288,22 @@
<target
name="clean"
unless="noclean">
<antcall target="allElements">
<antcall
target="allElements">
<param
name="target"
value="cleanElement" />
value="cleanElement"/>
</antcall>
</target>
<!--
Default target
-->
<target name="noDefault">
<target
name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file" />
message="You must specify a target when invoking this file"/>
</target>
</project>
releng.wtpbuilder/components/common-sdk/dependency.xml
+ 38
− 28
View file @ 7e568c78
......@@ -12,86 +12,96 @@
name="test"
default="get">
<target name="get">
<target
name="get">
<mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
<antcall target="getAndInstall">
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
<antcall
target="getAndInstall">
<param
name="groupId"
value="orbitthirdpartymap" />
value="orbitthirdpartymap"/>
<param
name="base.install.dir"
value="${buildDirectory}/maps/${env.RELENG}/maps/" />
value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
</antcall>
<property
name="pde.builder.path"
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" />
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
<echo
level="info"
message="pde.builder.path: ${pde.builder.path}" />
message="pde.builder.path: ${pde.builder.path}"/>
<echo
level="info"
message="eclipse.builder.version: ${eclipse.builder.version}" />
message="eclipse.builder.version: ${eclipse.builder.version}"/>
<echo
level="info"
message="eclipse.builder: ${eclipse.builder}" />
message="eclipse.builder: ${eclipse.builder}"/>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="emf" />
value="emf"/>
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="emfxsd" />
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef" />
value="emfxsd"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse" />
value="eclipse"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipseTestFramework" />
value="eclipseTestFramework"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="dita" />
value="dita"/>
</antcall>
</target>
<target name="getAndInstall">
<target
name="getAndInstall">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
<property
name="groupId"
value="${groupId}" />
value="${groupId}"/>
</ant>
<ant
antfile="${dependencyTargets}"
target="installDependency">
<property
name="groupId"
value="${groupId}" />
value="${groupId}"/>
<property
name="install.destination"
value="${base.install.dir}" />
value="${base.install.dir}"/>
</ant>
</target>
......
releng.wtpbuilder/components/common.tests/customTargets.xml
+ 96
− 65
View file @ 7e568c78
......@@ -9,60 +9,64 @@
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" />
<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" />
<property
file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
<!-- let this project specify properties, if not already set -->
<property file="build.properties" />
<property
file="build.properties"/>
<fail
unless="buildDirectory"
message="buildDirectory must be set" />
<echo message="buildDirectory: ${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">
<target
name="allElements">
<echo
level="info"
message="Target:${target} " />
message="Target:${target} "/>
<echo
level="debug"
message="basedir: ${basedir}" />
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}" />
message="component: ${component}"/>
<echo
level="debug"
message="buildDirectory: ${buildDirectory}" />
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
message="baseLocation: ${baseLocation}" />
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
message="generic target: ${genericTargets}" />
<echo
message="compilerArg: ${compilerArg}" />
<echo
message="individualSourceBundles: ${individualSourceBundles}" />
message="generic target: ${genericTargets}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature" />
value="feature"/>
<property
name="id"
value="org.eclipse.wst.common.tests" />
value="org.eclipse.wst.common.tests"/>
</ant>
</target>
......@@ -73,37 +77,40 @@
Add one target for each root element and each configuration
-->
<target name="assemble.org.eclipse.wst.common.tests">
<target
name="assemble.org.eclipse.wst.common.tests">
<property
name="archiveName"
value="wtp-common-Automated-Tests-${buildLabel}.zip" />
value="wtp-common-Automated-Tests-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
dir="${buildDirectory}"/>
</target>
<target name="prePackage" />
<target
name="prePackage"/>
<target name="postPackage">
<target
name="postPackage">
<property
name="archiveName"
value="wtp-common-Automated-Tests-${buildLabel}.zip" />
value="wtp-common-Automated-Tests-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
<property
name="buildDirectory"
value="${buildDirectory}" />
value="${buildDirectory}"/>
<property
name="buildLabel"
value="${buildLabel}" />
value="${buildLabel}"/>
<property
name="archiveName"
value="${archiveName}" />
value="${archiveName}"/>
</ant>
</target>
......@@ -111,13 +118,14 @@
<!--
Check out map files from repository
-->
<target name="getMapFiles">
<target
name="getMapFiles">
<!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps" />
target="fetchAllMaps"/>
</target>
......@@ -125,31 +133,33 @@
<!--
Steps to do before setup
-->
<target name="preSetup"></target>
<target
name="preSetup"></target>
<!--
Steps to do after setup but before starting the build proper
-->
<target name="postSetup">
<target
name="postSetup">
<dirname
file="${ant.file}"
property="component.dir" />
property="component.dir"/>
<echo
level="debug"
message="ant.file: ${ant.file}" />
message="ant.file: ${ant.file}"/>
<echo
level="debug"
message="component.dir: ${component.dir}" />
message="component.dir: ${component.dir}"/>
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<property
name="base.install.dir"
value="${buildRoot}" />
value="${buildRoot}"/>
</ant>
</target>
......@@ -157,26 +167,31 @@
<!--
Steps to do before fetching the build elements
-->
<target name="preFetch"></target>
<target
name="preFetch"></target>
<!-- ===================================================================== -->
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
<target name="postFetch"></target>
<target
name="postFetch"></target>
<!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate"></target>
<target
name="preGenerate"></target>
<!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<echo message="buildDirectory: ${buildDirectory}" />
<target
name="postGenerate">
<echo
message="buildDirectory: ${buildDirectory}"/>
<customizeAccessRules
bundleDirectory="${buildDirectory}/plugins"
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
</target>
......@@ -184,50 +199,61 @@
<!--
Steps to do before running the build.xmls for the elements being built.
-->
<target name="preProcess">
<target
name="preProcess">
<replace
dir="${buildDirectory}/plugins"
value="${timestamp}"
token="@build@">
<include name="**/about.mappings" />
<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}" />
<target
name="postProcess">
<condition
property="logsAvailable">
<istrue
value="${javacVerbose}"/>
</condition>
<antcall target="gatherLogs" />
<antcall
target="gatherLogs"/>
</target>
<!--
Steps to do before running assemble.
-->
<target name="preAssemble"></target>
<target
name="preAssemble"></target>
<!--
Steps to do after running assemble.
-->
<target name="postAssemble"></target>
<target
name="postAssemble"></target>
<!--
Steps to do after the build is done.
-->
<target name="postBuild"></target>
<target
name="postBuild"></target>
<!--
Steps to do to test the build results
-->
<target name="test"></target>
-->
<target
name="test"></target>
<!--
Steps to do to publish the build results
-->
<target name="publish"></target>
<target
name="publish"></target>
<!--
Helper targets
......@@ -235,24 +261,27 @@
<target
name="gatherLogs"
if="logsAvailable">
<mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
<mkdir
dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
<echo
level="debug"
message="logExtension: ${logExtension}" />
<antcall target="allElements">
message="logExtension: ${logExtension}"/>
<antcall
target="allElements">
<param
name="target"
value="gatherLogs" />
value="gatherLogs"/>
<param
name="logExtension"
value="${logExtension}" />
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/testcompilelogs"
overwrite="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.wst.common.tests">
<include name="**/*.log.zip" />
<include
name="**/*.log.zip"/>
</fileset>
</unzip>
......@@ -263,20 +292,22 @@
<target
name="clean"
unless="noclean">
<antcall target="allElements">
<antcall
target="allElements">
<param
name="target"
value="cleanElement" />
value="cleanElement"/>
</antcall>
</target>
<!--
Default target
-->
<target name="noDefault">
<target
name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file" />
message="You must specify a target when invoking this file"/>
</target>
</project>
releng.wtpbuilder/components/common.tests/dependency.xml
+ 34
− 24
View file @ 7e568c78
......@@ -12,70 +12,80 @@
name="test"
default="get">
<target name="get">
<target
name="get">
<mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
<antcall target="getAndInstall">
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
<antcall
target="getAndInstall">
<param
name="groupId"
value="orbitthirdpartymap" />
value="orbitthirdpartymap"/>
<param
name="base.install.dir"
value="${buildDirectory}/maps/${env.RELENG}/maps/" />
value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="emf" />
value="emf"/>
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="emfxsd" />
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef" />
value="emfxsd"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="dtp" />
value="dtp"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse" />
value="eclipse"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipseTestFramework" />
value="eclipseTestFramework"/>
</antcall>
</target>
<target name="getAndInstall">
<target
name="getAndInstall">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
<property
name="groupId"
value="${groupId}" />
value="${groupId}"/>
</ant>
<ant
antfile="${dependencyTargets}"
target="installDependency">
<property
name="groupId"
value="${groupId}" />
value="${groupId}"/>
<property
name="install.destination"
value="${base.install.dir}" />
value="${base.install.dir}"/>
</ant>
</target>
......
releng.wtpbuilder/components/common/customTargets.xml
+ 97
− 66
View file @ 7e568c78
......@@ -9,60 +9,64 @@
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" />
<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" />
<property
file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
<!-- let this project specify properties, if not already set -->
<property file="build.properties" />
<property
file="build.properties"/>
<fail
unless="buildDirectory"
message="buildDirectory must be set" />
<echo message="buildDirectory: ${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">
<target
name="allElements">
<echo
level="info"
message="Target:${target} " />
message="Target:${target} "/>
<echo
level="debug"
message="basedir: ${basedir}" />
message="basedir: ${basedir}"/>
<echo
level="info"
message="component: ${component}" />
message="component: ${component}"/>
<echo
level="debug"
message="buildDirectory: ${buildDirectory}" />
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
message="baseLocation: ${baseLocation}" />
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
message="generic target: ${genericTargets}" />
<echo
message="compilerArg: ${compilerArg}" />
<echo
message="individualSourceBundles: ${individualSourceBundles}" />
message="generic target: ${genericTargets}"/>
<echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature" />
value="feature"/>
<property
name="id"
value="org.eclipse.wst.common_ui.feature" />
value="org.eclipse.wst.common_ui.feature"/>
</ant>
</target>
......@@ -73,36 +77,39 @@
Add one target for each root element and each configuration
-->
<target name="assemble.org.eclipse.wst.common_ui.feature">
<target
name="assemble.org.eclipse.wst.common_ui.feature">
<property
name="archiveName"
value="wtp-common-${buildLabel}.zip" />
value="wtp-common-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
dir="${buildDirectory}"/>
</target>
<target name="prePackage" />
<target
name="prePackage"/>
<target name="postPackage">
<target
name="postPackage">
<property
name="archiveName"
value="wtp-common-${buildLabel}.zip" />
value="wtp-common-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
<property
name="buildDirectory"
value="${buildDirectory}" />
value="${buildDirectory}"/>
<property
name="buildLabel"
value="${buildLabel}" />
value="${buildLabel}"/>
<property
name="archiveName"
value="${archiveName}" />
value="${archiveName}"/>
</ant>
</target>
......@@ -110,13 +117,14 @@
<!--
Check out map files from repository
-->
<target name="getMapFiles">
<target
name="getMapFiles">
<!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps" />
target="fetchAllMaps"/>
</target>
......@@ -124,57 +132,64 @@
<!--
Steps to do before setup
-->
<target name="preSetup"></target>
<target
name="preSetup"></target>
<!--
Steps to do after setup but before starting the build proper
-->
<target name="postSetup">
<target
name="postSetup">
<dirname
file="${ant.file}"
property="component.dir" />
property="component.dir"/>
<echo
level="debug"
message="ant.file: ${ant.file}" />
message="ant.file: ${ant.file}"/>
<echo
level="debug"
message="component.dir: ${component.dir}" />
message="component.dir: ${component.dir}"/>
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<property
name="base.install.dir"
value="${buildRoot}" />
value="${buildRoot}"/>
</ant>
</target>
<!--
Steps to do before fetching the build elements
-->
<target name="preFetch"></target>
<target
name="preFetch"></target>
<!--
Steps to do after fetching the build elements
-->
<target name="postFetch"></target>
<target
name="postFetch"></target>
<!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate"></target>
<target
name="preGenerate"></target>
<!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<echo message="buildDirectory: ${buildDirectory}" />
<target
name="postGenerate">
<echo
message="buildDirectory: ${buildDirectory}"/>
<customizeAccessRules
bundleDirectory="${buildDirectory}/plugins"
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
</target>
......@@ -182,50 +197,61 @@
<!--
Steps to do before running the build.xmls for the elements being built.
-->
<target name="preProcess">
<target
name="preProcess">
<replace
dir="${buildDirectory}/plugins"
value="${timestamp}"
token="@build@">
<include name="**/about.mappings" />
<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}" />
<target
name="postProcess">
<condition
property="logsAvailable">
<istrue
value="${javacVerbose}"/>
</condition>
<antcall target="gatherLogs" />
<antcall
target="gatherLogs"/>
</target>
<!--
Steps to do before running assemble.
-->
<target name="preAssemble"></target>
<target
name="preAssemble"></target>
<!--
Steps to do after running assemble.
-->
<target name="postAssemble"></target>
<target
name="postAssemble"></target>
<!--
Steps to do after the build is done.
-->
<target name="postBuild"></target>
<target
name="postBuild"></target>
<!--
Steps to do to test the build results
-->
<target name="test"></target>
-->
<target
name="test"></target>
<!--
Steps to do to publish the build results
-->
<target name="publish"></target>
<target
name="publish"></target>
<!--
Helper targets
......@@ -233,24 +259,27 @@
<target
name="gatherLogs"
if="logsAvailable">
<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
<mkdir
dir="${buildDirectory}/${buildLabel}/compilelogs"/>
<echo
level="debug"
message="logExtension: ${logExtension}" />
<antcall target="allElements">
message="logExtension: ${logExtension}"/>
<antcall
target="allElements">
<param
name="target"
value="gatherLogs" />
value="gatherLogs"/>
<param
name="logExtension"
value="${logExtension}" />
value="${logExtension}"/>
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
<fileset
dir="${buildDirectory}/features/org.eclipse.wst.common_ui.feature">
<include name="**/*.log.zip" />
<include
name="**/*.log.zip"/>
</fileset>
</unzip>
......@@ -259,20 +288,22 @@
<target
name="clean"
unless="noclean">
<antcall target="allElements">
<antcall
target="allElements">
<param
name="target"
value="cleanElement" />
value="cleanElement"/>
</antcall>
</target>
<!--
Default target
-->
<target name="noDefault">
<target
name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file" />
message="You must specify a target when invoking this file"/>
</target>
</project>
releng.wtpbuilder/components/common/dependency.xml
+ 38
− 28
View file @ 7e568c78
......@@ -12,86 +12,96 @@
name="test"
default="get">
<target name="get">
<target
name="get">
<mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
<antcall target="getAndInstall">
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
<antcall
target="getAndInstall">
<param
name="groupId"
value="orbitthirdpartymap" />
value="orbitthirdpartymap"/>
<param
name="base.install.dir"
value="${buildDirectory}/maps/${env.RELENG}/maps/" />
value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
</antcall>
<property
name="pde.builder.path"
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" />
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
<echo
level="info"
message="pde.builder.path: ${pde.builder.path}" />
message="pde.builder.path: ${pde.builder.path}"/>
<echo
level="info"
message="eclipse.builder.version: ${eclipse.builder.version}" />
message="eclipse.builder.version: ${eclipse.builder.version}"/>
<echo
level="info"
message="eclipse.builder: ${eclipse.builder}" />
message="eclipse.builder: ${eclipse.builder}"/>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="emf" />
value="emf"/>
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="emfxsd" />
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef" />
value="emfxsd"/>
</antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse" />
value="eclipse"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipseTestFramework" />
value="eclipseTestFramework"/>
</antcall>
<antcall target="getAndInstall">
<antcall
target="getAndInstall">
<param
name="groupId"
value="dita" />
value="dita"/>
</antcall>
</target>
<target name="getAndInstall">
<target
name="getAndInstall">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
<property
name="groupId"
value="${groupId}" />
value="${groupId}"/>
</ant>
<ant
antfile="${dependencyTargets}"
target="installDependency">
<property
name="groupId"
value="${groupId}" />
value="${groupId}"/>
<property
name="install.destination"
value="${base.install.dir}" />
value="${base.install.dir}"/>
</ant>
</target>
......
releng.wtpbuilder/components/dali-sdk/category.xml
+ 4
− 4
View file @ 7e568c78
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature
id="org.eclipse.jpt_sdk.feature">
<category
name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
</feature>
<feature
id="org.eclipse.jpt.eclipselink_sdk.feature">
id="org.eclipse.jpt.eclipselink_sdk.feature">
<category
name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
</feature>
<feature
id="org.eclipse.jpt.feature">
id="org.eclipse.jpt.feature">
<category
name="Web Tools Platform (WTP) @buildversionid@"/>
</feature>
<feature
id="org.eclipse.jpt.eclipselink.feature">
id="org.eclipse.jpt.eclipselink.feature">
<category
name="Web Tools Platform (WTP) @buildversionid@"/>
</feature>
......
releng.wtpbuilder/components/dali-sdk/customTargets.xml
+ 24
− 22
View file @ 7e568c78
......@@ -49,12 +49,12 @@
<property
name="p2.category.definition.file"
value="${wtp.builder.home}/components/${component}/category.xml"/>
<property
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
<echo
message="p2.build.repo: ${p2.build.repo}"/>
<echo
......@@ -140,9 +140,9 @@
<!-- Get the dependencies -->
<antcall
target="getDependencies"/>
<antcall
target="updateCategoriesFiles" />
<antcall
target="updateCategoriesFiles"/>
</target>
<!--
=====================================================================
......@@ -366,22 +366,24 @@
may want to use buildLabel, which is of form I-3.3.0-20100912032913
-->
<target
name="updateCategoriesFiles"
depends="checkCategoriesFiles"
if="categoryFileExists">
<replace
file="${p2.category.definition.file}"
value="${buildId}"
token="@buildversionid@">
</replace>
</target>
<target
name="checkCategoriesFiles">
<available file="${p2.category.definition.file}" property="categoryFileExists" />
</target>
<target
name="updateCategoriesFiles"
depends="checkCategoriesFiles"
if="categoryFileExists">
<replace
file="${p2.category.definition.file}"
value="${buildId}"
token="@buildversionid@">
</replace>
</target>
<target
name="checkCategoriesFiles">
<available
file="${p2.category.definition.file}"
property="categoryFileExists"/>
</target>
<!--
......
releng.wtpbuilder/components/dali.tests/category.xml
+ 1
− 1
View file @ 7e568c78
......@@ -2,7 +2,7 @@
<site>
<feature
id="org.eclipse.jpt.tests">
id="org.eclipse.jpt.tests.feature">
<category
name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
</feature>
......
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