make dependencies, etc., easier to use in PHP - revert attempts to use dependencies from ant
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index e10752a..14fc8d1 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -381,26 +381,258 @@
token="@buildBranch@"
value="${buildBranch}" />
- <!-- copy pre-reqs as php ini file -->
- <copy tofile="${result}/dependencies.ini">
- <fileset file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
- </copy>
- <!-- change java property comments to php ini comments -->
- <replaceregexp
- flags="gm"
- file="${result}/dependencies.ini"
- match="^#"
- replace=";" />
- <replaceregexp
- flags="gm"
- file="${result}/dependencies.ini"
- match="~"
- replace="\u007E;" />
- <replaceregexp
- flags="gm"
- file="${result}/dependencies.ini"
- match="(=.*)="
- replace="\1\u007E;" />
+ <!-- Insert PreRequsites -->
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseFile@"
+ value="${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseURL@"
+ value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseBuildURL@"
+ value="${eclipse.url}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipsefilelinux@"
+ value="${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipsefilewindows@"
+ value="${eclipse.file.win32-win32-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipsefilemacos@"
+ value="${eclipse.file.macosx-carbon-ppc}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseBuildHome@"
+ value="${eclipse.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipse.mirror.prefixuri@"
+ value="${eclipse.mirror.prefixuri}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipse.fspath.prefix@"
+ value="${eclipse.fspath.prefix}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@testURL@"
+ value="${eclipseTestFramework.url}/${eclipseTestFramework.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@testFile@"
+ value="${eclipseTestFramework.file}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@emfFile@"
+ value="${emf.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfURL@"
+ value="${emf.url}/${emf.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfBuildHome@"
+ value="${emf.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emf.mirror.prefixuri@"
+ value="${emf.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfName@"
+ value="${emf.name}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfDescription@"
+ value="${emf.description}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@emfsourceFile@"
+ value="${emfsourcedoc.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfsourceURL@"
+ value="${emfsourcedoc.url}/${emfsourcedoc.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfsourceBuildHome@"
+ value="${emfsourcedoc.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfsource.mirror.prefixuri@"
+ value="${emfsourcedoc.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfsourceName@"
+ value="${emfsourcedoc.name}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfsourceDescription@"
+ value="${emfsourcedoc.description}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdFile@"
+ value="${emfxsd.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdURL@"
+ value="${emfxsd.url}/${emfxsd.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdBuildHome@"
+ value="${emfxsd.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsd.mirror.prefixuri@"
+ value="${emfxsd.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdName@"
+ value="${emfxsd.name}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdDescription@"
+ value="${emfxsd.description}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdsourceFile@"
+ value="${emfxsdsourcedoc.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdsourceURL@"
+ value="${emfxsdsourcedoc.url}/${emfxsdsourcedoc.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdsourceBuildHome@"
+ value="${emfxsdsourcedoc.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdsource.mirror.prefixuri@"
+ value="${emfxsdsourcedoc.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdsourceName@"
+ value="${emfxsdsourcedoc.name}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfxsdsourceDescription@"
+ value="${emfxsdsourcedoc.description}" />
+
+
+ <replace
+ file="${resultingIndex}"
+ token="@wstFile@"
+ value="${wst.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wstURL@"
+ value="${wst.url}/${wst.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wstBuildHome@"
+ value="${wst.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wst.mirror.prefixuri@"
+ value="${wst.mirror.prefixuri}" />
+
+
+ <replace
+ file="${resultingIndex}"
+ token="@gefFile@"
+ value="${gef.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefURL@"
+ value="${gef.url}/${gef.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefBuildHome@"
+ value="${gef.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gef.mirror.prefixuri@"
+ value="${gef.mirror.prefixuri}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipserelengFile@"
+ value="${eclipsereleng.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipserelengURL@"
+ value="${eclipsereleng.url}/${eclipsereleng.file}" />
+
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzipFile@"
+ value="${orbitthirdpartyzip.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzipURL@"
+ value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzipBuildHome@"
+ value="${orbitthirdpartyzip.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzip.mirror.prefixuri@"
+ value="${orbitthirdpartyzip.mirror.prefixuri}" />
+
+
+ <!-- no longer used. Post 1.5.5 -->
+ <replace
+ file="${resultingIndex}"
+ token="@jemFile@"
+ value="${jem.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jemURL@"
+ value="${jem.url}/${jem.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jemBuildHome@"
+ value="${jem.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ 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
+ file="${resultingIndex}"
+ token="@dtpFile@"
+ value="${dtp.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtpURL@"
+ value="${dtp.url}/${dtp.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtpBuildHome@"
+ value="${dtp.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtp.mirror.prefixuri@"
+ value="${dtp.mirror.prefixuri}" />
+
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
index 3aa4763..e6af645 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
@@ -6,20 +6,88 @@
<?php
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$builddate="@date@";
+$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
+$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
+
+$eclipsefilelinux="@eclipsefilelinux@";
+$eclipsefilewindows="@eclipsefilewindows@";
+$eclipsefilemacosx="@eclipsefilemacos@";
+
+$eclipseURL="@eclipseURL@";
+$eclipseFile="@eclipseFile@";
+$eclipseBuildURL="@eclipseBuildURL@";
+$eclipseBuildHome="@eclipseBuildHome@";
+$testURL="@testURL@";
+$testFile="@testFile@";
+
+$wstURL="@wstURL@";
+$wstFile="@wstFile@";
+$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
+$wstBuildHome="@wstBuildHome@";
+
+
+$gefURL="@gefURL@";
+$gefFile="@gefFile@";
+$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
+$gefBuildHome="@gefBuildHome@";
+
+$emfURL="@emfURL@";
+$emfFile="@emfFile@";
+$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
+$emfBuildHome="@emfBuildHome@";
+$emfName="@emfName@";
+$emfDescription="@emfDescription@";
+
+$emfsourceURL="@emsourceURL@";
+$emfsourceFile="@emsourceFile@";
+$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@";
+
+$dtpURL="@dtpURL@";
+$dtpFile="@dtpFile@";
+$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
+$dtpBuildHome="@dtpBuildHome@";
+
+
+$eclipserelengFile="@eclipserelengFile@";
+$eclipserelengURL="@eclipserelengURL@";
+$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
+$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
+$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
+$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
+
+
+
include("miscUtil.php");
-// Parse without sections
-$dependancies = parse_ini_file("dependencies.ini");
-//print_r($dependancies);
+
+
+//ini_set("display_errors", "true");
+//error_reporting (E_ALL);
+
$debugScript = false;
$debugFunctions = false;
@@ -188,35 +256,108 @@
$usersPlatform = getPlatform();
// assume windows by default, since likely most frequent, even for cases where
// platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$dependancies["eclipse.file.win32-win32-x86"];
+ $recommendedFile=$eclipsefilewindows;
if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$dependancies["eclipse.file.linux-gtk-x86"];
+ $recommendedFile=$eclipsefilelinux;
} else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$dependancies["eclipse.file.macosx-carbon-ppc"];
+ $recommendedFile=$eclipsefilemacosx;
}
?>
<td align="right" width="35%"><?php
- echo getPrereqReferenceOrName($eclipseMirrorScript, $dependancies["eclipse.mirror.prefixuri"], $dependancies["eclipse.url"], $recommendedFile, $dependancies["eclipse.fspath.prefix"]);
- echo " or <a href=\"" . $dependancies["eclipse.url"] . "\">appropriate platform</a>";
- echo " or <a href=\"" . $dependancies["eclipse.build.home"] . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
?>
</tr>
- <?php doDependancyRow("emf",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("emfxsd",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("gef",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("dtp",$dependancies,$eclipseMirrorScript) ?>
+ <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>
+
+ <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>
+
+ <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>
<tr valign="middle">
<td colspan="3"><hr /></td>
</tr>
- <?php doDependancyRow("emfsourcedoc",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("emfxsdsourcedoc",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("eclipseTestFramework",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("eclipsereleng",$dependancies,$eclipseMirrorScript) ?>
- <?php doDependancyRow("orbitthirdpartyzip",$dependancies,$eclipseMirrorScript) ?>
+ <tr valign="top">
+ <td width="10%"></td>
+ <td><?php echo "$emfsourceName $emfsourceDescription" ?></td>
+ <td align="right"><?php
+ 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 getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ ?>
+ </tr>
+
+ <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>
+
+ <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 Parthy 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>