Attachment 217375 Details for Bug 208422 – nova theme patch

[patch] nova theme patch

nova+theme.patch (text/plain), 83.97 KB, created by Christopher Guindon

on 2012-06-14 14:23:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Guindon

Created: 2012-06-14 14:23:16 EDT

Size: 83.97 KB

patch

obsolete

>diff --git downloadsites/eclipse/downloads/createIndex4x.php downloadsites/eclipse/downloads/createIndex4x.php
>index fd9066e..a8e4913 100644
>--- downloadsites/eclipse/downloads/createIndex4x.php
>+++ downloadsites/eclipse/downloads/createIndex4x.php
>@@ -1,26 +1,97 @@
>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>-<html xmlns="http://www.w3.org/1999/xhtml">
>-<?php
>-//ini_set("display_errors", "true");
>-//error_reporting (E_ALL);
>-$eclipseStream="4";
>-$otherIndexFile="eclipse3x.html";
>-$otherStream="3";
>-include('dlconfig4.php');
>-$subdirDrops="drops4";
>+<?php 
>+require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	
>+require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	
>+require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	
>+$App 	= new App();	
>+$Nav	= new Nav();	
>+$Menu 	= new Menu();		
>+include($App->getProjectCommon());    
> 
>-?>
>-<head>
>-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
>-<link rel="stylesheet" href="../default_style.css" />
>-<title>Eclipse Project Downloads</title></head>
>-<body>
>+# All on the same line to unclutter the user's desktop'
>+/*******************************************************************************
>+ * Copyright (c) 2009-2010 Eclipse Foundation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    
>+ *******************************************************************************/
>+
>+		#
>+	# Begin: page-specific settings.  Change these. 
>+	$pageTitle 		= "Eclipse Project Downloads";
>+	$pageKeywords	= "";
>+	$pageAuthor		= "";
>+	
>+	ini_set("display_errors", "true");
>+	error_reporting (E_ALL);
>+	$eclipseStream="4";
>+	$otherIndexFile="eclipse3x.html";
>+	$otherStream="3";
>+	include('dlconfig4.php');
>+	$subdirDrops="drops4";
>+
>+	
>+	$op = '<' . '?php' ;
>+	$cl = ' ?' . '>';
>+	
>+	# Paste your HTML content between the EOHTML markers!	
>+	ob_start();	
>+	
>+	
>+	//options: php, html. If not define default
>+	$layout = (!isset($_GET['layout']) || ($_GET['layout'] != "php" && $_GET['layout'] != "html")) ? 'default' : $_GET['layout'];
>+	
>+
>+	switch($layout){
>+		case 'html':
>+	?> 
>+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>+      <html xmlns="http://www.w3.org/1999/xhtml">
>+      <head>
>+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
>+      <link rel="stylesheet" href="../default_style.css" />
>+      <title><?php print $pageTitle;?></title></head>
>+      <body>
>+<?php 
>+			break;
>+		case 'php':
>+			print $op;?>
>+      
>+            $pageTitle    = "<?php print $pageTitle;?>";
>+            $pageKeywords = "";
>+            $pageAuthor   = "";
>+		    require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	
>+		    require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	
>+		    require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	
>+		    $App 	= new App();	
>+		    $Nav	= new Nav();	
>+		    $Menu 	= new Menu();		
>+		    include($App->getProjectCommon()); 
>+            $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />');
>+            ob_start();
>+              
>+           <?php  
>+   			print $cl;   		
>+   			break;	
>+		default:
>+			$App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />');
>+			break;			
>+	}?>
>+<style type="text/css">
>+  .container_php, .container_default{
>+    padding:0 20px;
>+  }
>+</style>
>+<div class="container_<?php print $layout;?>">
> <table border="0" cellspacing="5" cellpadding="2" width="100%" > 
> 
> <tr> 
> 
> <td align="left" width="72%"> 
>-<font class="indextop"> Eclipse Project <?php echo $eclipseStream;?>.x Stream Downloads</font> <br /> 
>+<font class="indextop"> Eclipse Project <?php print $eclipseStream;?>.x Stream Downloads</font> <br /> 
> <font class="indexsub">
> Latest downloads from the Eclipse project
> </font><br />
>@@ -55,7 +126,7 @@
> Software User Agreement</a> unless otherwise specified. </p>
> 
> 
>-<p><a href="http://download.eclipse.org/eclipse/downloads/<?php echo $otherIndexFile;?>">Eclipse <?php echo $otherStream;?>.x downloads</a> are available.</p>
>+<p><a href="http://download.eclipse.org/eclipse/downloads/<?php print $otherIndexFile;?>">Eclipse <?php print $otherStream;?>.x downloads</a> are available.</p>
> <p>See the <a href="http://www.eclipse.org/downloads/"> main Eclispe download site for other packages and projects</a>.</p>
> <p>Help out with Eclipse translations - check out the <a href="http://babel.eclipse.org/babel/">Babel project</a>.</p>
> <p>If you prefer, try downloading with the <a href="http://build.eclipse.org/technology/phoenix/torrents/SDK/">SDK Torrents</a> </p>
>@@ -79,7 +150,7 @@
>         // sanity check input
>         if (isset($dirName) && strlen($dirName) > 0) {
>             $firstChar = substr($dirName, 0, 1);
>-            //echo "first char: ".$firstChar;
>+            //print "first char: ".$firstChar;
>             foreach($dropPrefix as $type) {  
>                 if ($firstChar == "$type") {
>                     $result = true;
>@@ -89,7 +160,7 @@
>         }
>     }
>     else {
>-        echo "dropPrefix not defined as expected\n";
>+        print "dropPrefix not defined as expected\n";
>     }
>     return $result;
> }
>@@ -97,7 +168,6 @@
>     // hard code for now the tests ran on one box
>     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706
>     return 1;
>-
>     global $subdirDrops;
>     $testBoxes=array("linux", "macosx", "win32");
>     $length=count($testBoxes);
>@@ -120,7 +190,7 @@
>     global $subdirDrops;
>     // no file name, write empty column
>     if ($fileName == "") {
>-        echo "<td></td>\n";
>+        print "<td></td>\n";
>         return;
>     }
>     // get build name, date and time
>@@ -145,13 +215,13 @@
>     // presumably this particular md5 was choosen since last one made, I'd guess? 
>     //$build_done=file_exists("$dropDir/checksum/swt-$buildName-win32-wce_ppc-arm-j2me.zip.md5");
>     $build_done=file_exists("$dropDir/eclipse-SDK-$buildName-linux-gtk.tar.gz");
>-    echo "<td valign=\"baseline\">\n";
>+    print "<td valign=\"baseline\">\n";
>     // hard code for now the build is done
>     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706
>     // if ($build_done) {
>     if (true) {
>         $boxes=runTestBoxes($fileName);
>-        echo "<a href=\"$dropDir/\"><img border=\"0\" src=\"../images/build_done.gif\" title=\"Build is available\" alt=\"Build is available\" /></a>\n";
>+        print "<a href=\"$dropDir/\"><img border=\"0\" src=\"../images/build_done.gif\" title=\"Build is available\" alt=\"Build is available\" /></a>\n";
>         //$testResults="$dropDir/testresults/xml";
>         //if (file_exists("$testResults")) {
>         switch ($boxes) {
>@@ -160,21 +230,21 @@
>             //if ($diff > 480) {
>             // for now, hard code to "0" since we are not reunning tests
>             if ($diff > 0) { 
>-                echo "<img src=\"../images/caution.gif\" title=\"Regression tests did not run!\" alt=\"Regression tests did not run!\" />\n";
>+                print "<img src=\"../images/caution.gif\" title=\"Regression tests did not run!\" alt=\"Regression tests did not run!\" />\n";
>             } else {
>-                echo "<img src=\"../images/runtests.gif\" title=\"Regression tests are running...\" alt=\"Regression tests are running...\" />\n";
>+                print "<img src=\"../images/runtests.gif\" title=\"Regression tests are running...\" alt=\"Regression tests are running...\" />\n";
>             }
>             break;
> 
>         case 5:
>-            echo "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available\" alt=\"Tests results are available\" /></a>\n";
>+            print "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available\" alt=\"Tests results are available\" /></a>\n";
>             break;
>         default:
>             // if more than 12 hours then consider that the regression tests did not finish
>             if ($diff > 720) {
>-                echo "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available but did not finish on all machines\" alt=\"Tests results are available but did not finish on all machines\" /></a>\n";
>+                print "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available but did not finish on all machines\" alt=\"Tests results are available but did not finish on all machines\" /></a>\n";
>             } else {
>-                echo "<img border=\"0\" src=\"../images/runtests.gif\" title=\"Tests are still running on some machines...\" alt=\"Tests are still running on some machines...\" />\n";
>+                print "<img border=\"0\" src=\"../images/runtests.gif\" title=\"Tests are still running on some machines...\" alt=\"Tests are still running on some machines...\" />\n";
>             }
>         }
>         //break;
>@@ -184,9 +254,9 @@
>     //    $perfsFile="$perfsDir/performance.php";
>     //  if (file_exists("$perfsFile")) {
>     //     if (file_exists("$perfsDir/global.php")) {
>-    //echo "<a href=\"$perfsFile\"><img border=\"0\" src=\"../images/perfs.gif\" title=\"Performance tests are available\" alt=\"Performance tests are available\"/></a>\n";
>+    //print "<a href=\"$perfsFile\"><img border=\"0\" src=\"../images/perfs.gif\" title=\"Performance tests are available\" alt=\"Performance tests are available\"/></a>\n";
>     //    } else {
>-    //        echo "<img src=\"../images/caution.gif\" title=\"Performance tests ran and results should have been generated but unfortunately they are not available!\" alt=\"No Performance tests\"/>\n";
>+    //        print "<img src=\"../images/caution.gif\" title=\"Performance tests ran and results should have been generated but unfortunately they are not available!\" alt=\"No Performance tests\"/>\n";
>     ///   }
>     // } else {
>     //            if (file_exists("$perfsDir/consolelogs")) {
>@@ -197,9 +267,9 @@
>     //            } else {
>     //              $reason="either they were not stored in DB or not generated";
>     //        }
>-    //  echo "<img src=\"../images/caution.gif\" title=\"Performance tests ran but no results are available: $reason!\" alt=\"No Performance Tests\" />\n";
>+    //  print "<img src=\"../images/caution.gif\" title=\"Performance tests ran but no results are available: $reason!\" alt=\"No Performance Tests\" />\n";
>     //} else {
>-    //   echo "<img src=\"../images/runperfs.gif\" title=\"Performance tests are running...\" alt=\"Performance tests are running\" />\n";
>+    //   print "<img src=\"../images/runperfs.gif\" title=\"Performance tests are running...\" alt=\"Performance tests are running\" />\n";
>     // }
>     // }
>     // }
>@@ -208,12 +278,12 @@
>     else {
>         // if more than 5 hours then consider that the build did not finish
>         if ($diff > 300) {
>-            echo "<img src=\"../images/build_failed.gif\" title=\"Build failed!\" alt=\"Build failed!\" />\n";
>+            print "<img src=\"../images/build_failed.gif\" title=\"Build failed!\" alt=\"Build failed!\" />\n";
>         } else {
>-            echo "<img src=\"../images/build_progress.gif\" title=\"Build is in progress...\" alt=\"Build is in progress.\"/>\n";
>+            print "<img src=\"../images/build_progress.gif\" title=\"Build is in progress...\" alt=\"Build failed!\"/>\n";
>         }
>     }
>-    echo "</td>\n";
>+    print "</td>\n";
>     return $buildName;
> }
> ?> 
>@@ -226,7 +296,7 @@
> 
>     if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME" && startsWithDropPrefix($anEntry,$dropPrefix)) {
>         $parts = explode("-", $anEntry);
>-        // echo "<p>an entry: $anEntry\n";
>+        // print "<p>an entry: $anEntry\n";
>         if (count($parts) == 3) {
> 
>             $buckets[$parts[0]][] = $anEntry;
>@@ -289,8 +359,8 @@
>     $prefix=$typeToPrefix[$value];
>     // if empty bucket, do not print this row
>     if (array_key_exists($prefix,$buckets)) {
>-        echo "<tr>\n";
>-        echo "<td width=\"30%\">$value</td>\n";
>+        print "<tr>\n";
>+        print "<td width=\"30%\">$value</td>\n";
> 
> 
>         if (array_key_exists($prefix,$latestFile)) {
>@@ -299,7 +369,7 @@
>         $parts = explode("-", $fileName);
> 
>         // Uncomment the line below if we need click through licenses.
>-        // echo "<td><a href=license.php?license=$subdirDrops/$fileName>$parts[1]</a></td>\n";
>+        // print "<td><a href=license.php?license=$subdirDrops/$fileName>$parts[1]</a></td>\n";
> 
>         // Comment the line below if we need click through licenses.
> 
>@@ -308,13 +378,13 @@
>             $buildName=$parts[1];
>         }
>         if ($fileName == "") {
>-            echo "<td></td>\n";
>+            print "<td></td>\n";
>         } else {
>-            echo "<td><a href=\"$subdirDrops/$fileName/\">$buildName</a></td>\n";
>+            print "<td><a href=\"$subdirDrops/$fileName/\">$buildName</a></td>\n";
>         }
>         $buildName = printBuildColumns($fileName, $parts);
>-        echo "<td>$timeStamps[$fileName]</td>\n";
>-        echo "</tr>\n";
>+        print "<td>$timeStamps[$fileName]</td>\n";
>+        print "</tr>\n";
>     }
> }
> ?> 
>@@ -327,31 +397,31 @@
>     // skip whole section, if bucket is empty
>     if (array_key_exists($prefix,$buckets)) {
> 
>-        echo " <table width=\"100%\" cellspacing=\"0\" cellpadding=\"3\" align=\"center\" >\n";
>+        print " <table width=\"100%\" cellspacing=\"0\" cellpadding=\"3\" align=\"center\" >\n";
>         // header, colored row
>-        echo "<tr bgcolor=\"#999999\">\n";
>+        print "<tr bgcolor=\"#999999\">\n";
>         // name attribute can have no spaces, so we tranlate them to underscores
>         // (could effect targeted links)
>         $valueName=strtr($value,' ','_');
>-        echo "<td align=\"left\" width=\"30%\"><a name=\"$valueName\">\n";
>-        echo "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n";
>-        echo "</font></a></td>\n";
>-        echo "</tr>\n";
>+        print "<td align=\"left\" width=\"30%\"><a name=\"$valueName\">\n";
>+        print "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n";
>+        print "</font></a></td>\n";
>+        print "</tr>\n";
> 
>-        echo "<tr>\n";
>-        echo "<td align=\"left\" >\n";
>-        echo "\n";
>-        echo "\n";
>-        echo "\n";
>-        echo "\n";
>-        echo "<table  width=\"100%\" cellspacing=\"0\" cellpadding=\"4\" >\n";
>-        echo "<tr>\n";
>+        print "<tr>\n";
>+        print "<td align=\"left\" >\n";
>+        print "\n";
>+        print "\n";
>+        print "\n";
>+        print "\n";
>+        print "<table  width=\"100%\" cellspacing=\"0\" cellpadding=\"4\" >\n";
>+        print "<tr>\n";
> 
>-        echo "<th width=\"15%\">Build Name</th>\n";
>-        echo "<th width=\"15%\">Build Status</th>\n";
>-        echo "<th>Build Date</th>\n";
>+        print "<th width=\"15%\">Build Name</th>\n";
>+        print "<th width=\"15%\">Build Status</th>\n";
>+        print "<th>Build Date</th>\n";
> 
>-        echo "</tr>\n";
>+        print "</tr>\n";
> 
>         $aBucket = $buckets[$prefix];
>         if (isset($aBucket)) {
>@@ -359,34 +429,57 @@
>             foreach($aBucket as $innerValue) {
>                 $parts = explode("-", $innerValue);
> 
>-                echo "<tr>\n";
>+                print "<tr>\n";
> 
>                 // Uncomment the line below if we need click through licenses.
>-                // echo "<td><a href=\"license.php?license=$subdirDrops/$innerValue\">$parts[1]</a></td>\n";
>+                // print "<td><a href=\"license.php?license=$subdirDrops/$innerValue\">$parts[1]</a></td>\n";
> 
>                 // Comment the line below if we need click through licenses.
>                 $buildName=$innerValue;
>                 if (count ($parts)==3) {
>-                    echo "<td><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n";
>+                    print "<td><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n";
>                 } else if (count ($parts)==2) {
>-                    echo "<td><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n";
>+                    print "<td><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n";
>                 } else {
>-                    echo "<td>Unexpected numberof parts?</td>\n";
>+                    print "<td>Unexpected numberof parts?</td>\n";
>                 }
> 
>                 $buildName = printBuildColumns($innerValue, $parts);
>-                echo "<td>$timeStamps[$innerValue]</td>\n";
>-                echo "</tr>\n";
>+                print "<td>$timeStamps[$innerValue]</td>\n";
>+                print "</tr>\n";
>             }
>         }
>-        echo "</table>\n";
>-        echo "</td></tr>\n";
>-        echo "</table>\n";
>+        print "</table>\n";
>+        print "</td></tr>\n";
>+        print "</table>\n";
> 
>     }
> }
>-
>-?>  
>-</body>
>-</html>
>+	print '</div>';
>+	$html = ob_get_clean();
>+	
>+	switch($layout){
>+		case 'html':
>+			print $html;
>+			print '</body>';
>+			print '</html>';
>+			break;
>+		
>+		case 'php':            
>+            print $html;
>+            print $op; ?>
>+            
>+            $html = ob_get_clean();
>+            $App->Promotion = FALSE;
>+            $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html);            
>+			
>+			<?php 		
>+			//print $cl;
>+			break;
>+		
>+		default:
>+			$App->Promotion = FALSE;
>+			$App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html);
>+			break;	
>+	}
> 
>diff --git eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat
>index 40c3a8c..4a7f5eb 100644
>--- eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat
>+++ eclipse/buildConfigs/sdk.tests/testScripts/runtests.bat
>@@ -2,7 +2,7 @@
> 
> REM default java executable for outer and test vm
> set vmcmd=java
>-set no_proxy=localhost,dev.eclipse.org,hudson.eclipse.org
>+rem set no_proxy=localhost,dev.eclipse.org,hudson.eclipse.org
> 
> REM reset list of ant targets in test.xml to execute
> set tests=
>@@ -55,9 +55,14 @@
> REM get name of org.eclipse.equinox.launcher_*.jar with version label
> dir /b eclipse\plugins\org.eclipse.equinox.launcher_*.jar>launcher-jar-name.txt
> set /p launcher-jar=<launcher-jar-name.txt
>+
>+rem tried using these as experiements for bug 372880
>+rem https://bugs.eclipse.org/bugs/show_bug.cgi?id=372880
>+rem set /p http.nonProxyHosts="127.0.0.1|localhost|*.localhost|local|*.local|169.254/16|*.169.254/16|eclipse.org|*.eclipse.org|hudson.eclipse.org|*.hudson.eclipse.org|dev.eclipse.org|*.dev.eclipse.org"
>+rem -Dhttp.nonProxyHosts=%http.nonProxyHosts%
> 
>-# -Dtimeout=1800000
>-%vmcmd%  -Dosgi.os=%os% -Dosgi.ws=%ws% -Dosgi.arch=%arch% -jar eclipse\plugins\%launcher-jar% -data workspace -application org.eclipse.ant.core.antRunner -file test.xml %tests% -Dws=%ws% -Dos=%os% -Darch=%arch% -D%installmode%=true %properties% -logger org.apache.tools.ant.DefaultLogger
>+rem -Dtimeout=1800000
>+%vmcmd% -Dosgi.os=%os% -Dosgi.ws=%ws% -Dosgi.arch=%arch% -jar eclipse\plugins\%launcher-jar% -data workspace -application org.eclipse.ant.core.antRunner -file test.xml %tests% -Dws=%ws% -Dos=%os% -Darch=%arch% -D%installmode%=true %properties% -logger org.apache.tools.ant.DefaultLogger
> 
> goto end
> 
>diff --git eclipse/buildConfigs/sdk.tests/testScripts/test.xml eclipse/buildConfigs/sdk.tests/testScripts/test.xml
>index d809bab..5fcab53 100644
>--- eclipse/buildConfigs/sdk.tests/testScripts/test.xml
>+++ eclipse/buildConfigs/sdk.tests/testScripts/test.xml
>@@ -1,1258 +1,7 @@
>-<project
>-    name="Automated Eclipse Testing"
>-    default="all"
>-    basedir=".">
>-
>-	
>-    <property file="test.properties" />
>-
>-	
>-    <property file="label.properties" />
>-
>-	
>-    <property
>-        name="install"
>-        value="${basedir}/test-eclipse" />
>-
>-	
>-    <property
>-        name="platform"
>-        value="${os}.${ws}.${arch}" />
>-
>-	
>-    <property
>-        name="eclipse-home"
>-        value="${install}/eclipse" />
>-
>-    <property
>-        name="repoZip"
>-        value="${basedir}/eclipse-junit-tests-${buildId}.zip" />
>-    <property
>-        name="repoLocation"
>-        value="${basedir}/testRepo" />
>-    <property
>-        name="platformLocation"
>-        value="${basedir}/platformLocation" />
>-
>-	
>-    <property
>-        name="results"
>-        value="${basedir}/results" />
>-
>-	
>-    <property
>-        name="junit-report-output"
>-        value="${results}/${platform}" />
>-	
>-	
>-    <property
>-        name="coverage-output"
>-        value="${results}/coverageIGNORE" />
>-
>-	
>-    <target
>-        name="setup"
>-        unless="noclean"
>-        depends="init">
>-        <condition
>-            property="setupTarget"
>-            value="setup-zip">
>-            <contains
>-                string="${runtimeArchive}"
>-                substring=".zip" />
>-        </condition>
>-        <condition
>-            property="setupTarget"
>-            value="setup-tar.gz">
>-            <contains
>-                string="${runtimeArchive}"
>-                substring=".tar.gz" />
>-        </condition>
>-        <condition
>-            property="repoexists"
>-            value="true">
>-            <available file="${repoLocation}" />
>-        </condition>
>-        <condition
>-            property="extraIU"
>-            value="org.eclipse.equinox.p2.discovery.feature.feature.group">
>-            <equals
>-                arg1="${testPlugin}"
>-                arg2="org.eclipse.equinox.p2.tests.discovery" />
>-        </condition>
>-        <antcall target="setupRepo" />
>-        <antcall target="${setupTarget}" />
>-        <antcall target="configureDeltaPack" />
>-    </target>
>-
>-	
>-    <target
>-        name="setupRepo"
>-        unless="repoexists">
>-        <mkdir dir="${repoLocation}" />
>-        <exec
>-            dir="."
>-            executable="unzip">
>-            <arg line="-o ${repoZip} -d ${repoLocation}" />
>-        </exec>
>-    </target>
>-
>-	
>-    <target
>-        name="setup-zip"
>-        description="Reinstall the test Eclipse installation if specified by user">
>-        <delete dir="${install}" />
>-        <mkdir dir="${install}" />
>-        <exec
>-            dir="."
>-            executable="unzip">
>-            <arg line="-o -qq ${runtimeArchive} -d ${install}" />
>-        </exec>
>-        <antcall target="installExtraPlugins" />
>-        <antcall target="installTestPlugins" />
>-    </target>
>-
>-	
>-    <target
>-        name="setup-tar.gz"
>-        description="Reinstall the test Eclipse installation if specified by user">
>-        <property
>-            name="currentDir"
>-            value="${basedir}" />
>-        <delete dir="${install}" />
>-        <mkdir dir="${install}" />
>-        <exec
>-            dir="${install}"
>-            executable="tar">
>-            <arg line="-xzf ${currentDir}/${runtimeArchive}" />
>-        </exec>
>-        <antcall target="installExtraPlugins" />
>-        <antcall target="installTestPlugins" />
>-    </target>
>-
>-	
>-    <target name="setupPlatform">
>-        <echo message="os.arch ${os.arch}" />
>-        <property file="equinoxp2tests.properties" />
>-        <condition
>-            property="platformArchive"
>-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
>-            <and>
>-                <os family="unix" />
>-                <not>
>-                    <or>
>-                        <or>
>-                            <os arch="x86_64" />
>-                            <os arch="amd64" />
>-                        </or>
>-                        <os family="mac" />
>-                    </or>
>-                </not>
>-            </and>
>-        </condition>
>-        <condition
>-            property="platformArchive"
>-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
>-            <and>
>-                <os family="mac" />
>-                <os family="unix" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="platformArchive"
>-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
>-            <and>
>-                <os family="windows" />
>-                <os arch="x86" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="platformArchive"
>-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
>-            <and>
>-                <os family="windows" />
>-                <os arch="x86_64" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="platformArchive"
>-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
>-            <and>
>-                <os family="unix" />
>-                <or>
>-                    <os arch="x86_64" />
>-                    <os arch="amd64" />
>-                </or>
>-            </and>
>-        </condition>
>-        <condition
>-            property="platformTarget"
>-            value="platform-zip">
>-            <contains
>-                string="${platformArchive}"
>-                substring=".zip" />
>-        </condition>
>-        <condition
>-            property="platformTarget"
>-            value="platform-tar.gz">
>-            <contains
>-                string="${platformArchive}"
>-                substring=".tar.gz" />
>-        </condition>
>-        <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
>-        <antcall target="${platformTarget}" />
>-    </target>
>-
>-
>-	
>-    <target
>-        name="platform-zip"
>-        description="Reinstall the test Eclipse installation if specified by user">
>-        <delete dir="${platformLocation}" />
>-        <mkdir dir="${platformLocation}" />
>-        <exec
>-            dir="${platformLocation}"
>-            executable="unzip">
>-            <arg line="-o -qq ${platformArchive} -d ${platformLocation}" />
>-        </exec>
>-    </target>
>-
>-	
>-    <target
>-        name="platform-tar.gz"
>-        description="Reinstall the test Eclipse installation if specified by user">
>-        <delete dir="${platformLocation}" />
>-        <mkdir dir="${platformLocation}" />
>-        <exec
>-            dir="${platformLocation}"
>-            executable="tar">
>-            <arg line="-xzf ${platformArchive}" />
>-        </exec>
>-    </target>
>-
>-    <target
>-        name="installExtraPlugins"
>-        if="extraIU">
>-        <property file="equinoxp2tests.properties" />
>-        <path id="launcher.paths">
>-            <fileset
>-                dir="${eclipse-home}"
>-                includes="plugins/org.eclipse.equinox.launcher_*" />
>-        </path>
>-        <property
>-            name="launcherPath"
>-            refid="launcher.paths" />
>-
>-        <property
>-            name="currentBuildRepo"
>-            value="${org.eclipse.equinox.p2.tests.current.build.repo}" />
>-        <echo>-installIU ${extraIU} +</echo>
>-        <java
>-            jar="${launcherPath}"
>-            failonerror="false"
>-            dir="${eclipse-home}"
>-            timeout="900000"
>-            fork="true"
>-            output="${basedir}/director.log"
>-            resultproperty="directorcode">
>-            <arg line="-vm ${java.home}/bin/java" />
>-            <arg line="-application org.eclipse.equinox.p2.director" />
>-            <arg line="-consoleLog" />
>-            <arg line="-flavor tooling" />
>-            <arg line="-installIUs ${extraIU}" />
>-            <arg line="-p2.os ${os}" />
>-            <arg line="-p2.ws ${ws}" />
>-            <arg line="-p2.arch ${arch}" />
>-            <arg line="-roaming" />
>-            <arg line="-profile SDKProfile" />
>-            <arg line="-repository ${currentBuildRepo}" />
>-            <arg line="-destination ${eclipse-home}" />
>-            <arg line="-bundlepool ${eclipse-home}" />
>-        </java>
>-    </target>
>-
>-    <target name="installTestPlugins">
>-        <path id="launcher.paths">
>-            <fileset
>-                dir="${eclipse-home}"
>-                includes="plugins/org.eclipse.equinox.launcher_*" />
>-        </path>
>-        <property
>-            name="launcherPath"
>-            refid="launcher.paths" />
>-        <antcall target="setupPlatform" />
>-        <echo>-installIU ${testPlugin} +</echo>
>-        <java
>-            jar="${launcherPath}"
>-            failonerror="false"
>-            dir="${eclipse-home}"
>-            timeout="900000"
>-            fork="true"
>-            output="${basedir}/director.log"
>-            resultproperty="directorcode">
>-            <arg line="-vm ${java.home}/bin/java" />
>-            <arg line="-application org.eclipse.equinox.p2.director" />
>-            <arg line="-consoleLog" />
>-            <arg line="-flavor tooling" />
>-            <arg
>-                line="-installIUs ${testPlugin},org.eclipse.test,org.eclipse.ant.optional.junit,org.eclipse.test.performance,org.eclipse.test.performance.win32,org.easymock" />
>-            <arg line="-p2.os ${os}" />
>-            <arg line="-p2.ws ${ws}" />
>-            <arg line="-p2.arch ${arch}" />
>-            <arg line="-roaming" />
>-            <arg line="-profile SDKProfile" />
>-            <arg line="-repository file:${repoLocation}" />
>-            <arg line="-destination ${eclipse-home}" />
>-            <arg line="-bundlepool ${eclipse-home}" />
>-        </java>
>-        <antcall target="configureTeamTest" />
>-        <antcall target="unzipderby" />
>-    </target>
>-
>-
>-    <target
>-        name="unzipderby"
>-        if="derby">
>-        <exec
>-            dir="."
>-            executable="unzip">
>-            <arg line="-o eclipse-junit-tests-*.zip ${derby} -d ${install}" />
>-        </exec>
>-        <copy todir="${install}/eclipse/dropins/eclipse/plugins">
>-            <fileset
>-                dir="${repoLocation}/eclipse/dropins/eclipse/plugins"
>-                includes="org.apache.derby**/*" />
>-        </copy>
>-    </target>
>-
>-    <target
>-        name="init"
>-        depends="setRuntimeArchive">
>-        <mkdir dir="${results}/xml" />
>-        <mkdir dir="${results}/html" />
>-        <mkdir dir="${junit-report-output}" />
>-		
>-        <exec
>-            dir="${basedir}"
>-            executable="chflags"
>-            os="Mac OS X">
>-            <arg line="-R nouchg ${install}" />
>-        </exec>
>-    </target>
>-
>-    <target name="setRuntimeArchive">
>-        <echo message="setRuntimeArchive os ${os} ws ${ws} arch ${arch}" />
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-win32.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="win32" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="win32" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-win32-x86_64.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="win32" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="win32" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86_64" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-linux-gtk.tar.gz">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="linux" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-linux-gtk-ppc64.tar.gz">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="linux" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="ppc64" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="linux" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86_64" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-macosx-cocoa-ppc.tar.gz">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="macosx" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="cocoa" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="ppc" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="macosx" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="cocoa" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="macosx" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="cocoa" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86_64" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-hpux-gtk.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="hpux" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="ia64_32" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-solaris-gtk.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="solaris" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="sparc" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-solaris-gtk-x86.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="solaris" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="x86" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-aix-gtk-ppc.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="aix" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="ppc" />
>-            </and>
>-        </condition>
>-        <condition
>-            property="runtimeArchive"
>-            value="eclipse-SDK-${buildId}-aix-gtk-ppc64.zip">
>-            <and>
>-                <equals
>-                    arg1="${os}"
>-                    arg2="aix" />
>-                <equals
>-                    arg1="${ws}"
>-                    arg2="gtk" />
>-                <equals
>-                    arg1="${arch}"
>-                    arg2="ppc64" />
>-            </and>
>-        </condition>
>-        <echo message="runtimeArchive ${runtimeArchive} !!! " />
>-    </target>
>-
>-    <target
>-        name="setJVMProperties"
>-        depends="setJVMfromUserSpecified">
>-		
>-        <condition
>-            property="J2SE-5.0"
>-            value="${java.home}/bin/java">
>-            <or>
>-                <or>
>-                    <equals
>-                        arg1="${ant.java.version}"
>-                        arg2="1.5" />
>-                    <equals
>-                        arg1="${ant.java.version}"
>-                        arg2="1.6" />
>-                </or>
>-                <equals
>-                    arg1="${ant.java.version}"
>-                    arg2="1.7" />
>-            </or>
>-        </condition>
>-        <condition
>-            property="J2SE-6.0"
>-            value="${java.home}/bin/java">
>-            <or>
>-                <equals
>-                    arg1="${ant.java.version}"
>-                    arg2="1.6" />
>-                <equals
>-                    arg1="${ant.java.version}"
>-                    arg2="1.7" />
>-            </or>
>-        </condition>
>-        <condition
>-            property="J2SE-7.0"
>-            value="${java.home}/bin/java">
>-            <equals
>-                arg1="${ant.java.version}"
>-                arg2="1.7" />
>-        </condition>
>-    </target>
>-    <target
>-        name="setJVMfromUserSpecified"
>-        if="jvm">
>-        <exec
>-            executable="${jvm}"
>-            outputproperty="javaversion">
>-            <arg line="-version" />
>-        </exec>
>-        <echo message="java version of ${jvm} is ${javaversion}" />
>-        <condition
>-            property="J2SE-7.0"
>-            value="${jvm}">
>-            <contains
>-                string="${javaversion}"
>-                substring="java version &quot;1.7" />
>-        </condition>
>-        <condition
>-            property="J2SE-6.0"
>-            value="${jvm}">
>-            <or>
>-                <contains
>-                    string="${javaversion}"
>-                    substring="java version &quot;1.6" />
>-                <contains
>-                    string="${javaversion}"
>-                    substring="java version &quot;1.7" />
>-            </or>
>-        </condition>
>-        <condition
>-            property="J2SE-5.0"
>-            value="${jvm}">
>-            <or>
>-                <or>
>-                    <contains
>-                        string="${javaversion}"
>-                        substring="java version &quot;1.7" />
>-                    <contains
>-                        string="${javaversion}"
>-                        substring="java version &quot;1.6" />
>-                </or>
>-                <contains
>-                    string="${javaversion}"
>-                    substring="java version &quot;1.5" />
>-            </or>
>-        </condition>
>-        <echo message="J2SE-7.0:  ${J2SE-7.0}" />
>-        <echo message="J2SE-6.0:  ${J2SE-6.0}" />
>-        <echo message="J2SE-5.0:  ${J2SE-5.0}" />
>-    </target>
>-    <target
>-        name="configureTeamTest"
>-        if="teamcvs">
>-		
>-        <replace
>-            file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties"
>-            token="@user@"
>-            value="${cvs_user}" />
>-        <replace
>-            file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties"
>-            token="@password@"
>-            value="${cvs_password}" />
>-        <replace
>-            file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties"
>-            token="@host@"
>-            value="${cvs_host}" />
>-        <replace
>-            file="${eclipse-home}/plugins/${org.eclipse.team.tests.cvs.core}/repository.properties"
>-            token="@root@"
>-            value="${cvs_root}" />
>-    </target>
>-
>-    <target
>-        name="configureDeltaPack"
>-        if="pdebuild">
>-        <property
>-            name="deltapackArchive"
>-            value="eclipse-${buildId}-delta-pack.zip" />
>-        <property
>-            name="installDeltapack"
>-            value="${install}/deltapack" />
>-        <mkdir dir="${installDeltapack}" />
>-        <exec
>-            dir="."
>-            executable="unzip">
>-            <arg line="-o -qq ${deltapackArchive} -d ${installDeltapack}" />
>-        </exec>
>-    </target>
>-
>-
>-    <macrodef name="runTests">
>-        <attribute name="testPlugin" />
>-        <sequential>
>-
>-			
>-			
>-
>-            <condition
>-                property="performance.target.present"
>-                value="true">
>-                <isset property="@{testPlugin}.has.performance.target" />
>-            </condition>
>-
>-			
>-            <property
>-                name="test.target"
>-                value="junit" />
>-            <property
>-                name="report"
>-                value="@{testPlugin}" />
>-
>-			
>-            <condition
>-                property="derby"
>-                value="eclipse/dropins/eclipse/plugins/org.apache.derby*/**">
>-                <equals
>-                    arg1="${test.target}"
>-                    arg2="performance" />
>-            </condition>
>-			
>-			
>-            <antcall target="${test.target}">
>-                <param
>-                    name="testPlugin"
>-                    value="@{testPlugin}" />
>-                <param
>-                    name="output-file"
>-                    value="@{testPlugin}.xml" />
>-            </antcall>
>-        </sequential>
>-    </macrodef>
>-
>-    <target
>-        name="junit"
>-        unless="skip.test">
>-        <antcall target="setup">
>-        </antcall>
>-        <property file="finalPluginsVersions.properties" />
>-        <property
>-            name="library-file"
>-            value="${basedir}/test-eclipse/eclipse/plugins/org.eclipse.test_${org.eclipse.test}/library.xml" />
>-        <property
>-            name="junit-stylesheet"
>-            value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" />
>-        <echo>trying to find ${testPlugin}_*</echo>
>-        <fileset
>-            id="test.plugin.file"
>-            dir="${eclipse-home}/plugins">
>-            <filename name="${testPlugin}_*/test.xml" />
>-        </fileset>
>-        <property
>-            name="testPluginX"
>-            refid="test.plugin.file" />
>-        <echo>trying to find ${testPluginX}</echo>
>-        <condition
>-            property="pluginexists"
>-            value="true">
>-            <not>
>-                <equals
>-                    arg1="${testPluginX}"
>-                    arg2="" />
>-            </not>
>-        </condition>
>-        <antcall target="runSuite" />
>-        <antcall target="genResults" />
>-    </target>
>-
>-    <target
>-        name="runSuite"
>-        if="pluginexists">
>-        <ant
>-            antfile="${eclipse-home}/plugins/${testPluginX}"
>-            dir="${eclipse-home}" />
>-    </target>
>-
>-
>-    <target
>-        name="runSuitePerf"
>-        if="pluginexists">
>-        <echo message="testPluginX ${testPluginX}" />
>-        <property
>-            name="junit-stylesheet"
>-            value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" />
>-        <ant
>-            antfile="${eclipse-home}/plugins/${testPluginX}"
>-            dir="${eclipse-home}"
>-            target="performance" />
>-    </target>
>-
>-    <target
>-        name="performance"
>-        if="performance.target.present"
>-        unless="skip.test">
>-        <antcall target="setup" />
>-        <property file="finalPluginsVersions.properties" />
>-        <property
>-            name="library-file"
>-            value="${basedir}/test-eclipse/eclipse/plugins/org.eclipse.test_${org.eclipse.test}/library.xml" />
>-
>-        <echo>trying to find ${testPlugin}_*</echo>
>-        <fileset
>-            id="test.plugin.file"
>-            dir="${eclipse-home}/plugins">
>-            <filename name="${testPlugin}_*/test.xml" />
>-        </fileset>
>-        <property
>-            name="testPluginX"
>-            refid="test.plugin.file" />
>-        <echo>trying to find ${testPluginX}</echo>
>-        <condition
>-            property="pluginexists"
>-            value="true">
>-            <not>
>-                <equals
>-                    arg1="${testPluginX}"
>-                    arg2="" />
>-            </not>
>-        </condition>
>-        <antcall target="runSuitePerf" />
>-        <antcall target="genResults" />
>-    </target>
>-
>-    <target name="genResults">
>-        <copy
>-            file="${eclipse-home}/${report}.xml"
>-            tofile="${results}/xml/${report}_${platform}.xml"
>-            failonerror="false" />
>-        <property
>-            name="junit-stylesheet"
>-            value="${eclipse-home}/plugins/org.eclipse.test_${org.eclipse.test}/JUNIT.XSL" />
>-        <xslt
>-            style="${junit-stylesheet}"
>-            basedir="${results}/xml"
>-            destdir="${results}/html" />
>-    </target>
>-
>-    <target name="ant">
>-        <runTests testPlugin="org.eclipse.ant.tests.core" />
>-    </target>
>-
>-    <target name="antui">
>-        <runTests testPlugin="org.eclipse.ant.tests.ui" />
>-    </target>
>-
>-    <target name="compare">
>-        <runTests testPlugin="org.eclipse.compare.tests" />
>-    </target>
>-
>-    <target name="equinoxds">
>-        <runTests testPlugin="org.eclipse.equinox.ds.tests" />
>-    </target>
>-
>-    <target name="debug">
>-        <runTests testPlugin="org.eclipse.debug.tests" />
>-    </target>
>-
>-    <target name="coreresources">
>-        <runTests testPlugin="org.eclipse.core.tests.resources" />
>-    </target>
>-
>-    <target name="coreruntime">
>-        <runTests testPlugin="org.eclipse.core.tests.runtime" />
>-    </target>
>-
>-    <target name="osgi">
>-        <runTests testPlugin="org.eclipse.osgi.tests" />
>-    </target>
>-
>-    <target name="coreexpressions">
>-        <runTests testPlugin="org.eclipse.core.expressions.tests" />
>-    </target>
>-
>-    <target name="ltkuirefactoringtests">
>-        <runTests testPlugin="org.eclipse.ltk.ui.refactoring.tests" />
>-    </target>
>-
>-    <target name="ltkcorerefactoringtests">
>-        <runTests testPlugin="org.eclipse.ltk.core.refactoring.tests" />
>-    </target>
>-
>-    <target name="text">
>-        <runTests testPlugin="org.eclipse.text.tests" />
>-    </target>
>-
>-    <target name="jface">
>-        <runTests testPlugin="org.eclipse.jface.text.tests" />
>-    </target>
>-
>-    <target name="jfacedatabinding">
>-        <runTests testPlugin="org.eclipse.jface.tests.databinding" />
>-    </target>
>-
>-    <target name="filebuffers">
>-        <runTests testPlugin="org.eclipse.core.filebuffers.tests" />
>-    </target>
>-
>-    <target
>-        name="jdttext"
>-        unless="skip.jdttext">
>-        <runTests testPlugin="org.eclipse.jdt.text.tests" />
>-    </target>
>-
>-    <target
>-        name="relEng"
>-        depends="setRuntimeArchive">
>-        <runTests testPlugin="org.eclipse.releng.tests" />
>-        <move
>-            todir="${results}/chkpii"
>-            includeEmptyDirs="no"
>-            failonerror="false">
>-            <fileset dir="${results}/chkpii" />
>-            <mapper
>-                type="glob"
>-                from="*"
>-                to="${platform}_*" />
>-        </move>
>-    </target>
>-
>-    <target name="ua">
>-        <runTests testPlugin="org.eclipse.ua.tests" />
>-    </target>
>-
>-    <target name="uadoc">
>-        <runTests testPlugin="org.eclipse.ua.tests.doc" />
>-    </target>
>-
>-    <target name="coretestsnet">
>-        <runTests testPlugin="org.eclipse.core.tests.net" />
>-    </target>
>-
>-    <target
>-        name="jdtcorecompiler"
>-        depends="setJVMProperties">
>-        <condition
>-            property="jvm"
>-            value="${J2SE-5.0}">
>-            <isset property="J2SE-5.0" />
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.core.tests.compiler" />
>-    </target>
>-
>-    <target
>-        name="jdtapt"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-5.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <isset property="J2SE-5.0" />
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.apt.tests" />
>-    </target>
>-
>-    <target
>-        name="jdtaptpluggable"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-6.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <or>
>-                    <isset property="J2SE-6.0" />
>-                    <isset property="J2SE-7.0" />
>-                </or>
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.apt.pluggable.tests" />
>-    </target>
>-
>-
>-    <target
>-        name="jdtcorebuilder"
>-        depends="setJVMProperties">
>-		
>-        <condition
>-            property="jvm"
>-            value="${J2SE-5.0}">
>-            <isset property="J2SE-5.0" />
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.core.tests.builder" />
>-    </target>
>-
>-    <target
>-        name="jdtcompilertool"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-6.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <or>
>-                    <isset property="J2SE-6.0" />
>-                    <isset property="J2SE-7.0" />
>-                </or>
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.compiler.tool.tests" />
>-    </target>
>-
>-    <target
>-        name="jdtcompilerapt"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-6.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <or>
>-                    <isset property="J2SE-6.0" />
>-                    <isset property="J2SE-7.0" />
>-                </or>
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.compiler.apt.tests" />
>-    </target>
>-
>-    <target
>-        name="jdtcoremodel"
>-        depends="setJVMProperties">
>-        <condition
>-            property="jvm"
>-            value="${J2SE-5.0}">
>-            <isset property="J2SE-5.0" />
>-        </condition>
>-        <runTests testPlugin="org.eclipse.jdt.core.tests.model" />
>-    </target>
>-
>-    <target name="jdtcoreperf">
>-        <runTests testPlugin="org.eclipse.jdt.core.tests.performance" />
>-    </target>
>-
>-    <target name="jdtdebug">
>-        <runTests testPlugin="org.eclipse.jdt.debug.tests" />
>-    </target>
>-
>-    <target name="jdtui">
>-        <runTests testPlugin="org.eclipse.jdt.ui.tests" />
>-    </target>
>-
>-    <target name="jdtuirefactoring">
>-        <runTests testPlugin="org.eclipse.jdt.ui.tests.refactoring" />
>-    </target>
>-
>-    <target name="pdeui">
>-        <runTests testPlugin="org.eclipse.pde.ui.tests" />
>-    </target>
>-
>-    <target name="pdebuild">
>-        <property
>-            name="pdebuild"
>-            value="true" />
>-        <runTests testPlugin="org.eclipse.pde.build.tests" />
>-    </target>
>-
>-    <target name="swt">
>-        <runTests testPlugin="org.eclipse.swt.tests" />
>-    </target>
>-
>-    <target name="teamcore">
>-        <runTests testPlugin="org.eclipse.team.tests.core" />
>-    </target>
>-
>-    <target name="teamcvs">
>-        <property
>-            name="teamcvs"
>-            value="true" />
>-        <runTests testPlugin="org.eclipse.team.tests.cvs.core" />
>-    </target>
>-
>-    <target name="ui">
>-        <runTests testPlugin="org.eclipse.ui.tests" />
>-    </target>
>-
>-    <target name="uinavigator">
>-        <runTests testPlugin="org.eclipse.ui.tests.navigator" />
>-    </target>
>-
>-    <target name="uircp">
>-        <runTests testPlugin="org.eclipse.ui.tests.rcp" />
>-    </target>
>-
>-    <target name="uiforms">
>-        <runTests testPlugin="org.eclipse.ui.tests.forms" />
>-    </target>
>-
>-    <target name="uieditors">
>-        <runTests testPlugin="org.eclipse.ui.editors.tests" />
>-    </target>
>-
>-    <target name="uiperformance">
>-        <runTests testPlugin="org.eclipse.ui.tests.performance" />
>-    </target>
>-
>-    <target name="uiviews">
>-        <runTests testPlugin="org.eclipse.ui.tests.views.properties.tabbed" />
>-    </target>
>-
>-    <target name="uiworkbenchtexteditor">
>-        <runTests testPlugin="org.eclipse.ui.workbench.texteditor.tests" />
>-    </target>
>-
>-    <target name="update">
>-        <runTests testPlugin="org.eclipse.update.tests.core" />
>-    </target>
>-
>-    <target
>-        name="pdeapitooling"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-5.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <isset property="J2SE-5.0" />
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.pde.api.tools.tests" />
>-    </target>
>-
>-    <target name="equinoxsecurity">
>-        <runTests testPlugin="org.eclipse.equinox.security.tests" />
>-    </target>
>-
>-    <target
>-        name="equinoxp2"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-5.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <isset property="J2SE-5.0" />
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.equinox.p2.tests" />
>-    </target>
>-
>-    <target
>-        name="equinoxp2ui"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-5.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <isset property="J2SE-5.0" />
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.equinox.p2.tests.ui" />
>-    </target>
>-
>-    <target
>-        name="equinoxp2discovery"
>-        depends="setJVMProperties">
>-        <property
>-            name="jvm"
>-            value="${J2SE-5.0}" />
>-		
>-        <condition property="skip.test">
>-            <not>
>-                <isset property="J2SE-5.0" />
>-            </not>
>-        </condition>
>-        <runTests testPlugin="org.eclipse.equinox.p2.tests.discovery" />
>-    </target>
>-
>-    <target name="search">
>-        <runTests testPlugin="org.eclipse.search.tests" />
>-    </target>
>-
>-    <target name="pdeds">
>-        <runTests testPlugin="org.eclipse.pde.ds.tests" />
>-    </target>
>-
>-    <target name="bidi">
>-        <runTests testPlugin="org.eclipse.equinox.bidi.tests" />
>-    </target>
>-
>-
>-
>-
>-
>-    <target name="all">
>-        <antcall target="relEng" />
>-
>-
>-
>-        <antcall target="equinoxp2" />
>-        <antcall target="equinoxp2ui" />
>-        <antcall target="pdeui" />
>-        
>-        <antcall target="jdtcompilertool" />
>-        <antcall target="jdtcompilerapt" />
>-        <antcall target="jdttext" />
>-      
>-        <antcall target="ant" />
>-        <antcall target="compare" />
>-
>-        <antcall target="coreruntime" />
>-        <antcall target="coreresources" />
>-        <antcall target="osgi" />
>-        <antcall target="coreexpressions" />
>-
>-        <antcall target="teamcore" />
>-       
>-	 
>-        <antcall target="jdtcoreperf" />
>-        <antcall target="jdtcorebuilder" />
>-        <antcall target="jdtcorecompiler" />
>-	
>-        <antcall target="uiperformance" />
>-        <antcall target="uieditors" />
>-        <antcall target="uinavigator" />
>-        <antcall target="uiworkbenchtexteditor" />
>-        <antcall target="uircp" />
>-        <antcall target="uiviews" />
>-     
>-        <antcall target="jdtdebug" />
>-        <antcall target="jdtui" />
>-        <antcall target="jdtuirefactoring" />
>-        <antcall target="ltkuirefactoringtests" />
>-        <antcall target="ltkcorerefactoringtests" />
>-
>-        <antcall target="text" />
>-        <antcall target="jface" />
>-        <antcall target="jfacedatabinding" />
>-        <antcall target="filebuffers" />
>-        <antcall target="antui" />
>-        <antcall target="coretestsnet" />
>-
>-        <antcall target="jdtapt" />
>-
>-        <antcall target="pdebuild" />
>-        <antcall target="jdtaptpluggable" />
>-        <antcall target="ua" />
>-        <antcall target="uiforms" />
>-        <antcall target="pdeapitooling" />
>-        <antcall target="equinoxsecurity" />
>-        <antcall target="search" />
>-        <antcall target="pdeds" />
>-       
>-        <antcall target="jdtcoremodel" />
>-     
>-        <antcall target="uadoc" />
>-        <antcall target="debug" />
>-        <antcall target="ui" />
>-        <antcall target="swt" />
>-        
>-        <antcall target="teamcvs" />
>-
>-        <antcall target="equinoxds" />
>-        <antcall target="equinoxp2discovery" />
>-        <antcall target="bidi" />
>-
>-    </target>
>-</project>
>-
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>diff --git eclipse/publishingFiles/staticDropFiles/buildNotes.php eclipse/publishingFiles/staticDropFiles/buildNotes.php
>index e3f2dd2..7df68bd 100644
>--- eclipse/publishingFiles/staticDropFiles/buildNotes.php
>+++ eclipse/publishingFiles/staticDropFiles/buildNotes.php
>@@ -56,7 +56,7 @@
>     if ($hasNotes) {
>        echo "</ul>\n";
>     }
>-    echo "<p>Build notes (if any) are used to notify the community of notable, but temporary, issues or changes in a particular build.</p>";
>+    echo "<p>Build notes (if any) are used to notify the community of notable issues or changes in a particular build.</p>";
>     echo "<p>Committers, to include build notes for your component, add a file with the pattern buildnotes_&lt;component-name&gt;.html to the root of one of your bundle's source tree.</p>";
> 
>     aDirectory.closedir();
>diff --git eclipse/publishingFiles/templateFiles/testResults.php.template eclipse/publishingFiles/templateFiles/testResults.php.template
>index 89b9859..37c2235 100644
>--- eclipse/publishingFiles/templateFiles/testResults.php.template
>+++ eclipse/publishingFiles/templateFiles/testResults.php.template
>@@ -3,6 +3,7 @@
> <?php
> //ini_set("display_errors", "true");
> //error_reporting (E_ALL);
>+include 'buildProperties.php';
> if (array_key_exists("SERVER_NAME", $_SERVER)) {
>     $servername = $_SERVER["SERVER_NAME"];
>     if ($servername === "build.eclipse.org") {
>@@ -181,9 +182,10 @@
> echo " <li><a href=\"apitools/apifilters-$buildName.zip\"><b>Zip of .api_filters files used in the build</b></a></li>";
> ?>
> <?php
>-if (! (preg_match("/N/i",$buildName))) {
>-    echo"<li>Cvs tag v$buildName of org.eclipse.releng.eclipsebuilder and org.eclipse.releng.basebuilder was used to create this build.</li> ";
>-}
>+
>+    echo"<li>org.eclipse.releng.eclipsebuilder: $eclipsebuilderBranch</li> ";
>+    echo"<li>org.eclipse.releng.basebuilder: $basebuilderBranch</li> ";
>+
> ?>
> </div>
> 
>diff --git extras/pack.properties extras/pack.properties
>index 5fa7783..9806ba2 100644
>--- extras/pack.properties
>+++ extras/pack.properties
>@@ -1,3 +1,3 @@
> pack200.default.args=-E4
>-pack.excludes=content.jar,artifacts.jar,plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar,plugins/org.eclipse.ecf.source_3.1.300.v20120319-0616.jar,plugins/org.eclipse.ecf.ssl_1.0.100.v20120319-0616.jar,plugins/org.eclipse.ecf.ssl.source_1.0.100.v20120319-0616.jar,plugins/org.eclipse.ecf.identity_3.1.200.v20120319-0616.jar,plugins/org.eclipse.ecf.identity.source_3.1.200.v20120319-0616.jar,plugins/org.eclipse.ecf.filetransfer_5.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.filetransfer.source_5.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer_3.2.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.source_3.2.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.200.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20120319-0616.jar,@excludejars@
>-sign.excludes=content.jar,artifacts.jar,plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar,plugins/org.eclipse.ecf.source_3.1.300.v20120319-0616.jar,plugins/org.eclipse.ecf.ssl_1.0.100.v20120319-0616.jar,plugins/org.eclipse.ecf.ssl.source_1.0.100.v20120319-0616.jar,plugins/org.eclipse.ecf.identity_3.1.200.v20120319-0616.jar,plugins/org.eclipse.ecf.identity.source_3.1.200.v20120319-0616.jar,plugins/org.eclipse.ecf.filetransfer_5.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.filetransfer.source_5.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer_3.2.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.source_3.2.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.200.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120319-0616.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20120319-0616.jar,@excludejars@
>\ No newline at end of file
>+pack.excludes=content.jar,artifacts.jar,plugins/org.eclipse.ecf_3.1.300.v20120608-0148.jar,plugins/org.eclipse.ecf.source_3.1.300.v20120608-0148.jar,plugins/org.eclipse.ecf.ssl_1.0.100.v20120608-0148.jar,plugins/org.eclipse.ecf.ssl.source_1.0.100.v20120608-0148.jar,plugins/org.eclipse.ecf.identity_3.1.200.v20120608-0148.jar,plugins/org.eclipse.ecf.identity.source_3.1.200.v20120608-0148.jar,plugins/org.eclipse.ecf.filetransfer_5.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.filetransfer.source_5.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer_3.2.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.source_3.2.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.200.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20120608-0148.jar,@excludejars@
>+sign.excludes=content.jar,artifacts.jar,plugins/org.eclipse.ecf_3.1.300.v20120608-0148.jar,plugins/org.eclipse.ecf.source_3.1.300.v20120608-0148.jar,plugins/org.eclipse.ecf.ssl_1.0.100.v20120608-0148.jar,plugins/org.eclipse.ecf.ssl.source_1.0.100.v20120608-0148.jar,plugins/org.eclipse.ecf.identity_3.1.200.v20120608-0148.jar,plugins/org.eclipse.ecf.identity.source_3.1.200.v20120608-0148.jar,plugins/org.eclipse.ecf.filetransfer_5.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.filetransfer.source_5.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer_3.2.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.source_3.2.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.200.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120608-0148.jar,plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20120608-0148.jar,@excludejars@
>\ No newline at end of file
>diff --git runTests2.xml runTests2.xml
>index e6adbfa..d4f22e8 100644
>--- runTests2.xml
>+++ runTests2.xml
>@@ -159,7 +159,7 @@
>              -->
>         <retry retrycount="20">
>             <sequential>
>-                <sleep minutes="1" />
>+                <sleep minutes="3" />
>                 <get
>                     verbose="true"
>                     httpusecaches="false"
>@@ -169,7 +169,7 @@
>         </retry>
>         <retry retrycount="20">
>             <sequential>
>-                <sleep minutes="1" />
>+                <sleep minutes="3" />
>                 <get
>                     httpusecaches="false"
>                     src="${archiveLocation}/eclipse-${buildId}-delta-pack.zip"
>@@ -178,7 +178,7 @@
>         </retry>
>         <retry retrycount="20">
>             <sequential>
>-                <sleep minutes="1" />
>+                <sleep minutes="3" />
>                 <get
>                     httpusecaches="false"
>                     src="${archiveLocation}/eclipse-Automated-Tests-${buildId}.zip"
>diff --git scripts/masterBuild.sh scripts/masterBuild.sh
>index 2beba26..42c626e 100644
>--- scripts/masterBuild.sh
>+++ scripts/masterBuild.sh
>@@ -709,7 +709,12 @@
> # echo "testing initial setup only, exiting early"
> # exit 127
> 
>-
>+# make sure exists, before we write a file there
>+mkdir -p $buildResults
>+echo "<?php " > ${buildResults}/buildProperties.php 
>+echo "\$basebuilderBranch='${basebuilderBranch}';" >> ${buildResults}/buildProperties.php
>+echo "\$eclipsebuilderBranch='${eclipsebuilderBranch}';" >> $buildResults/buildProperties.php
>+echo "?>" >> $buildResults/buildProperties.php
> 
> updateBaseBuilder
> checkForErrorExit $? "Failed while updating Base Buidler"
>diff --git scripts/promotionRelated/milestonePromotionRelated/createEquinoxPromotionScriptFunction.sh scripts/promotionRelated/milestonePromotionRelated/createEquinoxPromotionScriptFunction.sh
>new file mode 0
>index 0000000..559e576 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/createEquinoxPromotionScriptFunction.sh
>@@ -0,0 +1,52 @@
>+#!/usr/bin/env bash
>+
>+function createPromotionScriptEq () {
>+
>+buildId=$1
>+if [[ -z "${buildId}" ]]
>+then 
>+    echo "ERROR: this function requires buildId or label to promote"
>+    exit 1
>+fi
>+
>+scriptName="promote-${buildId}.sh"
>+
>+# remember, there is no 'downloads' segment in equinox locations, 
>+# unlike the eclipse locations
>+buildRoot=/shared/eclipse/eclipse4I
>+siteDir=${buildRoot}/siteDir
>+equinoxPostingDirectory=${siteDir}/equinox/drops
>+
>+# The 'workLocation' provides a handy central place to have the 
>+# promote script, and log results. ASSUMING this works for all 
>+# types of builds, etc (which is the goal for the sdk promotions).
>+workLocationEquinox=/shared/eclipse/equinox/promotion
>+
>+# the cron job must know about and use this same 
>+# location to look for its promotions scripts. (i.e. implicite tight coupling)
>+promoteScriptLocationEquinox=${workLocationEquinox}/queue
>+
>+# directory should normally exist -- best to create with committer's ID --
>+# but in case not
>+mkdir -p "${promoteScriptLocationEquinox}"
>+
>+eqFromDir=${equinoxPostingDirectory}/${buildId}
>+eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/"
>+
>+# Note: for proper mirroring at Eclispe, we probably do not want/need to 
>+# maintain "times" on build machine, but let them take times at time of copying. 
>+# If it turns out to be important to maintain times (such as ran more than once, 
>+# to pick up a "more" output, such as test results, then add -t to rsync
>+# Similarly, if download server is set up right, it will end up with the 
>+# correct permissions, but if not, we may need to set some permissions first, 
>+# then use -p on rsync
>+
>+# Here is content of promtion script (note, use same ptimestamp created above):
>+echo "#!/usr/bin/env bash" >  ${promoteScriptLocationEquinox}/${scriptName}
>+echo "# promotion script created at $ptimestamp" >>  ${promoteScriptLocationEquinox}/${scriptName}
>+echo "rsync --recursive \"${eqFromDir}\" \"${eqToDir}\"" >> ${promoteScriptLocationEquinox}/${scriptName}
>+
>+# we restrict "others" rights for a bit more security or safety from accidents
>+chmod -v ug=rwx,o-rwx ${promoteScriptLocationEquinox}/${scriptName}
>+
>+}
>diff --git scripts/promotionRelated/milestonePromotionRelated/promoteDropSite38.sh scripts/promotionRelated/milestonePromotionRelated/promoteDropSite38.sh
>new file mode 0
>index 0000000..98f66e5 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/promoteDropSite38.sh
>@@ -0,0 +1,31 @@
>+#!/usr/bin/env bash
>+
>+DROP_ID=I20120531-0600
>+DL_LABEL=3.8RC3
>+BUILD_TIMESTAMP=${DROP_ID//[I-]/}
>+DL_DROP_ID=S-${DL_LABEL}-${BUILD_TIMESTAMP}
>+
>+source updateIndexFilesFunction.sh
>+
>+DL_SITE_PATH=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/
>+
>+cd /opt/public/eclipse/eclipse3I/siteDir/eclipse/downloads/drops
>+echo "PWD: ${PWD}"
>+cp /opt/public/eclipse/sdk/renameBuild.sh .
>+
>+echo "save temp backup"
>+rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG
>+
>+echo "rename ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL}"
>+./renameBuild.sh ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL}
>+
>+echo "rsync ${DL_DROP_ID} to ${DL_SITE_PATH}"
>+rsync -r ${DL_DROP_ID} ${DL_SITE_PATH}
>+
>+updateIndex 3
>+
>+echo "move backup back to original"
>+mv ${DROP_ID}ORIG ${DROP_ID}
>+
>+rm renameBuild.sh 
>+
>diff --git scripts/promotionRelated/milestonePromotionRelated/promoteDropSite42.sh scripts/promotionRelated/milestonePromotionRelated/promoteDropSite42.sh
>new file mode 0
>index 0000000..62b91a7 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/promoteDropSite42.sh
>@@ -0,0 +1,34 @@
>+#!/usr/bin/env bash
>+
>+#
>+#
>+
>+DROP_ID=I20120531-1500
>+DL_LABEL=4.2RC3
>+
>+BUILD_TIMESTAMP=${DROP_ID//[I-]/}
>+DL_DROP_ID=S-${DL_LABEL}-${BUILD_TIMESTAMP}
>+
>+source updateIndexFilesFunction.sh
>+
>+DL_SITE_PATH=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4/
>+
>+cd /opt/public/eclipse/eclipse4I/siteDir/eclipse/downloads/drops4
>+echo "PWD: ${PWD}"
>+cp /opt/public/eclipse/sdk/renameBuild.sh .
>+
>+echo "save temp backup copy to ${DROP_ID}ORIG"
>+rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG
>+
>+echo "rename ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL}"
>+./renameBuild.sh ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL}
>+
>+echo "rsync ${DL_DROP_ID} to ${DL_SITE_PATH}"
>+rsync -r ${DL_DROP_ID} ${DL_SITE_PATH}
>+
>+updateIndex 4
>+
>+echo "move backup back to original"
>+mv ${DROP_ID}ORIG ${DROP_ID}
>+
>+rm renameBuild.sh 
>diff --git scripts/promotionRelated/milestonePromotionRelated/promoteDropSiteEq42.sh scripts/promotionRelated/milestonePromotionRelated/promoteDropSiteEq42.sh
>new file mode 0
>index 0000000..8cce4f3 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/promoteDropSiteEq42.sh
>@@ -0,0 +1,33 @@
>+#!/usr/bin/env bash
>+
>+# note, for equinox, we use the "4.2 build", 
>+# but label is "3.8"
>+
>+DROP_ID=I20120531-1500
>+DL_LABEL=3.8RC3
>+
>+BUILD_TIMESTAMP=${DROP_ID//[I-]/}
>+DL_DROP_ID=S-${DL_LABEL}-${BUILD_TIMESTAMP}
>+
>+source createEquinoxPromotionScriptFunction.sh
>+
>+#
>+
>+cd /opt/public/eclipse/eclipse4I/siteDir/equinox/drops
>+echo "PWD: ${PWD}"
>+cp /opt/public/eclipse/sdk/renameBuild.sh .
>+
>+echo "save temp backup copy to ${DROP_ID}ORIG"
>+rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG
>+
>+echo "rename ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL}"
>+./renameBuild.sh ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL}
>+
>+# For Equinox, we don't do the promotion, just create a 
>+# script to do it and put it in the right place for others to run.
>+createPromotionScriptEq ${DL_DROP_ID}
>+
>+echo "move backup back to original"
>+mv ${DROP_ID}ORIG ${DROP_ID}
>+
>+rm renameBuild.sh 
>diff --git scripts/promotionRelated/milestonePromotionRelated/promoteRepo38.sh scripts/promotionRelated/milestonePromotionRelated/promoteRepo38.sh
>new file mode 0
>index 0000000..48bbb7c 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/promoteRepo38.sh
>@@ -0,0 +1,27 @@
>+#!/usr/bin/env bash
>+
>+
>+DROP_SITE_ID=I20120531-0600
>+
>+DROP_LABEL=S-3.8RC3
>+
>+BUILD_TIMESTAMP=${DROP_SITE_ID//[I-]/}
>+
>+DL_SITE_ID="${DROP_LABEL}"-"${BUILD_TIMESTAMP}"
>+
>+BUILDMACHINE_BASE_SITE=/opt/public/eclipse/eclipse3I/siteDir/updates/3.8-I-builds
>+
>+DLMACHINE_BASE_SITE=/home/data/httpd/download.eclipse.org/eclipse/updates/3.8milestones
>+
>+BUILDMACHINE_SITE=${BUILDMACHINE_BASE_SITE}/${DROP_SITE_ID}
>+
>+DLMACHINE_SITE=${DLMACHINE_BASE_SITE}/${DL_SITE_ID}
>+
>+# remember, need trailing slash since going from existing directories 
>+# contents to new directories contents
>+echo "BUILDMACHINE_SITE: ${BUILDMACHINE_SITE}/"
>+echo "DLMACHINE_SITE: ${DLMACHINE_SITE}"
>+rsync --dry-run -vr "${BUILDMACHINE_SITE}/"  "${DLMACHINE_SITE}"
>+
>+echo " ... remember to update composite files ... "
>+
>diff --git scripts/promotionRelated/milestonePromotionRelated/promoteRepo42.sh scripts/promotionRelated/milestonePromotionRelated/promoteRepo42.sh
>new file mode 0
>index 0000000..bc63e9c 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/promoteRepo42.sh
>@@ -0,0 +1,27 @@
>+#!/usr/bin/env bash
>+
>+
>+DROP_SITE_ID=I20120531-1500
>+
>+DROP_LABEL=S-4.2RC3
>+
>+BUILD_TIMESTAMP=${DROP_SITE_ID//[I-]/}
>+
>+DL_SITE_ID="${DROP_LABEL}"-"${BUILD_TIMESTAMP}"
>+
>+BUILDMACHINE_BASE_SITE=/opt/public/eclipse/eclipse4I/siteDir/updates/4.2-I-builds
>+
>+DLMACHINE_BASE_SITE=/home/data/httpd/download.eclipse.org/eclipse/updates/4.2milestones
>+
>+BUILDMACHINE_SITE=${BUILDMACHINE_BASE_SITE}/${DROP_SITE_ID}
>+
>+DLMACHINE_SITE=${DLMACHINE_BASE_SITE}/${DL_SITE_ID}
>+
>+# remember, need trailing slash since going from existing directories 
>+# contents to new directories contents
>+echo "BUILDMACHINE_SITE: ${BUILDMACHINE_SITE}/"
>+echo "DLMACHINE_SITE: ${DLMACHINE_SITE}"
>+rsync --dry-run -vr "${BUILDMACHINE_SITE}/"  "${DLMACHINE_SITE}"
>+
>+echo " ... remember to update composite files ... "
>+
>diff --git scripts/promotionRelated/milestonePromotionRelated/updateIndexFilesFunction.sh scripts/promotionRelated/milestonePromotionRelated/updateIndexFilesFunction.sh
>new file mode 0
>index 0000000..f2c4540 0
>--- /dev/null
>+++ scripts/promotionRelated/milestonePromotionRelated/updateIndexFilesFunction.sh
>@@ -0,0 +1,73 @@
>+#!/usr/bin/env bash
>+
>+# this function accomplished "from a client" the same function that 
>+# could be done like this, on the download server (in .../eclipse/downloads directory): 
>+# php createIndex4x.php > index.html
>+# php eclipse3x.php > eclipse3x.html
>+
>+function internalUpdateIndex () 
>+{
>+
>+    if [[ $# != 2 ]] 
>+    then
>+        echo "PROGRAM ERROR: this function requires to arguments, in order, "
>+        echo "    the php page to use to create the html page, named in second argument)."
>+        exit 1
>+    fi 
>+
>+    PHP_PAGE=$1
>+    HTML_PAGE=$2
>+
>+    TEMP_INDEX_TXT=tempIndex.txt
>+
>+    wget -O ${TEMP_INDEX_TXT} http://download.eclipse.org/eclipse/downloads/${PHP_PAGE}
>+    rccode=$?
>+    if [ $rccode -eq 0 ]
>+    then
>+        rsync ${TEMP_INDEX_TXT} /home/data/httpd/download.eclipse.org/eclipse/downloads/${HTML_PAGE}
>+        rccode=$?
>+        if [ $rccode -eq 0 ] 
>+        then
>+            echo "INFO: Upated http://download.eclipse.org/eclipse/downloads/${HTML_PAGE}"
>+            return 0
>+        else
>+            echo "ERROR: Could not copy ${HTML_PAGE} to downlaods. rccode: $rccode"
>+            return $rccode
>+        fi
>+    else
>+        echo "ERROR: Could not create or pull ${TEMP_INDEX_TXT} from downloads file ${PHP_PAGE}. rccode: $rccode"
>+        return $rccode
>+    fi
>+
>+    rm ${TEMP_INDEX_TXT}
>+}
>+
>+
>+function updateIndex () 
>+{
>+
>+
>+    x4X_PHP_PAGE="createIndex4x.php"
>+    x4X_HTML_PAGE="index.html"
>+    x3X_PHP_PAGE="eclipse3x.php"
>+    x3X_HTML_PAGE="eclipse3x.html"
>+
>+    # if no arguments, do both, else we expect "3" or "4"
>+    # TODO: would be polite to detect unexpected arguments and give warnings. 
>+    if [[ $# == 0 ]] 
>+    then 
>+        internalUpdateIndex ${x4X_PHP_PAGE} ${x4X_HTML_PAGE}
>+        internalUpdateIndex ${x3X_PHP_PAGE} ${x3X_HTML_PAGE}
>+    else
>+        if [[ "$1" == "3" ]] 
>+        then 
>+            internalUpdateIndex ${x3X_PHP_PAGE} ${x3X_HTML_PAGE}
>+        elif [[ "$1" == "4" ]]
>+        then
>+            internalUpdateIndex ${x4X_PHP_PAGE} ${x4X_HTML_PAGE}
>+        fi
>+    fi
>+
>+}
>+
>+
>diff --git scripts/testScriptArea/dateTimeFormats.sh scripts/testScriptArea/dateTimeFormats.sh
>index ccb5b15..ce6baf0 100755
>--- scripts/testScriptArea/dateTimeFormats.sh
>+++ scripts/testScriptArea/dateTimeFormats.sh
>@@ -12,3 +12,13 @@
> timestamp=$( date +%Y%m%d-%H%M )
> 
> echo $timestamp
>+
>+
>+START_TIME=`date +%s`
>+sleep 62
>+END_TIME=`date +%s`
>+ELAPSED=$((END_TIME-START_TIME))
>+echo "Raw Elapsed: $ELAPSED"
>+echo "FINISHED at " `date` " Elapsed time: " `date -d 00:00:$ELAPSED +%H:%M:%S` 
>+
>+printf "Pretty format Elapsed Time: %02d:%02d:%02d:%02d\n" "$((ELAPSED/86400))" "$(($ELAPSED/3600%24))" "$(($ELAPSED/60%60))" "$(($ELAPSED%60))"
>\ No newline at end of file
>diff --git scripts/testScriptArea/testPHPWrite.sh scripts/testScriptArea/testPHPWrite.sh
>new file mode 0
>index 0000000..bd3af6c 0
>--- /dev/null
>+++ scripts/testScriptArea/testPHPWrite.sh
>@@ -0,0 +1,11 @@
>+
>+buildResults="/home/davidw/temp"
>+basebuilderBranch="abcd"
>+eclipsebuilderBranch="1234"
>+
>+# make sure exists, before we write a file there
>+mkdir -p $buildResults
>+echo "<?php " > ${buildResults}/buildProperties.php 
>+echo "\$basebuilderBranch='${basebuilderBranch}';" >> ${buildResults}/buildProperties.php
>+echo "\$eclipsebuilderBranch='${eclipsebuilderBranch}';" >> $buildResults/buildProperties.php
>+echo "?>" >> $buildResults/buildProperties.php
>\ No newline at end of file
>diff --git scripts/testScriptArea/testbuildidTotimestamp.sh scripts/testScriptArea/testbuildidTotimestamp.sh
>new file mode 0
>index 0000000..3d893c7 0
>--- /dev/null
>+++ scripts/testScriptArea/testbuildidTotimestamp.sh
>@@ -0,0 +1,8 @@
>+
>+
>+buildId=I20120526-0900
>+
>+timestamp=${buildId//[I-]/}
>+
>+echo "buildId: $buildId"
>+echo "timestamp: $timestamp"
>diff --git scripts/utilities/git-map-check.sh scripts/utilities/git-map-check.sh
>new file mode 0
>index 0000000..434e196 0
>--- /dev/null
>+++ scripts/utilities/git-map-check.sh
>@@ -0,0 +1,117 @@
>+#!/usr/bin/env bash
>+#
>+# This utility is to double check the "sanity" of the map files
>+# produced in earlier step. 
>+# Repos must be checked out on the branch you
>+# expect to tag, map file tags already computed, "added" to repo, 
>+# and committed (to local workspace), but not yet pushed ... not good
>+# to push, if turns our there are errors and we cancel build. 
>+# 
>+#
>+# USAGE: repoRoot buildTag relengRoot repoURL [repoURL]*
>+#    repoRoot   - absolute path to a folder containing cloned git repositories
>+#    buildTag   - build tag to tag all repositories
>+#    relengRoot - asolute path to releng project containing map files
>+#    repoURL    - git repository urls to check, must match entries in the map files (i.e. git://... form)
>+# EXAMPLE: 
>+#   ./git-map-check.sh \
>+#   /opt/public/eclipse/eclipse3I/build/supportDir/gitCache \
>+#   I20120529-2100 \
>+#   /opt/public/eclipse/eclipse3I/build/supportDir/gitCache/eclipse.platform.releng.maps/org.eclipse.releng \
>+#   $( cat clones.txt ) | tee mapcheckout.txt 
>+# 
>+# returns 1 if FAILURE, else 0. Examine the maps-check.txt file for details.
>+#
>+
>+LOGFILE="${PWD}/maps-check.txt"
>+echo "LOGFILE: $LOGFILE"
>+echo "# `basename ${0}` started at $( date +%Y%m%d-%H%M%S )" > "${LOGFILE}"
>+START_TIME=`date +%s`
>+
>+check_map () {
>+	#echo check_map "$@"
>+	REPO=$1
>+	REPO_DIR=$( basename $REPO .git )
>+	MAP=$2
>+	 # assume no error, 0, but set to true, 1, if error found
>+	FOUND_ERROR=0
>+	pushd "$gitCache/$REPO_DIR" >/dev/null
>+	grep "repo=${REPO}," "$MAP" >/tmp/maplines_$$.txt
>+	# check that file exists and is not empty. 
>+    # (probably some type of an error if it does not, 
>+    # but, not the type of error we are interested in here). 
>+	if [ ! -s /tmp/maplines_$$.txt ]; then
>+		return $FOUND_ERROR
>+	fi
>+	while read LINE; do
>+		LINE_START=$( echo $LINE | sed 's/^$[^=]*$=.*$/\1/g' )
>+		PROJ_PATH=$( echo $LINE | sed 's/^.*path=//g' )
>+		CURRENT_TAG=$( echo $LINE | sed 's/.*tag=$[^,]*$,.*$/\1/g' )
>+		LAST_COMMIT=$( git rev-list -1 HEAD -- "$PROJ_PATH" )
>+        if [ -z "$LAST_COMMIT" ]; then
>+            echo "#SKIPPING $LINE_START, no commits for $PROJ_PATH" >> "${LOGFILE}"
>+            continue
>+        fi
>+		
>+		if ! ( git tag --contains $LAST_COMMIT | grep $CURRENT_TAG >/dev/null ); then
>+			echo FAIL $PROJ_PATH ":" $LAST_COMMIT not contained in $CURRENT_TAG ":" "$REPO" >> "${LOGFILE}"
>+			FOUND_ERROR=1
>+		else
>+			echo "OK $LINE_START $CURRENT_TAG" >> "${LOGFILE}"
>+		fi
>+	done </tmp/maplines_$$.txt
>+	rm -f /tmp/maplines_$$.txt
>+	popd >/dev/null
>+	return $FOUND_ERROR
>+}
>+
>+
>+STATUS=OK
>+STATUS_MSG=""
>+LATEST_SUBMISSION=""
>+
>+
>+if [ $# -lt 4 ]; then
>+  echo "USAGE: $0 repoRoot buildTag relengRoot repoURL [repoURL]*"
>+  exit 1
>+fi
>+
>+
>+gitCache=$1; shift
>+buildTag=$1; shift
>+RELENG=$1; shift
>+REPOS="$@"
>+
>+echo "DEBUG: gitCache: $gitCache"
>+echo "DEBUG: buildTag: $buildTag"
>+echo "DEBUG: RELENG: $RELENG"
>+echo "DEBUG: REPOS: $REPOS"
>+
>+# If there is one failure, the whole thing is a failure, 
>+# but, important to keep going to check all in one run, in case 
>+# there is more than one inaccuracy.
>+OVERALL_FAIL=0
>+
>+cd $gitCache
>+for REPO in $REPOS; do
>+	
>+	MAPS=$( find $RELENG -name "*.map" -exec grep -l "repo=${REPO}," {} \; )
>+	echo " "
>+	echo "DEBUG: REPO: $REPO"
>+	echo "DEBUG: MAPS: $MAPS"
>+	if [ ! -z "$MAPS" ]; then
>+		for MAP in $MAPS; do
>+		    echo "DEBUG: MAP : $MAP"
>+			FAILED=$( check_map $REPO $MAP )
>+			if [[ $FAILED == 1 ]] 
>+			then 
>+			    OVERALL_FAIL=1;
>+			fi
>+		done
>+	fi
>+done
>+echo "# check maps file ended at $( date +%Y%m%d-%H%M%S )" >> "${LOGFILE}"
>+END_TIME=`date +%s`
>+ELAPSED=$((END_TIME-START_TIME))
>+echo "# Elapsed seconds: $ELAPSED" >> "${LOGFILE}"
>+exit $OVERALL_FAIL

Actions: View | Diff

Attachments on bug 208422: 217373 | 217375 | 217376 | 217377 | 217429 | 217495 | 217496