From 8f37c5e0e9a34253f18fd4fdbd5ea8c8eb9c5ab8 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 1 Oct 2007 01:05:18 +0000
Subject: [PATCH] various partial fixes towards improved download page
---
.../distribution/dali.site/publish.xml | 3 -
.../distribution/dali.site/testManifest.xml | 4 +-
.../distribution/patches.site/publish.xml | 14 -
.../distribution/wtp.site/build.xml | 115 ++--
.../distribution/wtp.site/publish.xml | 571 +++++++++---------
.../templateFiles/index.html.template.php | 2 +-
6 files changed, 379 insertions(+), 330 deletions(-)
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index acf5beb32..8ca1c7c39 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -52,9 +52,6 @@
<!-- Insert Build Name -->
<replace file="${result}/${indexFileName}" token="@build@" value="${buildLabel}" />
- <!-- Insert Mirror Name -->
- <replace file="${result}/${indexFileName}" token="@mirror@" value="${daliDownloadURL}/${buildLabel}/" />
-
<!-- Insert PreRequsites -->
<replace file="${result}/${indexFileName}" token="@eclipseFile@" value="${eclipse.file.linux-gtk-x86}" />
diff --git a/releng.wtpbuilder/distribution/dali.site/testManifest.xml b/releng.wtpbuilder/distribution/dali.site/testManifest.xml
index 3448b7a38..ecff6428b 100644
--- a/releng.wtpbuilder/distribution/dali.site/testManifest.xml
+++ b/releng.wtpbuilder/distribution/dali.site/testManifest.xml
@@ -5,7 +5,7 @@
<platform
id="DALI-RUN"
name="All"
- fileName='<a href="@mirror@dali-@build@.zip">dali-@build@.zip</a>(<a href="checksum/dali-@build@.zip.md5">md5</a>) <font size="2"></font>'>
+ fileName='<a href="dali-@build@.zip">dali-@build@.zip</a>(<a href="checksum/dali-@build@.zip.md5">md5</a>) <font size="2"></font>'>
</platform>
</zipType>
@@ -13,7 +13,7 @@
<platform
id="DALI-TESTS"
name="All"
- fileName='<a href="@mirror@dali-Automated-Tests-@build@.zip">dali-Automated-Tests-@build@.zip</a> (<a href="checksum/dali-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
+ fileName='<a href="dali-Automated-Tests-@build@.zip">dali-Automated-Tests-@build@.zip</a> (<a href="checksum/dali-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
</platform>
</zipType>
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
index e2e6e1db2..8cf650c88 100644
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches.site/publish.xml
@@ -142,14 +142,6 @@
token="@build@"
value="${buildLabel}" />
- <!-- Insert Mirror Name -->
- <!--
- <replace file="${resultingIndex}"
- token="@mirror@"
- value="\${downloadprefix}" />
- -->
- <!-- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" /> -->
-
<!-- Insert PreRequsites -->
<replace
@@ -288,12 +280,6 @@
token="@build@"
value="${buildLabel}" />
- <!-- Insert Mirror Name -->
- <replace
- file="${resultingIndex}"
- token="@mirror@"
- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
-
<!-- Insert PreRequsites -->
<replace
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index b34d35783..c904acda7 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -1,4 +1,7 @@
-<project name="Build specific targets and properties" default="build" basedir=".">
+<project
+ name="Build specific targets and properties"
+ default="build"
+ basedir=".">
<!-- 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
@@ -6,26 +9,32 @@
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 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" />
- <!-- load standard properties for production environment -->
- <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
- <!-- = = = end standard properties pattern = = = -->
+ <!-- load standard properties for production environment -->
+ <property
+ file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
- <echo message="ant.file: ${ant.file}"/>
+ <echo message="ant.file: ${ant.file}" />
<target name="build">
- <java jar="${eclipse.launcher}" fork="true" failonerror="true">
+ <java
+ jar="${eclipse.launcher}"
+ fork="true"
+ failonerror="true">
<jvmarg value="-Dosgi.clean=true" />
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildBranch=${buildBranch}" />
- <jvmarg value="-Dbuild.pack-all-in-one=${build.pack-all-in-one}" />
+ <jvmarg
+ value="-Dbuild.pack-all-in-one=${build.pack-all-in-one}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DjavacDebugInfo=on" />
@@ -47,44 +56,78 @@
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish">
- <dirname file="${ant.file}" property="component.dir" />
+ <dirname
+ file="${ant.file}"
+ property="component.dir" />
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${buildDirectory}/label.properties" />
- <property name="publish.xml" value="${component.dir}/publish.xml" />
+ <property
+ name="publish.xml"
+ value="${component.dir}/publish.xml" />
- <property name="indexFileName" value="index.php" />
- <property name="result" value="${buildDirectory}/${buildLabel}" />
- <property name="indexTemplateFilename" value="index.html.template.php" />
-
- <copy file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}" tofile="${buildDirectory}/${indexFileName}" />
-
- <condition property="isBuildTested" value="true">
- <available file="${buildDirectory}/${buildLabel}/testResults/html" />
+ <property
+ name="indexFileName"
+ value="index.php" />
+ <property
+ name="result"
+ value="${buildDirectory}/${buildLabel}" />
+ <property
+ name="indexTemplateFilename"
+ value="index.html.template.php" />
+
+ <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%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
- <property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
+ <ant
+ antfile="${publish.xml}"
+ dir="${component.dir}">
+ <property
+ name="dropTokenList"
+ value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
+ <property
+ name="webtoolsDownloadURL"
+ value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
- <property name="buildBranch" value="${buildBranch}" />
- <property name="build.pack-all-in-one" value="${build.pack-all-in-one}"/>
+ <property
+ name="buildBranch"
+ value="${buildBranch}" />
+ <property
+ name="build.pack-all-in-one"
+ value="${build.pack-all-in-one}" />
- <property name="isBuildTested" value="${isBuildTested}" />
- <property name="indexTemplateFilename" value="${indexTemplateFilename}" />
+ <property
+ name="isBuildTested"
+ value="${isBuildTested}" />
+ <property
+ name="indexTemplateFilename"
+ value="${indexTemplateFilename}" />
</ant>
<!-- Get the build map over for the results to point to. -->
- <copy file="${buildDirectory}/directory.txt" tofile="${result}/directory.txt" />
+ <copy
+ file="${buildDirectory}/directory.txt"
+ tofile="${result}/directory.txt" />
<!-- Copy info for build identification -->
- <copy file="${buildDirectory}/buildmachineinfo.properties" tofile="${result}/buildmachineinfo.properties" />
+ <copy
+ file="${buildDirectory}/buildmachineinfo.properties"
+ tofile="${result}/buildmachineinfo.properties" />
+
+ <!-- final count files -->
+ <countBuildFiles
+ sourceDirectory="${buildDirectory}/${buildLabel}"
+ filterString=".zip,.tar.gz"
+ outputFile="${buildDirectory}/${buildLabel}/files.count" />
- <!-- final count files -->
- <countBuildFiles sourceDirectory="${buildDirectory}/${buildLabel}"
- filterString=".zip,.tar.gz"
- outputFile="${buildDirectory}/${buildLabel}/files.count" />
-
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index 153f6087b..c995868a1 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -1,4 +1,7 @@
-<project name="Publish Build" default="default" basedir=".">
+<project
+ name="Publish Build"
+ default="default"
+ basedir=".">
<!-- Properties that must be passed to this script:
buildDirectory: Path to perform the build in. (A working directory)
@@ -6,36 +9,52 @@
buildId: Build name
buildLabel: <buildType>-<buildName>-<timestamp>
-->
-
+
<property environment="env" />
-
- <property name="resultDir"
- value="${buildDirectory}/${buildLabel}" />
+
+ <property
+ name="resultDir"
+ value="${buildDirectory}/${buildLabel}" />
<!--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 level="debug" message="resultDir: ${resultDir}" />
- <echo level="debug" message="templateDir: ${templateDir}" />
- <echo level="debug" message="resultingIndex: ${resultingIndex}" />
-
+ <property
+ name="indexFileName"
+ value="index.php" />
+
+ <property
+ name="templateDir"
+ value="${wtp.builder.home}/distribution/wtp.site" />
+ <property
+ name="resultingIndex"
+ value="${resultDir}/${indexFileName}" />
+
+ <echo
+ level="debug"
+ message="resultDir: ${resultDir}" />
+ <echo
+ level="debug"
+ message="templateDir: ${templateDir}" />
+ <echo
+ level="debug"
+ message="resultingIndex: ${resultingIndex}" />
+
<target name="default">
- <copy overwrite="true" file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}" tofile="${resultingIndex}" />
+ <copy
+ overwrite="true"
+ file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
+ tofile="${resultingIndex}" />
<antcall target="countFiles" />
<antcall target="generateCompileIndex" />
<antcall target="generateJUnitTestsIndex" />
<antcall target="getStaticFiles" />
</target>
- <target name="generateCompileIndex" >
+ <target name="generateCompileIndex">
-
- <!--
- <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
+
+ <!--
+ <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
-->
<!--
@@ -53,127 +72,78 @@
-->
- <property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <property
+ file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<!-- create tables of test plugin compiles first -->
- <summarizeResults isBuildTested="false"
- includeAll="true"
- dropTokenList="${dropTokenList}"
- xmlDirectoryName=""
- dropDirectoryName="${resultDir}"
- testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
- testResultsHtmlFileName="testCompileResults.php"
- hrefTestResultsTargetPath=""
- hrefCompileLogsTargetPath="testcompilelogs"
- compileLogsDirectoryName="${resultDir}/testcompilelogs" />
-
- <xslt
- basedir="${resultDir}/testcompilelogs"
- destdir="${resultDir}/testcompilelogs"
- includes="**/*.bin.xml"
- scanincludeddirectories="true"
- style="compilerXMLOutputToHTML.xsl"
- force="true" />
-
+ <summarizeResults
+ isBuildTested="false"
+ includeAll="true"
+ dropTokenList="${dropTokenList}"
+ xmlDirectoryName=""
+ dropDirectoryName="${resultDir}"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
+ testResultsHtmlFileName="testCompileResults.php"
+ hrefTestResultsTargetPath=""
+ hrefCompileLogsTargetPath="testcompilelogs"
+ compileLogsDirectoryName="${resultDir}/testcompilelogs" />
+
+ <xslt
+ basedir="${resultDir}/testcompilelogs"
+ destdir="${resultDir}/testcompilelogs"
+ includes="**/*.bin.xml"
+ scanincludeddirectories="true"
+ style="compilerXMLOutputToHTML.xsl"
+ force="true" />
+
<!-- create table of code plugins compiles -->
- <summarizeResults isBuildTested="false"
- includeAll="true"
- dropTokenList="${dropTokenList}"
- xmlDirectoryName=""
- dropDirectoryName="${resultDir}"
- testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
- testResultsHtmlFileName="compileResults.php"
- hrefTestResultsTargetPath="testResults/html"
- hrefCompileLogsTargetPath="compilelogs"
- compileLogsDirectoryName="${resultDir}/compilelogs" />
-
-
- <xslt
- basedir="${resultDir}/compilelogs"
- destdir="${resultDir}/compilelogs"
- includes="**/*.bin.xml"
- scanincludeddirectories="true"
- style="compilerXMLOutputToHTML.xsl"
- force="true" />
+ <summarizeResults
+ isBuildTested="false"
+ includeAll="true"
+ dropTokenList="${dropTokenList}"
+ xmlDirectoryName=""
+ dropDirectoryName="${resultDir}"
+ testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
+ testResultsHtmlFileName="compileResults.php"
+ hrefTestResultsTargetPath="testResults/html"
+ hrefCompileLogsTargetPath="compilelogs"
+ compileLogsDirectoryName="${resultDir}/compilelogs" />
+
+
+ <xslt
+ basedir="${resultDir}/compilelogs"
+ destdir="${resultDir}/compilelogs"
+ includes="**/*.bin.xml"
+ scanincludeddirectories="true"
+ style="compilerXMLOutputToHTML.xsl"
+ force="true" />
<tstamp>
- <format property="TODAY"
- pattern="MMMM d, yyyy" />
+ <format
+ property="TODAY"
+ pattern="MMMM d, yyyy" />
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}" />
- <!-- Insert Build Date -->
- <replace file="${resultingIndex}"
- token="@date@"
- value="${TODAY}" />
-
- <!-- Insert Build Name -->
- <replace file="${resultingIndex}"
- token="@build@"
- value="${buildLabel}" />
-
- <!-- Insert Mirror Name -->
- <!--
- <replace file="${resultingIndex}"
- token="@mirror@"
- value="\${downloadprefix}" />
- -->
- <!-- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" /> -->
-
- <!-- Insert PreRequsites -->
-
- <replace file="${resultingIndex}"
- token="@eclipseFile@"
- value="${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultingIndex}"
- token="@eclipseURL@"
- value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultingIndex}"
- token="@eclipseBuildURL@"
- value="${eclipse.url}" />
- <replace file="${resultingIndex}"
- token="@emfFile@"
- value="${emf.file}" />
- <replace file="${resultingIndex}"
- token="@emfURL@"
- value="${emf.url}/${emf.file}" />
- <replace file="${resultingIndex}"
- token="@gefFile@"
- value="${gef.file}" />
- <replace file="${resultingIndex}"
- token="@gefURL@"
- value="${gef.url}/${gef.file}" />
- <replace file="${resultingIndex}"
- token="@jemFile@"
- value="${jem.file}" />
- <replace file="${resultingIndex}"
- token="@jemURL@"
- value="${jem.url}/${jem.file}" />
- <!--
- these token/s should not exist in maintenance stream, but
- no harm done, so in the interests of keeping builder
- streams in sync, we'll leave them here as place hold
--->
- <replace file="${resultingIndex}"
- token="@dtpFile@"
- value="${dtp.file}" />
- <replace file="${resultingIndex}"
- token="@dtpURL@"
- value="${dtp.url}/${dtp.file}" />
+ <antcall target="writeTarget" />
<mkdir dir="${resultDir}/whatisfixed" />
- <echo file="${resultDir}/whatisfixed/buglog.html"
- append="true">
+ <echo
+ file="${resultDir}/whatisfixed/buglog.html"
+ append="true">
what is fixed list is not available yet!
</echo>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
<touch file="${resultingIndex}" />
</target>
-
- <target name="generateJUnitTestsIndex" depends="checkIfTested" if="doTests">
+
+ <target
+ name="generateJUnitTestsIndex"
+ depends="checkIfTested"
+ if="doTests">
<!--
isBuildTested: true|false should JUnit plugin test results be used to generate index page
@@ -190,92 +160,38 @@
-->
- <property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <property
+ file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
- <summarizeResults isBuildTested="true"
- dropTokenList="${dropTokenList}"
- dropDirectoryName="${resultDir}"
- xmlDirectoryName="${resultDir}/testResults/xml"
- testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
- testResultsHtmlFileName="testResults.php"
- hrefTestResultsTargetPath="testResults/html"
- compileLogsDirectoryName=""/>
-
+ <summarizeResults
+ isBuildTested="true"
+ dropTokenList="${dropTokenList}"
+ dropDirectoryName="${resultDir}"
+ xmlDirectoryName="${resultDir}/testResults/xml"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
+ testResultsHtmlFileName="testResults.php"
+ hrefTestResultsTargetPath="testResults/html"
+ compileLogsDirectoryName="" />
+
<tstamp>
- <format property="TODAY"
- pattern="MMMM d, yyyy" />
+ <format
+ property="TODAY"
+ pattern="MMMM d, yyyy" />
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}" />
- <!-- Insert Build Date -->
- <replace file="${resultingIndex}"
- token="@date@"
- value="${TODAY}" />
-
- <!-- Insert Build Name -->
- <replace file="${resultingIndex}"
- token="@build@"
- value="${buildLabel}" />
-
- <!-- Insert Mirror Name -->
- <replace file="${resultingIndex}"
- token="@mirror@"
- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
-
- <replace file="${resultingIndex}"
- token="@buildBranch@"
- value="${buildBranch}" />
-
- <!-- Insert PreRequsites -->
-
- <replace file="${resultingIndex}"
- token="@eclipseFile@"
- value="${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultingIndex}"
- token="@eclipseURL@"
- value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultingIndex}"
- token="@eclipseBuildURL@"
- value="${eclipse.url}" />
- <replace file="${resultingIndex}"
- token="@emfFile@"
- value="${emf.file}" />
- <replace file="${resultingIndex}"
- token="@emfURL@"
- value="${emf.url}/${emf.file}" />
- <replace file="${resultingIndex}"
- token="@gefFile@"
- value="${gef.file}" />
- <replace file="${resultingIndex}"
- token="@gefURL@"
- value="${gef.url}/${gef.file}" />
- <replace file="${resultingIndex}"
- token="@jemFile@"
- value="${jem.file}" />
- <replace file="${resultingIndex}"
- token="@jemURL@"
- value="${jem.url}/${jem.file}" />
- <!--
- these token/s should not exist in maintenance stream, but
- no harm done, so in the interests of keeping builder
- streams in sync, we'll leave them here as place hold
--->
- <replace file="${resultingIndex}"
- token="@dtpFile@"
- value="${dtp.file}" />
- <replace file="${resultingIndex}"
- token="@dtpURL@"
- value="${dtp.url}/${dtp.file}" />
+ <antcall target="writeTarget" />
<mkdir dir="${resultDir}/whatisfixed" />
- <echo file="${resultDir}/whatisfixed/buglog.html"
- append="true">
+ <echo
+ file="${resultDir}/whatisfixed/buglog.html"
+ append="true">
what is fixed list is not available yet!
</echo>
@@ -292,125 +208,232 @@
<!--copy buildnotes from plugin directories-->
<mkdir dir="${resultDir}/buildnotes" />
- <copy todir="${resultDir}/buildnotes" flatten="true">
- <fileset dir="${buildDirectory}/plugins"
- includes="**/buildnotes_*.html" />
+ <copy
+ todir="${resultDir}/buildnotes"
+ flatten="true">
+ <fileset
+ dir="${buildDirectory}/plugins"
+ includes="**/buildnotes_*.html" />
</copy>
-
-
- <copy file="${templateDir}/staticDropFiles/logIndex.php" tofile="${resultDir}/testResults/consolelogs/full/logIndex.php" />
- <copy file="${templateDir}/staticDropFiles/logIndex.php" tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php" />
- <copy file="${templateDir}/staticDropFiles/logIndex.php" tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
-
-
+
+
+ <copy
+ file="${templateDir}/staticDropFiles/logIndex.php"
+ tofile="${resultDir}/testResults/consolelogs/full/logIndex.php" />
+ <copy
+ file="${templateDir}/staticDropFiles/logIndex.php"
+ tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php" />
+ <copy
+ file="${templateDir}/staticDropFiles/logIndex.php"
+ tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
+
+
</target>
-
+
<target name="updateSite">
-
-
+
+
<!-- get our authored, tokenized site.xml file -->
- <copy file="${wtp.builder.home}/distribution/wtp.site/templateFiles/siteWTP.xml"
- tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml" overwrite="true" failonerror="true"/>
+ <copy
+ file="${wtp.builder.home}/distribution/wtp.site/templateFiles/siteWTP.xml"
+ tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+ overwrite="true"
+ failonerror="true" />
<!-- get the ${buildDirectory}/finalPluginsVersions.properties, and
- read as properties -->
+ read as properties -->
<!-- substitute property value for tokens -->
- <replace file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
- propertyfile="${buildDirectory}/finalFeaturesVersions.properties" >
- <replacefilter token="@org.eclipse.wst@"
- property="org.eclipse.wst" />
- <replacefilter token="@org.eclipse.wst.sdk@"
- property="org.eclipse.wst.sdk" />
- <replacefilter token="@org.eclipse.jst@"
- property="org.eclipse.jst" />
- <replacefilter token="@org.eclipse.jst.sdk@"
- property="org.eclipse.jst.sdk" />
-
- <replacefilter token="@org.eclipse.jpt.feature@"
- property="org.eclipse.jpt.feature" />
- <replacefilter token="@org.eclipse.jpt_sdk.feature@"
- property="org.eclipse.jpt_sdk.feature" />
+ <replace
+ file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+ propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
+ <replacefilter
+ token="@org.eclipse.wst@"
+ property="org.eclipse.wst" />
+ <replacefilter
+ token="@org.eclipse.wst.sdk@"
+ property="org.eclipse.wst.sdk" />
+ <replacefilter
+ token="@org.eclipse.jst@"
+ property="org.eclipse.jst" />
+ <replacefilter
+ token="@org.eclipse.jst.sdk@"
+ property="org.eclipse.jst.sdk" />
+
+ <replacefilter
+ token="@org.eclipse.jpt.feature@"
+ property="org.eclipse.jpt.feature" />
+ <replacefilter
+ token="@org.eclipse.jpt_sdk.feature@"
+ property="org.eclipse.jpt_sdk.feature" />
</replace>
</target>
<target name="countFiles">
<!--
- files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
+ files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
It is required to generate a link to the build on the downloads page.
-->
- <countBuildFiles sourceDirectory="${resultDir}"
- filterString=".zip,.tar.gz"
- outputFile="${resultDir}/files.count" />
+ <countBuildFiles
+ sourceDirectory="${resultDir}"
+ filterString=".zip,.tar.gz"
+ outputFile="${resultDir}/files.count" />
</target>
<!--Build type descriptors-->
<target name="I">
- <replace file="${resultingIndex}"
- token="%wtpandprereqs%"
- value=" " />
- <replace file="${resultingIndex}"
- token="@type@"
- value="Integration" />
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Integration" />
</target>
<target name="S">
- <replace file="${resultingIndex}"
- token="%wtpandprereqs%"
- value=" " />
- <replace file="${resultingIndex}"
- token="@type@"
- value="Stable" />
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Stable" />
</target>
<target name="N">
- <replace file="${resultingIndex}"
- token="%wtpandprereqs%"
- value=" " />
- <replace file="${resultingIndex}"
- token="@type@"
- value="Nightly" />
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Nightly" />
</target>
<target name="M">
- <replace file="${resultingIndex}"
- token="%wtpandprereqs%"
- value=" " />
- <replace file="${resultingIndex}"
- token="@type@"
- value="Maintenance" />
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Maintenance" />
</target>
<target name="R">
- <replace file="${resultingIndex}"
- token="%wtpandprereqs%"
- value=" " />
- <replace file="${resultingIndex}"
- token="@type@"
- value="Release" />
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Release" />
</target>
<target name="T">
- <replace file="${resultingIndex}"
- token="%wtpandprereqs%"
- value=" " />
- <replace file="${resultingIndex}"
- token="@type@"
- value="Test" />
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Test" />
</target>
-
-
+
+
<target name="checkIfTested">
- <echo level="debug" message="isBuildTested: ${isBuildTested}" />
+ <echo
+ level="debug"
+ message="isBuildTested: ${isBuildTested}" />
<condition property="doTests">
- <equals arg1="${isBuildTested}"
- arg2="true"
- trim="true"
- casesensitive="false" />
+ <equals
+ arg1="${isBuildTested}"
+ arg2="true"
+ trim="true"
+ casesensitive="false" />
</condition>
</target>
-
+
+
+ <target name="writeData">
+ <!-- Insert Build Date -->
+ <replace
+ file="${resultingIndex}"
+ token="@date@"
+ value="${TODAY}" />
+
+ <!-- Insert Build Name -->
+ <replace
+ file="${resultingIndex}"
+ token="@build@"
+ value="${buildLabel}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@buildBranch@"
+ value="${buildBranch}" />
+
+ <!-- Insert PreRequsites -->
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseFile@"
+ value="${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseURL@"
+ value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseBuildURL@"
+ value="${eclipse.url}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfFile@"
+ value="${emf.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfURL@"
+ value="${emf.url}/${emf.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefFile@"
+ value="${gef.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefURL@"
+ value="${gef.url}/${gef.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jemFile@"
+ value="${jem.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jemURL@"
+ value="${jem.url}/${jem.file}" />
+ <!--
+ these token/s should not exist in maintenance stream, but
+ no harm done, so in the interests of keeping builder
+ streams in sync, we'll leave them here as place hold
+ -->
+ <replace
+ file="${resultingIndex}"
+ token="@dtpFile@"
+ value="${dtp.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtpURL@"
+ value="${dtp.url}/${dtp.file}" />
+</target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
index a5b62ad16..f45cd10d4 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
@@ -72,7 +72,7 @@ if ($debugScript) {
$keytestMirrorString=$eclipseMirrorScript . "/webtools/downloads/drops/$buildBranch/$build/wtp-sdk-$build.zip";
// well known URL that is mirrored, purely for testing script
-$keytestMirrorString = "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0.1-20070926042742/wtp-sdk-R-2.0.1-20070926042742.zip";
+// $keytestMirrorString = "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0.1-20070926042742/wtp-sdk-R-2.0.1-20070926042742.zip";
//if (strpos($serverName, "eclipse.org") && isMirrored($keytestMirrorString) ) {
--
GitLab