From b5705574a28a338c831c18022d3996fdebcae8b2 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Fri, 13 May 2011 01:45:58 +0000
Subject: [PATCH] prep for WTP 3.2.4 patch builds
---
.../components/wtp-patches32x/category.xml | 104 ---
.../distribution/patches32x.build/build.xml | 78 +--
.../distribution/patches32x.package/build.xml | 2 +-
.../patches32x.package/createFinalRepo.xml | 4 +-
.../staticDropFiles/buildNotes.php | 14 +-
.../staticDropFiles/consoleLogs.php | 14 +-
.../staticDropFiles/logIndex.php | 14 +-
.../templateFiles/buildvariables.php | 203 +-----
.../templateFiles/components.template.php | 54 +-
.../templateFiles/displayPrereqs.php | 612 ++++++++---------
.../templateFiles/headingIntro.php | 4 +
.../templateFiles/index.html.template.php | 621 +++++++++---------
.../testResults.php.template.php | 99 +--
.../patches32x.tests/testScripts/test.xml | 1 -
14 files changed, 741 insertions(+), 1083 deletions(-)
delete mode 100644 releng.wtpbuilder/components/wtp-patches32x/category.xml
diff --git a/releng.wtpbuilder/components/wtp-patches32x/category.xml b/releng.wtpbuilder/components/wtp-patches32x/category.xml
deleted file mode 100644
index 1497efa2b..000000000
--- a/releng.wtpbuilder/components/wtp-patches32x/category.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
- <feature
- id="org.eclipse.wst.common_core.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.wst.common_ui.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.wst.server_core.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.wst.server_ui.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
-
- <feature
- id="org.eclipse.wst.xml_core.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.wst.jsdt.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.wst.web_core.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
-
- <feature
- id="org.eclipse.wst.web_ui.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
-
-
- <feature
- id="org.eclipse.jst.web_core.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.jst.web_ui.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
- <feature
- id="org.eclipse.jst.enterprise_ui.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
-
- <feature
- id="org.eclipse.jpt.feature.patch">
- <category
- name="Web Tools Platform (WTP) Patches @buildversionid@"/>
- </feature>
-
-
- <feature
- id="org.eclipse.wtp.releng.tests.feature.patch">
- <category
- name="Web Tools Platform Tests (WTP Tests) Patches @buildversionid@"/>
- </feature>
-
-
-
-
- <category-def
- name="Web Tools Platform Tests (WTP Tests) Patches @buildversionid@"
- label="Web Tools Platform Tests (WTP Tests) Patches @buildversionid@">
- <description>
- These features provide patches for WTP unit tests.
- </description>
- </category-def>
-
- <category-def
- name="Web Tools Platform (WTP) Patches @buildversionid@"
- label="Web Tools Platform (WTP) Patches @buildversionid@">
- <description>
- These features provide patches for WTP.
- </description>
- </category-def>
- <!--
- <category-def
- name="Web Tools Platform (WTP SDK) Patches @buildversionid@"
- label="Web Tools Platform (WTP SDK) Patches @buildversionid@">
- <description>
- These features provide patches for WTP SDK.
- </description>
- </category-def>
- -->
-</site>
diff --git a/releng.wtpbuilder/distribution/patches32x.build/build.xml b/releng.wtpbuilder/distribution/patches32x.build/build.xml
index 501b18d53..f70dff217 100644
--- a/releng.wtpbuilder/distribution/patches32x.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.build/build.xml
@@ -43,92 +43,36 @@
value="wtp-patches32x"/>
</ant>
- <ant antfile="${buildTargets}">
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
- </ant>
<!--
<ant
antfile="${buildTargets}">
<property
name="component"
- value="wtp-patches32x-tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
+ value="wtp-patches32x-tests"/>
</ant>
-->
- <!-- copy early, if we can ... else site won't be created, if we fail -->
+ <!-- we fail for compilation problems only at end, so everything gets a chance to try
+ and compile -->
+ <ant antfile="${wtp.builder.home}/scripts/build/checkForCompilationProblems.xml"/>
+
+ <!--
+ copy early, before tests, packaging, etc., both for early look, and
+ to make sure we don't lose what we have, if there is a subsequent build failure.
+ -->
<ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
- <antcall target="handleCompilationProblems"/>
-
-
</target>
-
- <target
- name="handleCompilationProblems"
- depends="checkIfCompileProblems"
- if="compilation.problem.found">
-
- <!-- if there is a problem, leave a marker file in download directory, so the webpage can
- describe what happened -->
-
- <echo
- message="Compilation problems were found"
- file="${buildDirectory}/${buildLabel}/compilationProblems.txt"/>
-
- <!-- always force an early copy, before fail, so all results and files get to "downloads" area -->
- <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
- <fail
- if="compilation.problem.found"
- message="The remaining build and tests were canceled since compilation problems were found."/>
- </target>
-
-
- <target name="checkIfCompileProblems">
- <!--
- Not sure how reliable the presence of this 'compilation.problem' file is ...
- I just noticed it in recent PDE builds with compile problems.
- May have to make this "fancier" in future.
- For now, looks only one level down in plugins directory (in build's workdir) for a file with
- the name 'complilation.problem'. We may have a "summary" in xml file format, summarizing logs,
- ... but not sure then created (during site? We'd have to call site first. This way, we'll see if the match :) .
- -->
- <available
- file="compilation.problem"
- type="file"
- property="compilation.problem.found">
- <filepath>
- <dirset dir="${buildDirectory}">
- <include name="plugins/*"/>
- </dirset>
-
- </filepath>
- </available>
- <echo message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
- </target>
-
<!-- invoking runbuild.xml targetting getBaseBuilder -->
<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"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
</target>
diff --git a/releng.wtpbuilder/distribution/patches32x.package/build.xml b/releng.wtpbuilder/distribution/patches32x.package/build.xml
index c9ad7261d..f32f14613 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/build.xml
@@ -8,7 +8,7 @@
<property file="${wtp.builder.home}/build.properties"/>
<property environment="env"/>
- <!-- required to get proper value of branch specific values -->
+ <!-- required to get proper value of branch specific values -->
<property
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
index f4ee61144..0984dc88d 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
@@ -228,9 +228,7 @@
but a) not sure if/how it will work and b) our names are distinct enough now this suffices.
-->
- <iu query="property[@name='org.eclipse.equinox.p2.name' and @value='Web Tools Platform (WTP) ${buildId}']"/>
-
- <iu query="property[@name='org.eclipse.equinox.p2.name' and @value='Web Tools Platform SDK (WTP SDK) ${buildId}']"/>
+ <iu query="property[@name='org.eclipse.equinox.p2.name' and @value='Web Tools Platform (WTP) Patches ${buildId}']"/>
<!--
<iu
diff --git a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/buildNotes.php
index 23b289f6b..3abad9256 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/buildNotes.php
@@ -1,6 +1,8 @@
<html>
<head>
+
+
<?php
$parts = explode("/", getcwd());
$parts2 = explode("-", $parts[count($parts) - 1]);
@@ -15,22 +17,22 @@ echo "<title>Build Notes for $buildName </title>";
<body>
<p>
- <b><font face="Verdana" size="+3">Build Notes</font>
- </b>
+ <b><font face="Verdana" size="+3">Build Notes</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"> Build Notes for <?php echo "$buildName"; ?>
- </font>
- </b>
+ </font> </b>
</td>
</tr>
</table>
<table border="0">
+
+
<?php
$hasNotes = false;
$aDirectory = dir("buildnotes");
@@ -51,8 +53,8 @@ echo "<title>Build Notes for $buildName </title>";
$aDirectory.closedir();
if (!$hasNotes) {
echo "<br>There are no build notes for this build.";
-}
-?>
+ }
+ ?>
</table>
</body>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/consoleLogs.php
index e57cfaac4..548e3c32c 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/consoleLogs.php
@@ -1,6 +1,8 @@
<html>
<head>
+
+
<?php
$parts = explode("/", getcwd());
$parts2 = explode("-", $parts[count($parts) - 1]);
@@ -16,22 +18,22 @@ echo "<title>Test Console Output for $buildName </title>";
<body>
<p>
- <b><font face="Verdana" size="+3">Test Console Output</font>
- </b>
+ <b><font face="Verdana" size="+3">Test Console Output</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">Console output from running
- JUnit plugin tests for <?php echo "$buildName"; ?> </font>
- </b>
+ JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b>
</td>
</tr>
</table>
<table border="0">
+
+
<?php
$rootDir = "testResults/consolelogs";
$hasNotes = false;
@@ -93,8 +95,8 @@ echo "<title>Test Console Output for $buildName </title>";
if (!$hasNotes) {
echo "<br>There are no test logs for this build.";
-}
-?>
+ }
+ ?>
</table>
</body>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/logIndex.php
index 7559c16b1..36ccf2a39 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/staticDropFiles/logIndex.php
@@ -1,6 +1,8 @@
<html>
<head>
+
+
<?php
function endsWith( $str, $sub ) {
@@ -22,22 +24,22 @@ echo "<title>Test Console Output for $buildName </title>";
<body>
<p>
- <b><font face="Verdana" size="+3">Test Console Output</font>
- </b>
+ <b><font face="Verdana" size="+3">Test Console Output</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">Console output from running
- JUnit plugin tests for <?php echo "$buildName"; ?> </font>
- </b>
+ JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b>
</td>
</tr>
</table>
<table border="0">
+
+
<?php
$hasNotes = false;
$aDirectory = dir(".");
@@ -84,8 +86,8 @@ echo "<title>Test Console Output for $buildName </title>";
if (!$hasNotes) {
echo "<br>There are no test logs for this build.";
-}
-?>
+ }
+ ?>
</table>
</body>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
index 3e825b9c9..cf0de9d81 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
@@ -8,184 +8,14 @@
include_once("miscUtil.php");
$incubating="false";
+$displayBuildNotes=false;
$build_distribution="@build_distribution@";
-
-$displayBuildNotes=true;
-
$buildBranch="@buildBranch@";
$build="@build@";
-$type="@type@";
+$buildtype="@buildtype@";
$builddate="@date@";
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$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@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpRepo="@wtpRepo@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$wtptestsURL="@wtptestsURL@";
-$wtptestsFile="@wtptestsFile@";
-$wtptestsRepo="@wtptestsRepo@";
-$wtptestsMirrorPrefixuri="@wtptests.mirror.prefixuri@";
-$wtptestsBuildHome="@wtptestsBuildHome@";
-$wtptestsName="@wtptestsName@";
-$wtptestsDescription="@wtptestsDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefRepo="@gefRepo@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@gefName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-$emfandxsdURL="@emfandxsdURL@";
-$emfandxsdFile="@emfandxsdFile@";
-$emfandxsdRepo="@emfandxsdRepo@";
-$emfandxsdMirrorPrefixuri="@emfandxsd.mirror.prefixuri@";
-$emfandxsdBuildHome="@emfandxsdBuildHome@";
-$emfandxsdName="@emfandxsdName@";
-$emfandxsdDescription="@emfandxsdDescription@";
-
-$emfandxsdsourceURL="@emfandxsdsourceURL@";
-$emfandxsdsourceFile="@emfandxsdsourceFile@";
-$emfandxsdsourceMirrorPrefixuri="@emfandxsdsource.mirror.prefixuri@";
-$emfandxsdsourceBuildHome="@emfandxsdsourceBuildHome@";
-$emfandxsdsourceName="@emfandxsdsourceName@";
-$emfandxsdsourceDescription="@emfandxsdsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpRepo="@dtpRepo@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-$dltkURL="@dltkURL@";
-$dltkFile="@dltkFile@";
-$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
-$dltkBuildHome="@dltkBuildHome@";
-$dltkName="@dltkName@";
-$dltkDescription="@dltkDescription@";
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="true";
-$prereq_eclipseplatform="@prereq.eclipseplatform@";
-$prereq_emf="false";
-$prereq_emfxsd="false";
-$prereq_emfandxsd="true";
-$prereq_emfvalidation="@prereq.emfvalidation@";
-$prereq_gef="true";
-$prereq_dtp="true";
-$prereq_wst="@prereq.wst@";
-$prereq_jst="@prereq.jst@";
-$prereq_wtp="true";
-$prereq_wtptests="true";
-$prereq_dltk="@prereq.dltk@";
-
-
-
-
-
$debugScript = false;
@@ -207,14 +37,39 @@ $mirrorScript=$defaultMirrorScript;
$downloadprefix=$defaultWTPMirrorPrefix;
-$keytestMirrorString=$eclipseMirrorScript . "${eclipseWTPMirrorPrefix}/${build_distribution}-$build.zip";
+$keytestMirrorString=$eclipseMirrorScript . $eclipseWTPMirrorPrefix."/".$build_distribution."-".$build.".zip";
if (isMirrored($keytestMirrorString) ) {
$mirrorScript=$eclipseMirrorScript;
- $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+ $downloadprefix=$mirrorScript.$eclipseWTPMirrorPrefix;
}
if ($debugScript) {
echo "inferred platform: " . getPlatform();
}
+
+switch ($buildtype) {
+ case "I":
+ $type="Integration";
+ break;
+ case "M":
+ $type="Maintenance";
+ break;
+ case "R":
+ $type="Release";
+ break;
+ case "S":
+ $type="Stable";
+ break;
+ case "P":
+ $type="Patches";
+ break;
+ case "N":
+ $type="HEAD";
+ break;
+ default:
+ $type=$buildtype;
+}
+
+
?>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php
index f53c02312..48fd0f748 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/components.template.php
@@ -2,6 +2,8 @@
<head>
+
+
<?php
//ini_set("display_errors", "true");
//error_reporting (E_ALL);
@@ -30,8 +32,7 @@ echo "<title>Components from build </title> \n";
</head>
<body>
<p>
- <b><font face="Verdana" size="+3">Components</font>
- </b>
+ <b><font face="Verdana" size="+3">Components</font> </b>
</p>
<p>These are special-purpose subsets of the WTP build. They are not
needed for normal use or construction of WTP (if they are needed, they
@@ -41,14 +42,17 @@ echo "<title>Components from build </title> \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"> component subsets</font>
- </b>
+ color="#FFFFFF" face="Arial,Helvetica"> component subsets</font> </b>
</td>
</tr>
</table>
+
+
+
+
<?php
// Assuse this file is in the directory we are interested in
@@ -58,41 +62,41 @@ $dir = dir(getcwd());
while ($anEntry = $dir->read())
{
- echo "<table>";
+ echo "<table>";
- if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
+ if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
- {
+ {
- $path_parts = pathinfo($anEntry);
- $file_extension = $path_parts['extension'];
+ $path_parts = pathinfo($anEntry);
+ $file_extension = $path_parts['extension'];
- if ("zip" === $file_extension) {
- // echo " path parts: " . print_r($path_parts) . "<br /> \n";
+ if ("zip" === $file_extension) {
+ // echo " path parts: " . print_r($path_parts) . "<br /> \n";
- echo "<tr>\n";
+ echo "<tr>\n";
- echo "<td align=\"left\" valign=\"top\" width=\"10%\"></td>\n";
- // todo: could use indexed general description here?
- //echo " <td align=\"left\" valign=\"top\">\n";
- //echo " <p>The Automated Test zip contains the unit tests.</p>\n";
+ echo "<td align=\"left\" valign=\"top\" width=\"10%\"></td>\n";
+ // todo: could use indexed general description here?
+ //echo " <td align=\"left\" valign=\"top\">\n";
+ //echo " <p>The Automated Test zip contains the unit tests.</p>\n";
- $zipfilename=$path_parts['basename'];
+ $zipfilename=$path_parts['basename'];
- $filename=$zipfilename;
- $zipfilesize=fileSizeForDisplay($filename);
- $fileShortDescription=$zipfilename;
- displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
+ $filename=$zipfilename;
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription=$zipfilename;
+ displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
- echo "</tr>\n";
+ echo "</tr>\n";
- }
+ }
- }
- echo "</table>";
+ }
+ echo "</table>";
}
?>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/displayPrereqs.php
index 921186a11..fc3f06a62 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/displayPrereqs.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/displayPrereqs.php
@@ -13,12 +13,11 @@
when creating new development environments, or targets to run
against.</p>
<p>
- Note that WTP requires Java 5 or higher (and, for some things,
- actually requires a JDK rather than only a JRE) even though many
- other <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a>
- can run with <a
+ Note that Java 6 is recommended for using WTP at a whole, even though subsets of WTP
+ and other <a href="http://www.eclipse.org/downloads/">Eclipse
+ Projects</a> might run with <a
href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE
- levels</a>.
+ levels</a>. See <a href="http://www.eclipse.org/projects/project-plan.php?projectid=webtools#target_environments">planned target environments</a> for more information.
</p>
<p></p>
</td>
@@ -28,370 +27,299 @@
<table border=0 cellspacing=1 cellpadding=1 width="90%"
align="center">
+ <tr valign="middle">
+ <td colspan="2"><hr /></td>
+ </tr>
+
+
+
+
+ <?php
+ include_once('dependency.properties.php');
+ include_once('prereqsToDisplay.php');
+ $eclipse_mirror_script="http://www.eclipse.org/downloads/download.php?file=";
+
+ if ("true" === $prereq_eclipseplatform) {
+
+ echo "<td width=\"50%\">";
+ echo $eclipseplatform_name . " " . $eclipseplatform_description ;
+ echo "</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=$eclipse_file_win32_win32_x86;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipse_file_linux_gtk_x86;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipse_file_macosx_carbon_ppc;
+ }
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseplatform_mirror_prefixuri, $eclipseplatform_url, $recommendedFile, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $eclipseplatform_url . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatform_build_home . "\">equivalent</a></td>";
+
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_eclipse) {
+
+ echo "<td width=\"50%\">";
+ echo $eclipse_name . " " . $eclipse_description ;
+ echo "</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=$eclipse_file_win32_win32_x86;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipse_file_linux_gtk_x86;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipse_file_macosx_carbon_ppc;
+ }
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipse_mirror_prefixuri, $eclipse_url, $recommendedFile, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $eclipse_url . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipse_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_emfandxsd) {
+
+ echo "<td width=\"50%\">";
+ echo $emfandxsd_name . " " . $emfandxsd_description ;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $emfandxsd_mirror_prefixuri, $emfandxsd_url, $emfandxsd_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $emfandxsd_build_home . "\">equivalent</a></td>";
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_gef) {
+
+ echo "<td width=\"50%\">";
+ echo $gef_name . " " . $gef_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $gef_mirror_prefixuri, $gef_url, $gef_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $gef_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_dtp) {
+
+ echo "<td width=\"50%\">";
+ echo $dtp_name . " " . $dtp_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $dtp_mirror_prefixuri, $dtp_url, $dtp_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $dtp_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_emftransaction) {
+
+ echo "<td width=\"50%\">";
+ echo $emftransaction_name . " " . $emftransaction_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $emftransaction_mirror_prefixuri, $emftransaction_url, $emftransaction_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $emftransaction_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_emfvalidation) {
+
+ echo "<td width=\"50%\">";
+ echo $emfvalidation_name . " " . $emfvalidation_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $emfvalidation_mirror_prefixuri, $emfvalidation_url, $emfvalidation_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $emfvalidation_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_graphiti) {
+
+ echo "<td width=\"50%\">";
+ echo $graphiti_name . " " . $graphiti_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $graphiti_mirror_prefixuri, $graphiti_url, $graphiti_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $graphiti_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_wst) {
+
+ echo "<td width=\"50%\">";
+ echo $wst_name . " " . $wst_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $wst_mirror_prefixuri, $wst_url, $wst_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $wst_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+
+ echo "<td width=\"50%\">";
+ echo $jst_name . " " . $jst_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $jst_mirror_prefixuri, $jst_url, $jst_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $jst_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_wtp) {
+
+ echo "<td width=\"50%\">";
+ echo $wtp_name . " " . $wtp_description;
+ echo "</td>";
+
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $wtp_mirror_prefixuri, $wtp_url, $wtp_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $wtp_build_home . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_wtptests) {
+
+ echo "<td width=\"50%\">";
+ echo $wtptests_name . " " . $wtptests_description;
+ echo "</td>";
- <?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;
- }
-
- 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;
- }
-
- 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>";
- }
- ?>
-
-
-
-
- <?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_emfandxsd) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
-
- echo $emfandxsdName . " " . $emfandxsdDescription ;
-
- echo "</td>";
- echo "<td align=\"right\">";
-
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfandxsdMirrorPrefixuri, $emfandxsdURL, $emfandxsdFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfandxsdBuildHome . "\">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_wtptests) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
-
- echo $wtptestsName . " " . $wtptestsDescription;
-
- echo "</td>";
- echo "<td align=\"right\">";
-
- echo getPrereqReferenceOrName($eclipseMirrorScript, $wtptestsMirrorPrefixuri, $wtptestsURL, $wtptestsFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $wtptestsBuildHome . "\">equivalent</a></td>";
-
- echo " </tr>";
- }
- ?>
+ echo "<td align=\"right\">";
- <?php
- if ("true" === $prereq_dltk) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $wtptests_mirror_prefixuri, $wtptests_url, $wtptests_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $wtptests_build_home . "\">equivalent</a></td>";
- echo $dltkName . " " . $dltkDescription;
+ echo " </tr>";
+ }
+ ?>
- echo "</td>";
- echo "<td align=\"right\">";
+ <?php
+ if ("true" === $prereq_dltk) {
+
+ echo "<td width=\"50%\">";
+ echo $dltk_name . " " . $dltk_description;
+ echo "</td>";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+ echo "<td align=\"right\">";
- echo " </tr>";
- }
- ?>
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr /></td>
- </tr>
-
-
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $dltk_mirror_prefixuri, $dltk_url, $dltk_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $dltk_build_home . "\">equivalent</a></td>";
+ echo " </tr>";
+ }
+ ?>
+
+ <tr valign="middle">
+ <td colspan="2"><hr /></td>
+ </tr>
-
- <?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>";
- echo "</tr>";
- }
- ?>
<?php
- if ("true" === $prereq_emfxsd) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
- echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
- echo "</td> ";
+ if ("true" === $prereq_eclipsetestframework) {
+
+ echo "<td width=\"50%\">";
+ echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description;
+ echo "</td>";
+
echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseTestFramework_mirror_prefixuri, $eclipseTestFramework_url, $eclipseTestFramework_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $eclipseTestFramework_build_home . "\">equivalent</a></td>";
echo "</tr>";
}
?>
<?php
- if ("true" === $prereq_emfvalidation) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
- echo $emfvalidationsourceName . " " . $emfvalidationsourceDescription;
- echo "</td> ";
+ if ("true" === $prereq_eclipsereleng) {
+
+ echo "<td width=\"50%\">";
+ echo $eclipsereleng_name . " " . $eclipsereleng_description;
+ echo "</td>";
+
echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
+
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipsereleng_mirror_prefixuri, $eclipsereleng_url, $eclipsereleng_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $eclipsereleng_build_home . "\">equivalent</a></td>";
echo "</tr>";
}
?>
<?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> ";
+ if ("true" === $prereq_orbitthirdpartyzip) {
+
+ echo "<td width=\"50%\">";
+ echo $orbitthirdpartyzip_name . " " . $orbitthirdpartyzip_description;
+ echo "</td>";
+
echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipse_mirror_script, $orbitthirdpartyzip_mirror_prefixuri, $orbitthirdpartyzip_url, $orbitthirdpartyzip_file, $eclipse_fspath_prefix);
+ echo " or <a href=\"" . $orbitthirdpartyzip_build_home . "\">equivalent</a></td>";
echo "</tr>";
}
?>
-
-
- <tr valign="top">
- <td width="10%"></td>
- <td>Eclipse releng tool (required only for committers to more easily
- "release" code to a build)</td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
-
- <tr valign="top">
- <td width="10%"></td>
- <td>Third Party code from Orbit. Not required and is currently much
- more than needed for WTP, but some committers like using to create a
- PDE target.</td>
- <td align="right"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
- echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
- ?>
-
- </tr>
+
</table>
</td>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/headingIntro.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/headingIntro.php
index b42f64ded..8299b2543 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/headingIntro.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/headingIntro.php
@@ -19,6 +19,10 @@ else {
+
+
+
+
<?php if (isset($incubating) && ($incubating == "true")) {
echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
echo " <tr>";
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 87853f28f..0d3a3faa3 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
@@ -4,6 +4,10 @@
+
+
+
+
<?php
//ini_set("display_errors", "true");
@@ -11,6 +15,7 @@
include_once("miscUtil.php");
include_once('buildvariables.php');
+include_once('dependency.properties.php');
// our summary results handling requires php 5 (for simple xml file loading)
// so, if not php 5, just don't display any summary results
@@ -19,59 +24,59 @@ include_once('buildvariables.php');
$displayTestSummary=false;
if (phpversion() >= 5) {
- $code_totalBundles=0;
- $code_totalErrors=0;
- $code_totalWarnings=0;
- $code_totalforbiddenAccessWarningCount=0;
- $code_totaldiscouragedAccessWarningCount=0;
-
- $test_totalBundles=0;
- $test_totalErrors=0;
- $test_totalWarnings=0;
- $test_totalforbiddenAccessWarningCount=0;
- $test_totaldiscouragedAccessWarningCount=0;
-
-
- $displayTestSummary=true;
- // expecting grandTotalErrors and grandTotalTests
- $filename = "unitTestsSummary.xml";
- if (file_exists($filename)) {
- $prefix = "unitTests_";
- $unitTestsSummary = simplexml_load_file($filename);
- foreach ($unitTestsSummary->summaryItem as $summaryItem) {
- $name = $summaryItem->name;
- $value = $summaryItem->value;
- $code= "\$" . $prefix . $name . " = " . $value . ";";
- //echo "<br />code: " . $code;
- eval($code);
- }
- }
-
- $filename = "compilelogsSummary.xml";
- if (file_exists($filename)) {
- $prefix = "code_";
- $compileSummary = simplexml_load_file($filename);
- foreach ($compileSummary->summaryItem as $summaryItem) {
- $name = $summaryItem->name;
- $value = $summaryItem->value;
- $code= "\$" . $prefix . $name . " = " . $value . ";";
- //echo "<br />code: " . $code;
- eval($code);
- }
- }
-
- $filename = "testcompilelogsSummary.xml";
- if (file_exists($filename)) {
- $prefix = "test_";
- $compileSummary = simplexml_load_file($filename);
- foreach ($compileSummary->summaryItem as $summaryItem) {
- $name = $summaryItem->name;
- $value = $summaryItem->value;
- $code= "\$" . $prefix . $name . " = " . $value . ";";
- //echo "<br />code: " . $code;
- eval($code);
- }
- }
+ $code_totalBundles=0;
+ $code_totalErrors=0;
+ $code_totalWarnings=0;
+ $code_totalforbiddenAccessWarningCount=0;
+ $code_totaldiscouragedAccessWarningCount=0;
+
+ $test_totalBundles=0;
+ $test_totalErrors=0;
+ $test_totalWarnings=0;
+ $test_totalforbiddenAccessWarningCount=0;
+ $test_totaldiscouragedAccessWarningCount=0;
+
+
+ $displayTestSummary=true;
+ // expecting grandTotalErrors and grandTotalTests
+ $filename = "unitTestsSummary.xml";
+ if (file_exists($filename)) {
+ $prefix = "unitTests_";
+ $unitTestsSummary = simplexml_load_file($filename);
+ foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+ }
+
+ $filename = "compilelogsSummary.xml";
+ if (file_exists($filename)) {
+ $prefix = "code_";
+ $compileSummary = simplexml_load_file($filename);
+ foreach ($compileSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+ }
+
+ $filename = "testcompilelogsSummary.xml";
+ if (file_exists($filename)) {
+ $prefix = "test_";
+ $compileSummary = simplexml_load_file($filename);
+ foreach ($compileSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+ }
}
@@ -87,270 +92,278 @@ if (phpversion() >= 5) {
<table border=0 cellspacing=2 cellpadding=2 width="100%">
- <tr>
- <td align=left valign=top colspan="2" bgcolor="#0080C0"><font
- face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
- repositories in zipped format files.</font></td>
- </tr>
-
- <tr>
- <td align="left" valign="top" colspan="5">
- <p>These are archive versions of P2 repositories that can be
- downloaded and installed into a development environment or PDE target.
- Its is recommended to install, rather than to to unzip the traditional
- packages, since it is more informative of missing prerequites or
- conflicting dependencies.</p>
- </td>
- </tr>
-
- <tr>
- <td>
- <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
- <?php
-
- $shortname=${build_distribution}."-repo";
-
- $zipfilename=${shortname}."-".${build};
- $filename=${zipfilename}.".zip";
- if (file_exists($filename)) {
- ?>
- <tr>
- <td align="left" valign="top" width="10%"><b>Code Repository</b></td>
- <td align="left" valign="top">
- <p>Archived p2 repository of WTP code. Good for product builders. </p>
- </td>
- <?php
- $zipfilesize=fileSizeForDisplay($filename);
-
- displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
- ?>
- </tr>
- <?php } ?>
+ <tr>
+ <td align=left valign=top colspan="2" bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
+ repositories in zipped format files.</font></td>
+ </tr>
+
+ <tr>
+ <td align="left" valign="top" colspan="5">
+ <p>These are archive versions of P2 repositories that can be
+ downloaded and installed into a development environment or PDE target.
+ Its is recommended to install, rather than to to unzip the traditional
+ packages, since it is more informative of missing prerequites or
+ conflicting dependencies.</p>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+ <?php
+
+ $shortname=$build_distribution."-repo";
+
+ $zipfilename=$shortname."-".$build;
+ $filename=$zipfilename.".zip";
+ if (file_exists($filename)) {
+ ?>
+ <tr>
+ <td align="left" valign="top" width="10%"><b>Code Repository</b></td>
+ <td align="left" valign="top">
+ <p>Archived p2 repository of WTP code. Good for product builders. </p>
+ </td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
+ ?>
+ </tr>
+ <?php } ?>
<?php
- $shortname="${build_distribution}-tests-repo";
+ $shortname="$build_distribution-tests-repo";
$zipfilename=$shortname."-".$build;
- $filename=$zipfilename.".zip";
- if (file_exists($filename)) {
- ?>
- <tr>
+ $filename=$zipfilename.".zip";
+ if (file_exists($filename)) {
+ ?>
+ <tr>
<td align="left" valign="top" width="10%"><b>Tests Repository</b></td>
- <td align="left" valign="top">
- <p>Archived p2 repository of WTP unit tests.</p>
- </td>
- <?php
- $zipfilesize=fileSizeForDisplay($filename);
-
- displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
- ?>
- </tr>
- <?php } ?>
-
-
- </table>
-
- </tr>
+ <td align="left" valign="top">
+ <p>Archived p2 repository of WTP code (as above) but also contains unit tests. All-in-one repo, ideal for committers.</p>
+ </td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
+ ?>
+ </tr>
+ <?php } ?>
+ </table>
+
+ </tr>
</table>
<!-- *********** 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}-${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 this build.</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=${build_distribution};
- displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
- ?>
- </tr>
- <?php } ?>
-
- <?php
- $zipfilename="${build_distribution}-sdk-${build}";
- $filename=$zipfilename.".zip";
- 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=${build_distribution} . "-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="10%"><b>Unit Tests</b></td>
- <td align="left" valign="top">
- <p>The automated test zip contains unit tests.</p>
- </td>
- <?php
- $zipfilesize=fileSizeForDisplay($filename);
- $fileShortDescription=${build_distribution} . "-tests";
- displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
- ?>
- </tr>
- <?php } ?>
- </table>
- </td>
-
-
- </tr>
+ <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-$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 this build.</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>Web App Developers:</b></td>
+ <td align="left" valign="top" width="55%">
+ <p>This non-SDK package is for most users. It includes the runnable
+ code and end-user documentation for those using the tools to develop
+ web applications.</p>
+ </td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription=$build_distribution;
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
+ </tr>
+ <?php } ?>
+
+ <?php
+ $zipfilename=$build_distribution."-sdk-".$build;
+ $filename=$zipfilename.".zip";
+ if (file_exists($filename)) {
+ ?>
+ <tr>
+ <td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
+ <td align="left" valign="top">
+ <p>The SDK package includes source code and developer documentation
+ for those using WTP as a platform to build more tools, as well as
+ everything that is in the non-SDK version.</p>
+ </td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription=$build_distribution . "-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="10%"><b>Unit Tests</b></td>
+ <td align="left" valign="top">
+ <p>The automated test zip contains unit tests.</p>
+ </td>
+ <?php
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription=$build_distribution . "-tests";
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
+
+ </tr>
+ <?php } ?>
+ </table>
+ </td>
+
+
+ </tr>
</table>
+ <?php include 'webdev.php'; ?>
-
+ <?php include 'fproject.php'; ?>
<!-- *********** Build Status ************** -->
<table border=0 cellspacing=2 cellpadding=2 width="100%">
- <tr>
- <td align=left valign=top bgcolor="#0080C0"><font
- face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
- and other interesting details</font></td>
- </tr>
- <tr>
- <td>
- <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
- <tr>
- <td><?php
- if (isset($displayBuildNotes) && $displayBuildNotes) {
- echo "<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) {
-
-
- if (isset($unitTests_grandTotalErrors)) {
- $errorColor="green";
- if ($unitTests_grandTotalErrors > 0) {
- $errorColor="red";
- }
- echo "<a href=\"testResults.php\">Unit test results</a> ";
- echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font> Total: " . $unitTests_grandTotalTests;
- }
- else {
- $compileProblemMarkerFile="compilationProblems.txt";
- if (file_exists($compileProblemMarkerFile)) {
- echo "<br /> <img src=\"compile_err.gif\"/> No unit tests available. The remaining build and tests were canceled since compilation problems were found. Check compiler output summaries.";
- } else {
- $installLogName="p2DirectorInstall.log.txt";
- if (file_exists($installLogName)) {
- echo "<br /><img src=\"compile_err.gif\"/> No unit tests available. See <a href=\"" . $installLogName . "\">the p2Director install log file </a>from failed test installation attempt";
- } else {
- $noTestsProvidedMarkerFile="noTestsProvided.txt";
- if (file_exists($noTestsProvidedMarkerFile)) {
- echo "<br /><img src=\"compile_warn.gif\"/> No unit tests available. This build component does not providing any unit tests.";
- } else {
-
- // we may really be pending (tests still running) or maybe they failed in unexpted way?.
- echo "<br /><font color=\"orange\">Unit tests ae pending, or otherwise don't exists, or there is an unanticipated build error.</font>";
-
- }
- }
- }
- }
-
- echo "<br />";
-
- echo "<br />";
- echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
- echo " ($code_totalBundles) ";
- echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font> ";
- echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font> ";
- echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font> ";
- echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font> ";
-
- echo "<br />";
- echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
- echo " ($test_totalBundles) ";
- echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font> ";
- 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 />
-
- <?php
- if (file_exists("versioningReportName.php")) {
- include "versioningReportName.php";
- $fname="${versionReportFilename}.html";
- if (file_exists($fname)) {
- echo "<br /> <a href='$fname'>Versioning Information</a>";
- }
-}
-?></td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr>
+ <td align=left valign=top bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
+ and other interesting details</font></td>
+ </tr>
+ <tr>
+ <td>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+ <tr>
+ <td><?php
+ if (isset($displayBuildNotes) && $displayBuildNotes) {
+ echo "<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) {
+
+
+ if (isset($unitTests_grandTotalErrors)) {
+ $errorColor="green";
+ if ($unitTests_grandTotalErrors > 0) {
+ $errorColor="red";
+ }
+ echo "<a href=\"testResults.php\">Unit test results</a> ";
+ echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font> Total: " . $unitTests_grandTotalTests;
+ }
+ else {
+ $compileProblemMarkerFile="compilationProblems.txt";
+ if (file_exists($compileProblemMarkerFile)) {
+ echo "<br /> <img src=\"compile_err.gif\"/> No unit tests available. The remaining build and tests were canceled since compilation problems were found. Check compiler output summaries.";
+ } else {
+ $installLogName="p2DirectorInstall.log.txt";
+ if (file_exists($installLogName)) {
+ echo "<br /><img src=\"compile_err.gif\"/> No unit tests available. See <a href=\"" . $installLogName . "\">the p2Director install log file </a>from failed test installation attempt";
+ } else {
+ $noTestsProvidedMarkerFile="noTestsProvided.txt";
+ if (file_exists($noTestsProvidedMarkerFile)) {
+ echo "<br /><img src=\"compile_warn.gif\"/> No unit tests available. This build component does not providing any unit tests.";
+ } else {
+
+ // we may really be pending (tests still running) or maybe they failed in unexpted way?.
+ echo "<br /><font color=\"orange\">Unit tests ae pending, or otherwise don't exists, or there is an unanticipated build error.</font>";
+
+ }
+ }
+ }
+ }
+
+
+
+
+
+ echo "<br />";
+
+ echo "<br />";
+ echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+
+ echo " ($code_totalBundles) ";
+ echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font> ";
+ echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font> ";
+ echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font> ";
+ echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font> ";
+
+ echo "<br />";
+ echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+
+ echo " ($test_totalBundles) ";
+ echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font> ";
+ 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 />
+
+ <?php
+ if (file_exists("versioningReportName.php")) {
+ include "versioningReportName.php";
+ $fname=$versionReportFilename.".html";
+ if (file_exists($fname)) {
+ echo "<br /> <a href='$fname'>Versioning Information</a>";
+ }
+ }
+ ?></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
@@ -359,12 +372,12 @@ if (phpversion() >= 5) {
<center>
<hr>
<p>All downloads are provided under the terms and conditions of the <a
- href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
+ href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
User Agreement</a> unless otherwise specified.</p>
<p>If you have problems downloading the drops, contact the <font
- face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
- href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
+ face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
+ href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
</center>
<!-- end footer -->
@@ -373,5 +386,11 @@ User Agreement</a> unless otherwise specified.</p>
+
+
+
+
+
+
</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
index c69d7f05d..1574fa8d5 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/testResults.php.template.php
@@ -2,6 +2,8 @@
<head>
+
+
<?php
//ini_set("display_errors", "true");
//error_reporting (E_ALL);
@@ -59,8 +61,7 @@ echo "<title>Test Results for $buildName </title>";
</head>
<body>
<p>
- <b><font face="Verdana" size="+3">Test Results</font>
- </b>
+ <b><font face="Verdana" size="+3">Test Results</font> </b>
</p>
<table border=0 cellspacing=5 cellpadding=2 width="100%">
@@ -74,37 +75,41 @@ echo "<title>Test Results for $buildName </title>";
+
+
+
+
<?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";
- }
- }
- }
- }
+ $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";
+ }
+ }
+ }
+ }
}
?>
@@ -112,33 +117,33 @@ if (file_exists("testResults"))
<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>
+ <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>
+ <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%
+ %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>
+ <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
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml
index a203ad6d3..42dd5d5e3 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml
@@ -96,7 +96,6 @@
we are running -->
<exclude name="test.xml"/>
<exclude name="**/*performance*/test.xml"/>
- <exclude name="**/*wtp.releng.tests_1.1.0*/test.xml"/>
<include name="**/*releng*/test.xml"/>
</fileset>
</subant>
--
GitLab