From e08aef523cbf6dce43927a071260f93cf4d1c968 Mon Sep 17 00:00:00 2001
From: tle <tle>
Date: Tue, 22 Feb 2011 17:55:28 +0000
Subject: [PATCH] Fixed EMF Transaction & EMF Validation pre-reqs display
problem.
---
.../wtp.site/templateFiles/buildvariables.php | 18 ++++
.../wtp.site/templateFiles/displayPrereqs.php | 100 +++++++-----------
2 files changed, 54 insertions(+), 64 deletions(-)
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
index 6564efe4d..05a769b8a 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
@@ -168,6 +168,24 @@ $orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
+
+$emftransactionURL="@emftransactionURL@";
+$emftransactionFile="@emftransactionFile@";
+$emftransactionRepo="@emftransactionRepo@";
+$emftransactionMirrorPrefixuri="@emftransaction.mirror.prefixuri@";
+$emftransactionBuildHome="@emftransactionBuildHome@";
+$emftransactionName="@emftransactionName@";
+$emftransactionDescription="@emftransactionDescription@";
+
+$emfvalidationURL="@emfvalidationURL@";
+$emfvalidationFile="@emfvalidationFile@";
+$emfvalidationRepo="@emfvalidationRepo@";
+$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
+$emfvalidationBuildHome="@emfvalidationBuildHome@";
+$emfvalidationName="@emfvalidationName@";
+$emfvalidationDescription="@emfvalidationDescription@";
+
+
$prereq_eclipse="true";
$prereq_e4x="false";
$prereq_eclipseplatform="@prereq.eclipseplatform@";
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
index 0588dec31..10557da0b 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
@@ -132,42 +132,6 @@
}
?>
- <?php
- if ("true" === $prereq_emftransaction) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
-
- echo $emftransactionName . " " . $emftransactionDescription;
-
- echo "</td>";
- echo "<td align=\"right\">";
-
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emftransactionBuildHome . "\">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\">";
@@ -326,34 +290,6 @@
}
?>
- <?php
- if ("true" === $prereq_emftransaction) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td>";
- echo $emftransactionsourceName . " " . $emftransactionsourceDescription;
- echo "</td> ";
- echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionsourceMirrorPrefixuri, $emftransactionsourceURL, $emftransactionsourceFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emftransactionsourceBuildHome . "\">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> ";
- echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
- echo "</tr>";
- }
- ?>
-
<?php
if (true) {
echo "<tr valign=\"top\">";
@@ -393,6 +329,42 @@
</tr>
+ <?php
+ if ("true" === $prereq_emftransaction) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $emftransactionName . " " . $emftransactionDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emftransactionBuildHome . "\">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>";
+ }
+ ?>
+
</table>
</td>
</tr>
--
GitLab