diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index cebf3a29e6df88226bc7335b2a10689cddfe8ab8..45261042188bf4fd6c636080108ecbf9cf75eb78 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -7,7 +7,7 @@
buildLabel: <buildType>-<buildName>-<timestamp>
-->
<property name="result"
- value="${buildDirectory}/${buildLabel}" />
+ value="${buildDirectory}/${buildLabel}" />
<!--name of generated index page-->
<property name="indexFileName" value="index.php" />
@@ -21,7 +21,7 @@
<target name="generateIndex">
<property name="class"
- value="org.eclipse.releng.generators.TestResultsGenerator" />
+ value="org.eclipse.releng.generators.TestResultsGenerator" />
<taskdef name="indexResults" classname="${class}" />
<!--
@@ -41,18 +41,33 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <!-- create table of test plugin compiles first -->
<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" />
+ dropTokenList="${dropTokenList}"
+ xmlDirectoryName=""
+ dropDirectoryName="${result}"
+ testResultsTemplateFileName="${basedir}/templateFiles/testCompileResults.php.template"
+ dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}"
+ testResultsHtmlFileName="testCompileResults.php"
+ dropHtmlFileName="${indexFileName}"
+ hrefTestResultsTargetPath=""
+ hrefCompileLogsTargetPath="testcompilelogs"
+ compileLogsDirectoryName="${result}/testcompilelogs"
+ testManifestFileName="${basedir}/testManifest.xml" />
+
+ <!-- create table of code plugins compiles and test results second -->
+ <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}"
@@ -69,7 +84,7 @@
<tstamp>
<format property="TODAY"
- pattern="MMMM d, yyyy" />
+ pattern="MMMM d, yyyy" />
</tstamp>
<!-- Insert Build Type descriptor -->
@@ -77,49 +92,49 @@
<!-- Insert Build Date -->
<replace file="${result}/${indexFileName}"
- token="@date@"
- value="${TODAY}" />
+ token="@date@"
+ value="${TODAY}" />
<!-- Insert Build Name -->
<replace file="${result}/${indexFileName}"
- token="@build@"
- value="${buildLabel}" />
+ token="@build@"
+ value="${buildLabel}" />
<!-- Insert Mirror Name -->
<replace file="${result}/${indexFileName}"
- token="@mirror@"
- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
+ token="@mirror@"
+ value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
<!-- Insert PreRequsites -->
<replace file="${result}/${indexFileName}"
- token="@eclipseFile@"
- value="${eclipse.file.linux-gtk-x86}" />
+ token="@eclipseFile@"
+ value="${eclipse.file.linux-gtk-x86}" />
<replace file="${result}/${indexFileName}"
- token="@eclipseURL@"
- value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+ token="@eclipseURL@"
+ value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
<replace file="${result}/${indexFileName}"
- token="@eclipseBuildURL@"
- value="${eclipse.url}" />
+ token="@eclipseBuildURL@"
+ value="${eclipse.url}" />
<replace file="${result}/${indexFileName}"
- token="@emfFile@"
- value="${emf.file}" />
+ token="@emfFile@"
+ value="${emf.file}" />
<replace file="${result}/${indexFileName}"
- token="@emfURL@"
- value="${emf.url}" />
+ token="@emfURL@"
+ value="${emf.url}" />
<replace file="${result}/${indexFileName}"
- token="@gefFile@"
- value="${gef.file}" />
+ token="@gefFile@"
+ value="${gef.file}" />
<replace file="${result}/${indexFileName}"
- token="@gefURL@"
- value="${gef.url}/${gef.file}" />
+ token="@gefURL@"
+ value="${gef.url}/${gef.file}" />
<replace file="${result}/${indexFileName}"
- token="@jemFile@"
- value="${jem.file}" />
+ token="@jemFile@"
+ value="${jem.file}" />
<replace file="${result}/${indexFileName}"
- token="@jemURL@"
- value="${jem.url}/${jem.file}" />
-<!--
+ 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
@@ -133,7 +148,7 @@
<mkdir dir="${result}/whatisfixed" />
<echo file="${result}/whatisfixed/buglog.html"
- append="true">
+ append="true">
what is fixed list is not available yet!
</echo>
@@ -152,7 +167,7 @@
<mkdir dir="${result}/buildnotes" />
<copy todir="${result}/buildnotes" flatten="true">
<fileset dir="${buildDirectory}/plugins"
- includes="**/buildnotes_*.html" />
+ includes="**/buildnotes_*.html" />
</copy>
</target>
@@ -168,68 +183,68 @@
</delete>
<taskdef name="countFiles"
- classname="org.eclipse.releng.generators.FileCounter" />
+ classname="org.eclipse.releng.generators.FileCounter" />
<countFiles sourceDirectory="${result}"
- filterString=".zip,.tar.gz"
- outputFile="${result}/files.count" />
+ filterString=".zip,.tar.gz"
+ outputFile="${result}/files.count" />
</target>
<!--Build type descriptors-->
<target name="I">
<replace file="${result}/${indexFileName}"
- token="%wtpandprereqs%"
- value=" " />
+ token="%wtpandprereqs%"
+ value=" " />
<replace file="${result}/${indexFileName}"
- token="@type@"
- value="Integration" />
+ token="@type@"
+ value="Integration" />
</target>
<target name="S">
<replace file="${result}/${indexFileName}"
- token="%wtpandprereqs%"
- value=" " />
+ token="%wtpandprereqs%"
+ value=" " />
<replace file="${result}/${indexFileName}"
- token="@type@"
- value="Stable" />
+ token="@type@"
+ value="Stable" />
</target>
<target name="N">
<replace file="${result}/${indexFileName}"
- token="%wtpandprereqs%"
- value=" " />
+ token="%wtpandprereqs%"
+ value=" " />
<replace file="${result}/${indexFileName}"
- token="@type@"
- value="Nightly" />
+ token="@type@"
+ value="Nightly" />
</target>
<target name="M">
<replace file="${result}/${indexFileName}"
- token="%wtpandprereqs%"
- value=" " />
+ token="%wtpandprereqs%"
+ value=" " />
<replace file="${result}/${indexFileName}"
- token="@type@"
- value="Maintenance" />
+ token="@type@"
+ value="Maintenance" />
</target>
<target name="R">
<replace file="${result}/${indexFileName}"
- token="%wtpandprereqs%"
- value=" " />
+ token="%wtpandprereqs%"
+ value=" " />
<replace file="${result}/${indexFileName}"
- token="@type@"
- value="Release" />
+ token="@type@"
+ value="Release" />
</target>
<target name="T">
<replace file="${result}/${indexFileName}"
- token="%wtpandprereqs%"
- value=" " />
+ token="%wtpandprereqs%"
+ value=" " />
<replace file="${result}/${indexFileName}"
- token="@type@"
- value="Test" />
+ token="@type@"
+ value="Test" />
</target>
</project>
\ No newline at end of file