Bug 455142 - fix structure of index.php.template

1 files changed, 17 insertions, 22 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index 6a1d1211a..3c581126b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -7,9 +7,6 @@ $pageAuthor   = "David Williams and Christopher Guindon";
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
 
-$eclipseStream="4";
-include('../../dlconfig4.php');
-$subdirDrops="drops4";
 $expectedtestConfigs=0;
 $testConfigs = array();
 
@@ -28,6 +25,19 @@ else {
     $clickthroughstr="";
 }
 
+include_once("buildproperties.php");
+include_once("utilityFunctions.php");
+
+// global variables
+$expectedTestConfigs=array();
+$testResults = array();
+$testResultsSummaryFiles=array();
+
+$streamArr = explode(".", $STREAM);
+$STREAM_MAJOR = $streamArr[0];
+$STREAM_MINOR = $streamArr[1];
+$STREAM_SERVICE = $streamArr[2];
+
 ob_start();
 
 /*
@@ -45,19 +55,6 @@ See https://eclipse.org/eclipse.org-common/themes/solstice/docs/
 
 require("DL.thin.header.php.html");
 
-
-include_once("buildproperties.php");
-include_once("utilityFunctions.php");
-
-// global variables
-$expectedTestConfigs=array();
-$testResults = array();
-$testResultsSummaryFiles=array();
-
-$streamArr = explode(".", $STREAM);
-$STREAM_MAJOR = $streamArr[0];
-$STREAM_MINOR = $streamArr[1];
-$STREAM_SERVICE = $streamArr[2];
 ?>
 
 
@@ -102,12 +99,10 @@ if (isset($testbuildonly) && ($testbuildonly)) {
   echo "<h2>Test-Build-Only flag found set. Input was not tagged.<h2>\n";
 }
 
-// Use of "BUILD_ID" should work for milestones, and releases, but would require a "copy"
-// being made, say for "4.5RC4" during that period we have prepared final bits, but have not
-// made visible yet (if we want "N&N" visible from RC build).
-
-if (file_exists("news")) {
-  echo "<h2><a href=\"http://www.eclipse.org/eclipse/news/${BUILD_ID}/eclipse_news_${BUILD_ID}.php\">New and Noteworthy</a></h2>\n";
+// $NEWS_ID needs to be added to buildproperties.php, such as $NEWS_ID="4.5/M4";
+// Once ready to display it.
+if (isset ($NEWS_ID)) {
+  echo "<h2><a href=\"http://www.eclipse.org/eclipse/news/${NEWS_ID}/\">New and Noteworthy</a></h2>\n";
 }
 // linkToAcknowledgements is a pure "marker file"
 if (file_exists("linkToAcknowledgements")) {