Skip to content
Snippets Groups Projects
Commit 535d681e authored by david_williams's avatar david_williams
Browse files

fixes for improved download page processing

parent fa28a0e4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 497 additions and 600 deletions
releng.wtpbuilder/build.xml
+ 57
− 0
View file @ 535d681e
......@@ -33,8 +33,30 @@
<property name="build.pack-all-in-one" value="${build.pack-all-in-one}" />
<property name="eclipse.builder.fetch" value="${eclipse.builder.fetch}" />
</ant>
<antcall target="package"/>
<!-- todo: all-one's will have to be moved after 'package' now -->
</target>
<target name="package" depends="init">
<!-- post, post packaging, for WTP ... "manually" assemble the desired zips -->
<antcall target="combineArchives">
<param name="corename" value=""/>
</antcall>
<antcall target="combineArchives">
<param name="corename" value="-sdk"/>
</antcall>
<antcall target="combineArchives">
<param name="corename" value="-Automated-Tests"/>
</antcall>
</target>
<target name="site" depends="init" if="site_distro_target_exists">
<ant antfile="${distributionCoreName}.site/build.xml">
......@@ -127,4 +149,39 @@
</target>
<target name="combineArchives">
<property name="archiveName" value="wtp${corename}-${buildLabel}.zip" />
<delete dir="${buildDirectory}/tempforrezipping" failonerror="false"/>
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
<arg line="-o -qq wtp-wst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
<arg line="-o -qq wtp-jst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
<arg line="-o -qq wtp-jsf${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
<arg line="-o -qq wtp-jpa${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
<zip destfile="${buildDirectory}/${buildLabel}/${archiveName}" basedir="${buildDirectory}/tempforrezipping" />
<delete dir="${buildDirectory}/tempforrezipping" failonerror="false"/>
<ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="createChecksums">
<property name="buildDirectory" value="${buildDirectory}" />
<property name="buildLabel" value="${buildLabel}" />
<property name="archiveName" value="${archiveName}" />
</ant>
</target>
</project>
releng.wtpbuilder/components/jst-sdk/customTargets.xml
+ 0
− 34
View file @ 535d681e
......@@ -65,40 +65,6 @@
value="${archiveName}" />
</ant>
<!-- post, post packaging, for WTP -->
<property
name="wtparchiveName"
value="wtp-sdk-${buildLabel}.zip" />
<zip
destfile="${buildDirectory}/${buildLabel}/${wtparchiveName}"
duplicate="preserve">
<zipfileset
src="${buildDirectory}/${buildLabel}/wtp-wst-sdk-${buildLabel}.zip" />
<zipfileset
src="${buildDirectory}/${buildLabel}/wtp-jst-sdk-${buildLabel}.zip" />
</zip>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="createChecksums">
<property
name="buildDirectory"
value="${buildDirectory}" />
<property
name="buildLabel"
value="${buildLabel}" />
<property
name="archiveName"
value="${wtparchiveName}" />
</ant>
</target>
<!-- ===================================================================== -->
......
releng.wtpbuilder/components/jst/customTargets.xml
+ 0
− 29
View file @ 535d681e
......@@ -64,35 +64,6 @@
</ant>
<!-- post, post packaging, for WTP -->
<property
name="wtparchiveName"
value="wtp-${buildLabel}.zip" />
<zip
destfile="${buildDirectory}/${buildLabel}/${wtparchiveName}"
duplicate="preserve">
<zipfileset
src="${buildDirectory}/${buildLabel}/wtp-wst-${buildLabel}.zip" />
<zipfileset
src="${buildDirectory}/${buildLabel}/wtp-jst-${buildLabel}.zip" />
</zip>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="createChecksums">
<property
name="buildDirectory"
value="${buildDirectory}" />
<property
name="buildLabel"
value="${buildLabel}" />
<property
name="archiveName"
value="${wtparchiveName}" />
</ant>
......
releng.wtpbuilder/distribution/dali.site/publish.xml
+ 2
− 1
View file @ 535d681e
......@@ -39,7 +39,8 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template" dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}" testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<tstamp>
<format property="TODAY" pattern="MMMM d, yyyy" />
......
releng.wtpbuilder/distribution/jsf.site/publish.xml
+ 2
− 1
View file @ 535d681e
......@@ -39,7 +39,8 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template" dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}" testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<tstamp>
<format property="TODAY" pattern="MMMM d, yyyy" />
......
releng.wtpbuilder/distribution/patches.site/publish.xml
+ 2
− 1
View file @ 535d681e
......@@ -39,7 +39,8 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template" dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}" testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<tstamp>
<format property="TODAY" pattern="MMMM d, yyyy" />
......
releng.wtpbuilder/distribution/wtp.build/build.xml
+ 70
− 88
View file @ 535d681e
......@@ -2,93 +2,75 @@
<target name="build" depends="getBaseBuilder">
<dirname file="${ant.file}"
property="distribution.wtp.build.dir" />
<property file="${wtp.builder.home}/build.properties" />
<property name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}">
<property name="component" value="wst" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="wst-sdk" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="wst.tests" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jst" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jst-sdk" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jst.tests" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jsf" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jsf-sdk" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jsf.tests" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="dali" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="dali-sdk" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="dali.tests" />
<property name="eclipseBuildFailOnError"
value="false" />
</ant>
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
</target>
<target name="getBaseBuilder"
if="eclipse.builder.fetch">
<dirname file="${ant.file}"
property="wtbuilder.dir" />
<property name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}"
target="getBaseBuilder">
<property name="eclipse.builder.fetch"
value="${eclipse.builder.fetch}" />
</ant>
</target>
<target name="build" depends="getBaseBuilder">
<dirname file="${ant.file}" property="distribution.wtp.build.dir" />
<property file="${wtp.builder.home}/build.properties" />
<property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}">
<property name="component" value="wst" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="wst-sdk" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="wst.tests" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jst" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jst-sdk" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jst.tests" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jsf" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jsf-sdk" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="jsf.tests" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="dali" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="dali-sdk" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${buildTargets}">
<property name="component" value="dali.tests" />
<property name="eclipseBuildFailOnError" value="false" />
</ant>
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
</target>
<target name="getBaseBuilder" if="eclipse.builder.fetch">
<dirname file="${ant.file}" property="wtbuilder.dir" />
<property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}" target="getBaseBuilder">
<property name="eclipse.builder.fetch" value="${eclipse.builder.fetch}" />
</ant>
</target>
</project>
releng.wtpbuilder/distribution/wtp.site/build.xml
+ 4
− 2
View file @ 535d681e
......@@ -56,13 +56,15 @@
<property name="indexFileName" value="index.php" />
<property name="result" value="${buildDirectory}/${buildLabel}" />
<property name="indexTemplateFilename" value="index.html.template" />
<copy file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}" tofile="${buildDirectory}/${indexFileName}" />
<condition property="isBuildTested" value="true">
<available file="${buildDirectory}/${buildLabel}/testResults/html" />
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
<property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpa-runtime%,%jpa-sdk%,%jpa-tests%" />
<property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpa-runtime%,%jpa-sdk%,%jpa-tests%" />
<property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<property name="buildBranch" value="${buildBranch}" />
......
releng.wtpbuilder/distribution/wtp.site/publish.xml
+ 58
− 60
View file @ 535d681e
......@@ -11,17 +11,20 @@
<property name="resultDir"
value="${buildDirectory}/${buildLabel}" />
<echo message="resultDir: ${resultDir}" />
<!--name of generated index page-->
<property name="indexFileName" value="index.php" />
<property name="templateDir" value="${wtp.builder.home}/distribution/wtp.site" />
<property name="resultingIndex" value="${resultDir}/${indexFileName}" />
<echo message="resultDir: ${resultDir}" />
<echo message="templateDir: ${templateDir}" />
<echo message="resultingIndex: ${resultingIndex}" />
<!--name of generated index page-->
<property name="indexFileName" value="index.php" />
<target name="default">
<copy overwrite="true" file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}" tofile="${resultingIndex}" />
<antcall target="countFiles" />
<antcall target="generateCompileIndex" />
<antcall target="generateJUnitTestsIndex" />
......@@ -30,6 +33,7 @@
<target name="generateCompileIndex" >
<!--
<taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
-->
......@@ -58,13 +62,10 @@
xmlDirectoryName=""
dropDirectoryName="${resultDir}"
testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
dropTemplateFileName="${templateDir}/templateFiles/${indexTemplateFilename}"
testResultsHtmlFileName="testCompileResults.php"
dropHtmlFileName="${indexFileName}"
hrefTestResultsTargetPath=""
hrefCompileLogsTargetPath="testcompilelogs"
compileLogsDirectoryName="${resultDir}/testcompilelogs"
testManifestFileName="${templateDir}/testManifest.xml" />
compileLogsDirectoryName="${resultDir}/testcompilelogs" />
<!-- create table of code plugins compiles -->
<summarizeResults isBuildTested="false"
......@@ -73,13 +74,10 @@
xmlDirectoryName=""
dropDirectoryName="${resultDir}"
testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
dropTemplateFileName="${templateDir}/templateFiles/${indexTemplateFilename}"
testResultsHtmlFileName="compileResults.php"
dropHtmlFileName="${indexFileName}"
hrefTestResultsTargetPath="testResults/html"
hrefCompileLogsTargetPath="compilelogs"
compileLogsDirectoryName="${resultDir}/compilelogs"
testManifestFileName="${templateDir}/testManifest.xml" />
compileLogsDirectoryName="${resultDir}/compilelogs" />
......@@ -92,47 +90,50 @@
<antcall target="${buildType}" />
<!-- Insert Build Date -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@date@"
value="${TODAY}" />
<!-- Insert Build Name -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@build@"
value="${buildLabel}" />
<!-- Insert Mirror Name -->
<replace file="${resultDir}/${indexFileName}"
<!--
<replace file="${resultingIndex}"
token="@mirror@"
value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
value="\${downloadprefix}" />
-->
<!-- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" /> -->
<!-- Insert PreRequsites -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@eclipseFile@"
value="${eclipse.file.linux-gtk-x86}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@eclipseURL@"
value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@eclipseBuildURL@"
value="${eclipse.url}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@emfFile@"
value="${emf.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@emfURL@"
value="${emf.url}/${emf.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@gefFile@"
value="${gef.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@gefURL@"
value="${gef.url}/${gef.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@jemFile@"
value="${jem.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@jemURL@"
value="${jem.url}/${jem.file}" />
<!--
......@@ -140,10 +141,10 @@
no harm done, so in the interests of keeping builder
streams in sync, we'll leave them here as place hold
-->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@dtpFile@"
value="${dtp.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@dtpURL@"
value="${dtp.url}/${dtp.file}" />
......@@ -154,7 +155,7 @@
</echo>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
<touch file="${resultDir}/${indexFileName}" />
<touch file="${resultingIndex}" />
</target>
<target name="generateJUnitTestsIndex" depends="checkIfTested" if="doTests">
......@@ -190,12 +191,9 @@
dropDirectoryName="${resultDir}"
xmlDirectoryName="${resultDir}/testResults/xml"
testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
dropTemplateFileName="${templateDir}/templateFiles/${indexTemplateFilename}"
testResultsHtmlFileName="testResults.php"
dropHtmlFileName="${indexFileName}"
hrefTestResultsTargetPath="testResults/html"
compileLogsDirectoryName=""
testManifestFileName="${templateDir}/testManifest.xml" />
compileLogsDirectoryName=""/>
<tstamp>
......@@ -207,47 +205,47 @@
<antcall target="${buildType}" />
<!-- Insert Build Date -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@date@"
value="${TODAY}" />
<!-- Insert Build Name -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@build@"
value="${buildLabel}" />
<!-- Insert Mirror Name -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@mirror@"
value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
<!-- Insert PreRequsites -->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@eclipseFile@"
value="${eclipse.file.linux-gtk-x86}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@eclipseURL@"
value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@eclipseBuildURL@"
value="${eclipse.url}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@emfFile@"
value="${emf.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@emfURL@"
value="${emf.url}/${emf.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@gefFile@"
value="${gef.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@gefURL@"
value="${gef.url}/${gef.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@jemFile@"
value="${jem.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@jemURL@"
value="${jem.url}/${jem.file}" />
<!--
......@@ -255,10 +253,10 @@
no harm done, so in the interests of keeping builder
streams in sync, we'll leave them here as place hold
-->
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@dtpFile@"
value="${dtp.file}" />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@dtpURL@"
value="${dtp.url}/${dtp.file}" />
......@@ -269,7 +267,7 @@
</echo>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
<touch file="${resultDir}/${indexFileName}" />
<touch file="${resultingIndex}" />
</target>
......@@ -348,56 +346,56 @@
<!--Build type descriptors-->
<target name="I">
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@type@"
value="Integration" />
</target>
<target name="S">
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@type@"
value="Stable" />
</target>
<target name="N">
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@type@"
value="Nightly" />
</target>
<target name="M">
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@type@"
value="Maintenance" />
</target>
<target name="R">
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@type@"
value="Release" />
</target>
<target name="T">
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
<replace file="${resultDir}/${indexFileName}"
<replace file="${resultingIndex}"
token="@type@"
value="Test" />
</target>
......
releng.wtpbuilder/distribution/wtp.site/testManifest.xml deleted 100644 → 0
+ 0
− 107
View file @ fa28a0e4
<?xml version="1.0"?>
<topLevel>
<zipTypes>
<zipType name="wtpruntime">
<platform
id="WTPRUN"
name="All"
fileName='&lt;a href="@mirror@wtp-@build@.zip"&gt;wtp-@build@.zip&lt;/a&gt;(&lt;a href="checksum/wtp-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="wtpsdk">
<platform
id="WTPSDK"
name="All"
fileName='&lt;a href="@mirror@wtp-sdk-@build@.zip"&gt;wtp-sdk-@build@.zip&lt;/a&gt;(&lt;a href="checksum/wtp-sdk-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="wst">
<platform
id="WST"
name="All"
fileName='&lt;a href="@mirror@wtp-wst-@build@.zip"&gt;wtp-wst-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-wst-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="wst-sdk">
<platform
id="WST-SDK"
name="All"
fileName='&lt;a href="@mirror@wtp-wst-sdk-@build@.zip"&gt;wtp-wst-sdk@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-wst-sdk-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="wst-tests">
<platform
id="WST-TESTS"
name="All"
fileName='&lt;a href="@mirror@wtp-wst-Automated-Tests-@build@.zip"&gt;wtp-wst-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-wst-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jst-tests">
<platform
id="JST-TESTS"
name="All"
fileName='&lt;a href="@mirror@wtp-jst-Automated-Tests-@build@.zip"&gt;wtp-jst-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jst-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="wst-perf-tests">
<platform
id="WST-PERF-TESTS"
name="All"
fileName='&lt;a href="@mirror@wtp-wst-perf-Tests-@build@.zip"&gt;wtp-wst-perf-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-wst-perf-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jst-perf-tests">
<platform
id="JST-PERF-TESTS"
name="All"
fileName='&lt;a href="@mirror@wtp-jst-perf-Tests-@build@.zip"&gt;wtp-jst-perf-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jst-perf-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jsf-runtime">
<platform
id="JSF-RUNTIME"
name="All"
fileName='&lt;a href="@mirror@wtp-jsf-@build@.zip"&gt;wtp-jsf-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jsf-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jsf-sdk">
<platform
id="JSF-SDK"
name="All"
fileName='&lt;a href="@mirror@wtp-jsf-sdk-@build@.zip"&gt;wtp-jsf-sdk-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jsf-sdk-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jsf-tests">
<platform
id="JSF-TESTS"
name="All"
fileName='&lt;a href="@mirror@wtp-jsf-Automated-Tests-@build@.zip"&gt;wtp-jsf-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jsf-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jpa-runtime">
<platform
id="JPA-RUNTIME"
name="All"
fileName='&lt;a href="@mirror@wtp-jpa-@build@.zip"&gt;wtp-jpa-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jpa-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jpa-sdk">
<platform
id="JPA-SDK"
name="All"
fileName='&lt;a href="@mirror@wtp-jpa-sdk-@build@.zip"&gt;wtp-jpa-sdk-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jpa-sdk-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
<zipType name="jpa-tests">
<platform
id="JPA-TESTS"
name="All"
fileName='&lt;a href="@mirror@wtp-jpa-Automated-Tests-@build@.zip"&gt;wtp-jpa-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jpa-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
</zipTypes>
</topLevel>
releng.wtpbuilder/distribution/wtp.tests/build.xml
+ 1
− 0
View file @ 535d681e
......@@ -211,6 +211,7 @@
error="${testRoot}/results/fullErrorLog.txt"/>
<sysproperty key="build.home" value="${env.BUILD_HOME}" />
<sysproperty key="buildDirectory" value="${buildDirectory}" />
<sysproperty key="buildLabel" value="${buildLabel}" />
<sysproperty key="baseLocation" value="${baseLocation}" />
<sysproperty key="testRoot" value="${testRoot}" />
<sysproperty key="testDir" value="${testRoot}" />
......
releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+ 8
− 8
View file @ 535d681e
......@@ -3,9 +3,9 @@
<echo message="starting Automated Eclipse Testing" />
<echo message="basedir: ${basedir}" />
<echo message="testRoot: ${testRoot}" />
<fail message="testRoot must be set" unless="testRoot" />
<!--properties file containing the some server name properties -->
<property file="${testRoot}/testServer.properties" />
......@@ -152,7 +152,7 @@
<param name="report" value="org.eclipse.jem.tests" />
</antcall>
</target>
<target name="jst-j2ee-core-tests" description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
<antcall target="runtests">
<param name="testPlugin" value="${org.eclipse.jst.j2ee.core.tests}" />
......@@ -288,9 +288,9 @@
<!-- HTML TESTS -->
<target name="wst-html-tests" description="Runs test.xml for
org.eclipse.wst.html.core.tests
org.eclipse.wst.html.ui.tests
org.eclipse.wst.html.tests.encoding">
org.eclipse.wst.html.core.tests
org.eclipse.wst.html.ui.tests
org.eclipse.wst.html.tests.encoding">
<antcall target="runtests">
<param name="testPlugin" value="${org.eclipse.wst.html.core.tests}" />
<param name="report" value="org.eclipse.wst.html.core.tests" />
......@@ -463,9 +463,9 @@
<echo message="Starting jst-server-generic-tests" />
<antcall target="jst-server-generic-tests" />
<echo message="Starting jst-jem-tests"/>
<echo message="Starting jst-jem-tests" />
<antcall target="jst-jem-tests" />
<echo message="Starting jst-j2ee-core-tests" />
<antcall target="jst-j2ee-core-tests" />
......
releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+ 4
− 0
View file @ 535d681e
......@@ -51,6 +51,8 @@
<echo message="plugin-path: ${plugin-path}" />
<echo message="junit-report-output: ${junit-report-output}" />
<echo message="test-output: ${test-output}" />
<echo message="buildDirectory: ${buildDirectory}"/>
<echo message="buildLabel: ${buildLabel}"/>
<echo message="jvm: ${env.JAVA_5_HOME}/bin/java" />
......@@ -118,6 +120,8 @@
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-DbuildLabel=${buildLabel}"/>
<jvmarg value="-DbuildDirectory=${buildDirectory}"/>
<jvmarg value="-Dwtp.autotest.noninteractive=true" />
<jvmarg value="-Dosgi.clean=true" />
......
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