diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
index 86cd222e9414e199ef28b87ee68f67d51fd1014b..d069f94945f2bcd0db316fc907989b3c2f71c293 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
@@ -28,15 +28,16 @@ $hasNotes = false;
$aDirectory = dir("buildnotes");
while ($anEntry = $aDirectory->read()) {
if ($anEntry != "." && $anEntry != "..") {
- $parts = explode("_", $anEntry);
- $baseName = $parts[1];
- $parts = explode(".", $baseName);
- $component = $parts[0];
+ $nameprefixlen=strlen("buildnotes_");
+ $baseName = substr($anEntry,$nameprefixlen);
+ $extpos=strrpos($baseName,".html");
+ $component=substr($baseName,0,$extpos);
$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
echo "<tr>";
echo "$line";
echo "</tr>";
$hasNotes = true;
+
}
}
$aDirectory.closedir();
diff --git a/releng.wtpbuilder/distribution/patches32x.site/publish.xml b/releng.wtpbuilder/distribution/patches32x.site/publish.xml
index 653275d6ab4674cace02fd0122dc1e1e34428147..26921723c1c8fc3b3576c942d23eff12055b8c96 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/publish.xml
@@ -241,7 +241,7 @@
dropTokenList="${dropTokenList}"
dropDirectoryName="${resultDir}"
xmlDirectoryName="${resultDir}/testResults/xml"
- testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template.php"
testResultsHtmlFileName="testResults.php"
hrefTestResultsTargetPath="testResults/html"
compileLogsDirectoryName=""/>
@@ -295,44 +295,7 @@
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
</target>
- <target
- name="repository">
-
- <!-- get our authored, tokenized site.xml file -->
- <copy
- file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
- tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
- overwrite="true"
- failonerror="true"/>
- <!--
- get the ${buildDirectory}/finalPluginsVersions.properties,
- and read as properties
- -->
- <!-- substitute property value for tokens -->
- <replace
- file="${buildDirectory}/${buildLabel}/repository/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">
<!--
@@ -472,7 +435,7 @@
token="@date@"
value="${TODAY}"/>
- <!-- Insert Build Name -->
+ <!-- Insert Build Name and related information -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -483,8 +446,58 @@
includes="**/*.php,*.xml"
token="@buildBranch@"
value="${buildBranch}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@build_distribution@"
+ value="${build.distribution}"/>
<!-- Insert PreRequsites -->
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformFile@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformURL@"
+ value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformBuildURL@"
+ value="${eclipseplatform.url}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformfilelinux@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformfilewindows@"
+ value="${eclipseplatform.file.win32-win32-x86}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformfilemacos@"
+ value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatformBuildHome@"
+ value="${eclipseplatform.build.home}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatform.mirror.prefixuri@"
+ value="${eclipseplatform.mirror.prefixuri}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@eclipseplatform.fspath.prefix@"
+ value="${eclipseplatform.fspath.prefix}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -540,26 +553,53 @@
includes="**/*.php,*.xml"
token="@testFile@"
value="${eclipseTestFramework.file}"/>
+
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfFile@"
- value="${emf.file}"/>
+ token="@e4File@"
+ value="${e4.file.linux-gtk-x86}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfURL@"
- value="${emf.url}/${emf.file}"/>
+ token="@e4URL@"
+ value="${e4.url}/${eclipse.file.linux-gtk-x86}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfBuildHome@"
- value="${emf.build.home}"/>
+ token="@e4BuildURL@"
+ value="${e4.url}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emf.mirror.prefixuri@"
- value="${emf.mirror.prefixuri}"/>
+ token="@e4filelinux@"
+ value="${e4.file.linux-gtk-x86}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@e4filewindows@"
+ value="${e4.file.win32-win32-x86}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@e4filemacos@"
+ value="${e4.file.macosx-carbon-ppc}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@e4BuildHome@"
+ value="${e4.build.home}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@e4.mirror.prefixuri@"
+ value="${e4.mirror.prefixuri}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@e4.fspath.prefix@"
+ value="${e4.fspath.prefix}"/>
+
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -573,73 +613,73 @@
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfsourceFile@"
- value="${emfsourcedoc.file}"/>
+ token="@emfFile@"
+ value="${emf.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfsourceURL@"
- value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+ token="@emfURL@"
+ value="${emf.url}/${emf.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfsourceBuildHome@"
- value="${emfsourcedoc.build.home}"/>
+ token="@emfBuildHome@"
+ value="${emf.build.home}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfsource.mirror.prefixuri@"
- value="${emfsourcedoc.mirror.prefixuri}"/>
+ token="@emf.mirror.prefixuri@"
+ value="${emf.mirror.prefixuri}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfsourceName@"
- value="${emfsourcedoc.name}"/>
+ token="@emfsourceURL@"
+ value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfsourceDescription@"
- value="${emfsourcedoc.description}"/>
+ token="@emfsourceFile@"
+ value="${emfsourcedoc.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdFile@"
- value="${emfxsd.file}"/>
+ token="@emfsourceName@"
+ value="${emfsourcedoc.name}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdURL@"
- value="${emfxsd.url}/${emfxsd.file}"/>
+ token="@emfsourceDescription@"
+ value="${emfsourcedoc.description}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdBuildHome@"
- value="${emfxsd.build.home}"/>
+ token="@emfsourceBuildHome@"
+ value="${emfsourcedoc.build.home}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsd.mirror.prefixuri@"
- value="${emfxsd.mirror.prefixuri}"/>
+ token="@emfsource.mirror.prefixuri@"
+ value="${emfsourcedoc.mirror.prefixuri}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdName@"
- value="${emfxsd.name}"/>
+ token="@emfxsdsourceURL@"
+ value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdDescription@"
- value="${emfxsd.description}"/>
+ token="@emfxsdsourceFile@"
+ value="${emfxsdsourcedoc.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdsourceFile@"
- value="${emfxsdsourcedoc.file}"/>
+ token="@emfxsdsourceName@"
+ value="${emfxsdsourcedoc.name}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdsourceURL@"
- value="${emfxsdsourcedoc.url}/${emfxsdsourcedoc.file}"/>
+ token="@emfxsdsourceDescription@"
+ value="${emfxsdsourcedoc.description}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -653,13 +693,33 @@
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdsourceName@"
- value="${emfxsdsourcedoc.name}"/>
+ token="@emfxsdFile@"
+ value="${emfxsd.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@emfxsdsourceDescription@"
- value="${emfxsdsourcedoc.description}"/>
+ token="@emfxsdName@"
+ value="${emfxsd.name}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@emfxsdDescription@"
+ value="${emfxsd.description}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@emfxsdURL@"
+ value="${emfxsd.url}/${emfxsd.file}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@emfxsdBuildHome@"
+ value="${emfxsd.build.home}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@emfxsd.mirror.prefixuri@"
+ value="${emfxsd.mirror.prefixuri}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -720,6 +780,16 @@
includes="**/*.php,*.xml"
token="@emfvalidationsourceDescription@"
value="${emfvalidationsourcedoc.description}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wstName@"
+ value="${wst.name}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wstDescription@"
+ value="${wst.description}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -740,6 +810,66 @@
includes="**/*.php,*.xml"
token="@wst.mirror.prefixuri@"
value="${wst.mirror.prefixuri}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@jstName@"
+ value="${jst.name}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@jstDescription@"
+ value="${jst.description}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@jstFile@"
+ value="${jst.file}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@jstURL@"
+ value="${jst.url}/${jst.file}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@jstBuildHome@"
+ value="${jst.build.home}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@jst.mirror.prefixuri@"
+ value="${jst.mirror.prefixuri}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wtpName@"
+ value="${wtp.name}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wtpDescription@"
+ value="${wtp.description}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wtpFile@"
+ value="${wtp.file}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wtpURL@"
+ value="${wtp.url}/${wtp.file}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wtpBuildHome@"
+ value="${wtp.build.home}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@wtp.mirror.prefixuri@"
+ value="${wtp.mirror.prefixuri}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -760,6 +890,16 @@
includes="**/*.php,*.xml"
token="@gef.mirror.prefixuri@"
value="${gef.mirror.prefixuri}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@gefName@"
+ value="${gef.name}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@gefDescription@"
+ value="${gef.description}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -813,11 +953,6 @@
includes="**/*.php,*.xml"
token="@jem.mirror.prefixuri@"
value="${jem.mirror.prefixuri}"/>
- <!--
- these token/s should not exist in maintenance stream, but do
- no harm done, so in the interests of keeping builder streams
- in sync, we'll leave them here as place hold
- -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
@@ -838,40 +973,45 @@
includes="**/*.php,*.xml"
token="@dtp.mirror.prefixuri@"
value="${dtp.mirror.prefixuri}"/>
-
- <!--
- WTP prereq for patch builds
- -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@wtpName@"
- value="${wtp.name}"/>
+ token="@dtpName@"
+ value="${dtp.name}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@wtpDescription@"
- value="${wtp.description}"/>
+ token="@dtpDescription@"
+ value="${dtp.description}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@wtpFile@"
- value="${wtp.file}"/>
+ token="@dltkFile@"
+ value="${dltk.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@wtpURL@"
- value="${wtp.url}/${wtp.file}"/>
+ token="@dltkURL@"
+ value="${dltk.url}/${dltk.file}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@wtpBuildHome@"
- value="${wtp.build.home}"/>
+ token="@dltkBuildHome@"
+ value="${dltk.build.home}"/>
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
- token="@wtp.mirror.prefixuri@"
- value="${wtp.mirror.prefixuri}"/>
-
+ token="@dltk.mirror.prefixuri@"
+ value="${dltk.mirror.prefixuri}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@dltkName@"
+ value="${dltk.name}"/>
+ <replace
+ dir="${resultDir}"
+ includes="**/*.php,*.xml"
+ token="@dltkDescription@"
+ value="${dltk.description}"/>
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/miscUtil.php
index 731dc19ecda23151aa114597069e4ffaac5f3098..3c57a680672cabc6531329ee8203fb9678ede3e9 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/miscUtil.php
@@ -82,7 +82,7 @@ function displayFileLineWithSHA($downloadprefix, $filename, $zipfilesize, $fileS
function displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription) {
echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
- echo "<a href=\"$downloadprefix$subdir$filename\">" . $fileShortDescription . "</a>";
+ echo "<a href=\"" . $downloadprefix . $subdir . "/" . $filename . "\">" . $fileShortDescription . "</a>";
echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
echo $zipfilesize;
echo "</td>";
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
index 137e7b4e95d646fa813e209df5baac50237ca4f6..d4df222826b154fd50d93690fab6add7a58198c8 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
@@ -7,6 +7,7 @@
include_once("miscUtil.php");
+$build_distribution="@build_distribution@";
$buildBranch="@buildBranch@";
$build="@build@";
@@ -27,6 +28,20 @@ $eclipseBuildHome="@eclipseBuildHome@";
$eclipseName="@eclipseName@";
$eclipseDescription="@eclipseDescription@";
+
+
+$e4filelinux="@e4filelinux@";
+$e4filewindows="@e4filewindows@";
+$e4filemacosx="@e4filemacos@";
+
+$e4URL="@e4URL@";
+$e4File="@4File@";
+$e4BuildURL="@e4BuildURL@";
+$e4BuildHome="@e4BuildHome@";
+$e4Name="@e4Name@";
+$e4Description="@e4Description@";
+
+
$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
@@ -122,16 +137,16 @@ $orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-$prereq_eclipse="@prereq.eclipse@";
+$prereq_eclipse="true";
$prereq_eclipseplatform="@prereq.eclipseplatform@";
-$prereq_emf="@prereq.emf@";
-$prereq_emfxsd="@prereq.emfxsd@";
+$prereq_emf="true";
+$prereq_emfxsd="true";
$prereq_emfvalidation="@prereq.emfvalidation@";
-$prereq_gef="@prereq.gef@";
-$prereq_dtp="@prereq.dtp@";
+$prereq_gef="true";
+$prereq_dtp="true";
$prereq_wst="@prereq.wst@";
$prereq_jst="@prereq.jst@";
-$prereq_wtp="@prereq.wtp@";
+$prereq_wtp="true";
$prereq_dltk="@prereq.dltk@";
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php
index a268be658a039bfce5524216f3404ec317456305..4de1c1ca21b873c37fa78644bad9d9595b0b077e 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php
@@ -51,7 +51,7 @@ while ($anEntry = $dir->read())
{
echo "<table>";
-
+
if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
{
@@ -75,7 +75,7 @@ while ($anEntry = $dir->read())
$zipfilesize=fileSizeForDisplay($filename);
$fileShortDescription=$zipfilename;
displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
-
+
echo "</tr>\n";
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
index 744460b90757a354bd16de618a96b139402e7763..d0963d0ce8ecc684f34900677fa90b9a2edd338a 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
@@ -73,7 +73,7 @@ if (phpversion() >= 5) {
}
-$incubating="@incubating@";
+$incubating="false";
@@ -91,6 +91,7 @@ else {
<body>
+
<?php if ("true" === $incubating) {
echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
echo " <tr>";
@@ -176,112 +177,266 @@ else {
<tr>
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <tr valign="top">
- <td width="10%"></td>
- <td width="55%">Eclipse Platform (Platform, JDT)</td>
- <?php
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipsefilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipsefilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipsefilemacosx;
- }
- ?>
- <td align="right" width="35%"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
- <tr valign="top">
- <td width="10%"></td>
- <td><?php echo "$emfName $emfDescription" ?></td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
- <tr valign="top">
- <td width="10%"></td>
- <td><?php echo "$emfxsdName $emfxsdDescription" ?></td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
+
+
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- <?php
- if (isset($emfvalidationFile) && ($emfvalidationFile != "")) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>$emfvalidationName $emfvalidationDescription</td>";
- echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
- echo "</tr>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_eclipse) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
+
+
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipsefilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipsefilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipsefilemacosx;
}
- ?>
- <tr valign="top">
- <td width="10%"></td>
- <td>Graphical Editing Framework (GEF)</td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $emfName . " " . $emfDescription ;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+ echo " </tr>";
+ }
+ ?>
- <tr valign="top">
- <td width="10%"></td>
- <td>Data Tools Platform (DTP) (required only for EJB or JPT
- development)</td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $emfxsdName . " " . $emfxsdDescription ;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_emfvalidation) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $emfvalidationName . " " . $emfvalidationDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_gef) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $gefName . " " . $gefDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_dtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $dtpName . " " . $dtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_dltk) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $dltkName . " " . $dltkDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
- <td colspan="3">
+ <td width="10%"></td>
+ <td colspan="2">
<hr />
</td>
</tr>
- <tr valign="top">
- <td width="10%"></td>
- <td><?php echo "$emfsourceName $emfsourceDescription" ?></td>
- <td align="right"><?php
+
+
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
-
- <tr valign="top">
- <td width="10%"></td>
- <td><?php echo "$emfxsdsourceName $emfxsdsourceDescription" ?></td>
- <td align="right"><?php
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+ echo "</tr>";
+ }
+ ?>
<?php
- if (isset($emfvalidationsourceFile) && ($emfvalidationsourceFile != "")) {
+ if ("true" === $prereq_emfvalidation) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
- echo "<td>$emfvalidationsourceName $emfvalidationsourceDescription</td>";
+ echo "<td>";
+ echo $emfvalidationsourceName . " " . $emfvalidationsourceDescription;
+ echo "</td> ";
echo "<td align=\"right\">";
echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
@@ -289,16 +444,21 @@ else {
}
?>
+ <?php
+ if (true) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo "Eclipse Test Framework (required only for Automated JUnit tests)";
+ echo "</td> ";
+ echo "<td align=\"right\">";
- <tr valign="top">
- <td width="10%"></td>
- <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
- <td align="right"><?php
echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+ echo "</tr>";
+ }
+ ?>
+
<tr valign="top">
<td width="10%"></td>
@@ -322,118 +482,160 @@ else {
?>
</tr>
- <tr valign="middle">
- <td colspan="3">
- <hr />
- </td>
- </tr>
- <tr valign="top">
- <td width="10%"></td>
- <td><?php echo "$wtpName $wtpDescription" ?></td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+
</table>
</td>
</tr>
</table>
-<!-- *********** WTP Patchs ************** -->
+<!-- *********** 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="5" bgcolor="#0080C0"><font
- face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
- Platform Patches</font></td>
+ <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>The Zip files contain patches</p>
+ <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>
- <?php
+ <tr>
+ <td>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+
+ <?php
+
+ $shortname="jsdt";
+ $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");
- $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>
+
+ </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>
+ </tr>
+
+ <tr>
+ <td align="left" valign="top" colspan="5"><?php
+ $zipbellwether_name="${build_distribution}-sdk-${build}.zip";
+ if (file_exists($zipbellwether_name)) {
+ // if-then-include section
+ // include this whole section if (and only if) the bellwether file exists.
+ // For example, may not have been created yet
+ ?>
+
+ <p>The Zip files includes the features and plugins for the JavaScript
+ Development Tools (JSDT).</p>
+ <p>Note: These traditional zip files should be considered deprecated,
+ in favor of installing the archived P2 repositories. The tradtional
+ zip files may eventually no longer be provided.</p>
+ <?php } else { ?>
+ <p>The traditonal zip files have not been produced yet (or, perhaps,
+ the build failed or was cancelled). Check back in few minutes.</p>
+ <?php } ?></td>
+ </tr>
<tr>
<td>
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+ <?php
+ $zipfilename="${build_distribution}-${build}";
+ $filename=$zipfilename.".zip";
+ if (file_exists($filename)) {
+ ?>
<tr>
+ <td align="left" valign="top" width="10%"><b>Minimal</b></td>
+ <td align="left" valign="top">
+ <p>Executable code only.</p>
+ </td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription="$shortname";
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
+ </tr>
+ <?php } ?>
+
<?php
-
- $zipfilename="wtp-patches32x-buildrepo-@build@";
- $shortname="buildrepo-@build@";
+ $zipfilename="${build_distribution}-sdk-${build}";
$filename=$zipfilename.".zip";
-
- $fileShortDescription="zipped p2 repository";
- displayp2repoarchives($zipfilename, $bellwether_name, $downloadprefix, $shortname, "Patch", $fileShortDescription);
-
- ?>
- </tr>
- <!--
- <tr>
- <td align="left" valign="top" width="20%"><b>Patched Tests, zipped repository</b></td>
- <td align="left" valign="top">
- Some unit tests may be added or adjusted for patches.
- </td>
- <?php
-// $zipfilename="wtp-patches32x-tests-buildrepo-@build@";
-// $filename=$zipfilename.".zip";
-// $zipfilesize=fileSizeForDisplay($filename);
-// $fileShortDescription="@build@";
-// displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
- ?>
- </tr>
- -->
- <tr valign="middle">
- <td colspan="3">
- <hr />
+ if (file_exists($filename)) {
+ ?>
+ <tr>
+ <td align="left" valign="top" width="10%"><b>SDK</b></td>
+ <td align="left" valign="top">
+ <p>Executable code and source code.</p>
</td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription="$shortname sdk";
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
</tr>
+ <?php } ?>
+
+ <?php
+ $zipfilename="${build_distribution}-tests-${build}";
+ $filename=$zipfilename.".zip";
+ if (file_exists($filename)) {
+ ?>
<tr>
- <td align="left" valign="top" width="20%"><b>Patch</b></td>
- <td align="left" valign="top">Traditional zip format</td>
+ <td align="left" valign="top" width="10%"><b>Unit Tests</b></td>
+ <td align="left" valign="top">
+ <p>The automated test zip contains unit tests.</p>
+ </td>
<?php
- $zipfilename="wtp-patches32x-@build@";
- $filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
- $fileShortDescription="@build@";
+ $fileShortDescription="$shortname tests";
displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
?>
</tr>
- <!--
- <tr>
- <td align="left" valign="top" width="20%"><b>Patched Tests</b></td>
- <td align="left" valign="top">
- Traditional zip format
- </td>
- <?php
-// $zipfilename="wtp-patches32x-tests-@build@";
-// $filename=$zipfilename.".zip";
-// $zipfilesize=fileSizeForDisplay($filename);
-// $fileShortDescription="@build@";
-// displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
- ?>
- </tr>
- -->
+ <?php } ?>
</table>
</td>
+
+
+ <tr>
+
+</table>
- </tr>
- <?php } ?>
-</table>
@@ -449,10 +651,18 @@ else {
<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
<tr>
- <td><a href="buildNotes.php">Build notes</a> <br />
- <a href="directory.txt">map files</a> <br />
+ <td><!--
+ Its silly to always display 'Build notes', but hard to
+ compute if required or not.
+ <a href="buildNotes.php">Build notes</a> <br />
+ --> <a href="directory.txt">map files</a> <br />
<?php
+ if (file_exists("components")) {
+ echo "<a href=\"components/components.php\">Misc Components</a> <br />\n";
+ }
+
+
if ($displayTestSummary) {
@@ -470,6 +680,13 @@ else {
// <img src=\"pending.gif\"/>";
}
+ $installLogName="p2DirectorInstall.log.txt";
+ if (file_exists($installLogName)) {
+ echo "<br /> <a href=\"" . $installLogName . "\">Log file from failed test installation attempt</a>";
+ }
+
+ echo "<br />";
+
echo "<br />";
echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
@@ -487,6 +704,13 @@ else {
echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font> ";
echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font> ";
echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font> ";
+
+ $logname="antBuilderOutput.log";
+ if (file_exists($logname)) {
+ echo "<br /> <a href=\"".$logname."\" type=\"text/plain\">Full Log</a> from build ". fileSizeForDisplay($logname);
+ }
+
+
}
?> <br />
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed816c20c3ea15fa03f4f03b5a4a3ec1875a0..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description> The update site contains the enabling features. </description>
- <category-def
- name="Enabling Features"
- label="Enabling Features">
- <description> This category contains features used by several
- projects that enable some functionality, but which by
- themselves are not very interesting. </description>
- </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f5feda254b508e4e4d33d2a89637782533..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
- pack200="true"
- mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&format=xml"
- digestURL="http://download.eclipse.org/webtools/testUpdates/">
- <description
- url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
- Tools Project (WTP) </description>
- <feature
- url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
- id="org.eclipse.wst"
- version="@org.eclipse.wst@">
- <category
- name="Web Tools Platform (WTP)"/>
- </feature>
- <feature
- url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
- id="org.eclipse.wst.sdk"
- version="@org.eclipse.wst.sdk@">
- <category
- name="Web Tools Platform (WTP)"/>
- </feature>
- <feature
- url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
- id="org.eclipse.jst"
- version="@org.eclipse.jst@">
- <category
- name="Web Tools Platform (WTP)"/>
- </feature>
- <feature
- url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
- id="org.eclipse.jst.sdk"
- version="@org.eclipse.jst.sdk@">
- <category
- name="Web Tools Platform (WTP)"/>
- </feature>
- <feature
- url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
- id="org.eclipse.jpt.feature"
- version="@org.eclipse.jpt.feature@">
- <category
- name="Web Tools Platform (WTP)"/>
- </feature>
- <feature
- url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
- id="org.eclipse.jpt_sdk.feature"
- version="@org.eclipse.jpt_sdk.feature@">
- <category
- name="Web Tools Platform (WTP)"/>
- </feature>
- <category-def
- name="Web Tools Platform (WTP)"
- label="Web Tools Platform (WTP)">
- <description> This category contains the features of the Eclipse
- Web Tools Project (WTP). </description>
- </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template
deleted file mode 100644
index 1d6c89805e00bc420b1e561213b0e35cb85024e8..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,144 +0,0 @@
-<html>
-<head>
-
-<?php
- //ini_set("display_errors", "true");
- //error_reporting (E_ALL);
-
- $parts = explode("/", getcwd());
- $parts2 = explode("-", $parts[count($parts) - 1]);
- $buildName = $parts2[1];
-
- echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Extra results and logs </font></b></td>
- </tr>
- </table>
-
- <?php
- if (file_exists("testResults"))
- {
- $dir = dir("testResults");
- while ($anEntry = $dir->read())
- {
- if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-
- {
- if (is_dir($anEntry)) {
- $link = "testResults/".$anEntry."/results/index.php";
- echo "<p><a href=\"$link\">$anEntry</a></p> \n";
- }
- else {
- // assume is file
- $path_parts = pathinfo($anEntry);
- $file_extension = $path_parts['extension'];
- if (isset($path_parts['filename'])) {
- $linkname = $path_parts['filename'];
- }
- else {
- $linkname = $anEntry;
- }
-
- $link = $anEntry;
- if ("html" === $file_extension || "php" === $file_extension) {
- echo "<p><a href=testResults/" . $link . ">" . $linkname . "</a></p> <br />\n";
- }
- }
- }
- }
- }
- ?>
-
-
-
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Unit
- Test Results for <?php echo "$buildName"; ?> </font></b></td>
- </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
- <tr>
- <td class="bold" align="center" width="70%">Test Suite</td>
- <td class="bold" align="center" width="15%">Errors & Failures</td>
- <td class="bold" align="center" width="15%">Total Tests</td>
- <td class="bold" align="center" width="15%">Total Time (s)</td>
- </tr>
-
-
- %testresults%
-
-</table>
-<p></p>
-<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Console output logs
- <?php echo "$buildName"; ?>
- </font></b></td>
- </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template.php
new file mode 100644
index 0000000000000000000000000000000000000000..e84339d025fe64f1ff0705e8f9ff7f891766d55b
--- /dev/null
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template.php
@@ -0,0 +1,145 @@
+<html>
+<head>
+
+<?php
+//ini_set("display_errors", "true");
+//error_reporting (E_ALL);
+
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
+
+echo "<title>Test Results for $buildName </title>";
+?>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<style>
+.bold,.bold TD,.bold TH,.bold TR {
+ font-weight: bold;
+}
+
+.numeric,.numeric TD {
+ text-align: right;
+ padding-right: 2em;
+}
+
+.normaltable,.normaltable TD,.normaltable TH {
+ font-family: Bitstream Vera Sans Mono, monospace;
+ font-size: 0.9em;
+ color: Black;
+ background-color: White;
+}
+
+.errorltable,.errortable TD,.errortable TH {
+ font-family: Bitstream Vera Sans Mono, monospace;
+ font-size: 0.9em;
+ color: Black;
+ background-color: Red;
+ font-weight: Bold;
+}
+
+.warningtable,.warningtable TD,.warningtable TH {
+ font-family: Bitstream Vera Sans Mono, monospace;
+ font-size: 0.9em;
+ color: Black;
+ background-color: khaki;
+}
+
+.extraWarningTable,.extraWarningTable TD,.extraWarningTable TH {
+ font-family: Bitstream Vera Sans Mono, monospace;
+ font-size: 0.9em;
+ color: Black;
+ background-color: Yellow;
+}
+</style>
+
+
+</head>
+<body>
+<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+ color="#FFFFFF" face="Arial,Helvetica"> Extra results and logs </font></b></td>
+ </tr>
+</table>
+
+<?php
+if (file_exists("testResults"))
+{
+ $dir = dir("testResults");
+ while ($anEntry = $dir->read())
+ {
+ if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
+
+ {
+ if (is_dir($anEntry)) {
+ $link = "testResults/".$anEntry."/results/index.php";
+ echo "<p><a href=\"$link\">$anEntry</a></p> \n";
+ }
+ else {
+ // assume is file
+ $path_parts = pathinfo($anEntry);
+ $file_extension = $path_parts['extension'];
+ if (isset($path_parts['filename'])) {
+ $linkname = $path_parts['filename'];
+ }
+ else {
+ $linkname = $anEntry;
+ }
+
+ $link = $anEntry;
+ if ("html" === $file_extension || "php" === $file_extension || "log" === $file_extension || "txt" === $file_extension) {
+ echo "<p><a href=testResults/" . $link . ">" . $linkname . "</a></p>\n";
+ }
+ }
+ }
+ }
+}
+?>
+
+
+
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+ color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$buildName"; ?>
+ </font></b></td>
+ </tr>
+</table>
+
+<table id=tableunittestdata align="center" width="75%" border="1">
+ <tr>
+ <td class="bold" align="center" width="70%">Test Suite</td>
+ <td class="bold" align="center" width="15%">Errors & Failures</td>
+ <td class="bold" align="center" width="15%">Total Tests</td>
+ <td class="bold" align="center" width="15%">Total Time (s)</td>
+ </tr>
+
+
+ %testresults%
+
+</table>
+<p></p>
+<br>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+ color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$buildName"; ?>
+ </font></b></td>
+ </tr>
+</table>
+<br>
+These
+<a href="consoleLogs.php">logs</a>
+contain the console output captured while running the JUnit automated
+tests.
+<br>
+<br>
+
+
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/patches32x.site/transformReportToHTML.xml
deleted file mode 100644
index 1cae20eace843fea9edf747f76f1d8146771aced..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/patches32x.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- name="xsl-conversion"
- default="main"
- basedir=".">
- <target
- name="main"
- description="example.bin.xml to produce example.html">
- <xslt
- destdir="${resultDir}/compilelogs"
- scanincludeddirectories="true"
- style="compilerXMLOutputToHTML.xsl"
- force="true">
- <fileset
- dir="${resultDir}/compilelogs"
- includes="**/*.bin.xml"/>
- <mapper
- type="glob"
- from="*.xml"
- to="*.html"/>
- </xslt>
- </target>
-</project>
\ No newline at end of file