From 41f52a26eade5ab07df86abfb2db3fba4f7e7b1d Mon Sep 17 00:00:00 2001
From: tle <tle>
Date: Tue, 14 Oct 2008 23:25:42 +0000
Subject: [PATCH] Added JST and DPT dependency
---
.../distribution/dali.site/publish.xml | 2 --
.../templateFiles/index.html.template.php | 29 +++++++++++--------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 58ba88c4b..8dd9055c4 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -448,8 +448,6 @@
file="${resultingIndex}"
token="@emf.mirror.prefixuri@"
value="${emf.mirror.prefixuri}" />
-
-<echo message="############ jst.file = ${jst.file}"/>
<replace
file="${resultingIndex}"
token="@jstFile@"
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
index 84ceef76b..071ef5b7f 100644
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
@@ -26,10 +26,10 @@ $eclipseBuildHome="@eclipseBuildHome@";
$testURL="@testURL@";
$testFile="@testFile@";
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
+$jstURL="@jstURL@";
+$jstFile="@jstFile@";
+$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
+$jstBuildHome="@jstBuildHome@";
$gefURL="@gefURL@";
@@ -227,19 +227,17 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
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>Webtools Platform (at least WST)</td>
+ <td>J2EE Standard Tools (JST)</td>
<td align="right"><?php
// debug
- // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
- echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+ // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $jstMirrorPrefixuri . "/" . $jstFile;
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
?>
-
</tr>
<tr valign="top">
@@ -249,7 +247,6 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
?>
-
</tr>
<tr valign="top">
@@ -259,7 +256,15 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
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)</td>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+ ?>
</tr>
<tr valign="middle">
--
GitLab