217639 - coordinate dependancies for Ant and PHP

8 files changed, 63 insertions, 26 deletions

diff --git a/releng/distribution/jsdt.site/prereqsToDisplay.php b/releng/distribution/jsdt.site/prereqsToDisplay.php
index c05486932..7b22a17cb 100644
--- a/releng/distribution/jsdt.site/prereqsToDisplay.php
+++ b/releng/distribution/jsdt.site/prereqsToDisplay.php
@@ -1,5 +1,23 @@
 <?php
 
 $prereq_eclipse="true";
+$prereq_e4x="false";
+$prereq_eclipseplatform="false";
+$prereq_emfandxsd="false";
+$prereq_gef="false";
+$prereq_dtp="false";
+$prereq_emftransaction="false";
+$prereq_emfvalidation="false";
+$prereq_graphiti="false";
 
+$prereq_eclipsetestframework="true";
+$prereq_eclipsereleng="true";
+$prereq_orbitthirdpartyzip="true";
+
+// seldom used, but we try to always include all php $prereq variables to avoid 'unused variable' warnings from php
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="false";
+$prereq_wtptests="false";
+$prereq_dltk="false";
 ?>
diff --git a/releng/distribution/wtp.site/prereqsToDisplay.php b/releng/distribution/wtp.site/prereqsToDisplay.php
index f53b680f8..4d11eb73c 100644
--- a/releng/distribution/wtp.site/prereqsToDisplay.php
+++ b/releng/distribution/wtp.site/prereqsToDisplay.php
@@ -4,10 +4,20 @@ $prereq_eclipse="true";
 $prereq_e4x="false";
 $prereq_eclipseplatform="false";
 $prereq_emfandxsd="true";
+$prereq_gef="true";
+$prereq_dtp="true";
 $prereq_emftransaction="true";
 $prereq_emfvalidation="true";
 $prereq_graphiti="true";
-$prereq_gef="true";
-$prereq_dtp="true";
 
+$prereq_eclipsetestframework="true";
+$prereq_eclipsereleng="true";
+$prereq_orbitthirdpartyzip="true";
+
+// seldom used, but we try to always include all php $prereq variables to avoid 'unused variable' warnings from php
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="false";
+$prereq_wtptests="false";
+$prereq_dltk="false";
 ?>
\ No newline at end of file
diff --git a/releng/distribution/wtp4x.site/prereqsToDisplay.php b/releng/distribution/wtp4x.site/prereqsToDisplay.php
index 93074c9db..db7ae1992 100644
--- a/releng/distribution/wtp4x.site/prereqsToDisplay.php
+++ b/releng/distribution/wtp4x.site/prereqsToDisplay.php
@@ -4,10 +4,20 @@ $prereq_eclipse="false";
 $prereq_e4x="true";
 $prereq_eclipseplatform="false";
 $prereq_emfandxsd="true";
+$prereq_gef="true";
+$prereq_dtp="true";
 $prereq_emftransaction="true";
 $prereq_emfvalidation="true";
 $prereq_graphiti="true";
-$prereq_gef="true";
-$prereq_dtp="true";
 
+$prereq_eclipsetestframework="true";
+$prereq_eclipsereleng="true";
+$prereq_orbitthirdpartyzip="true";
+
+// seldom used, but we try to always include all php $prereq variables to avoid 'unused variable' warnings from php
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="false";
+$prereq_wtptests="false";
+$prereq_dltk="false";
 ?>
\ No newline at end of file
diff --git a/releng/galileo/dependencies.properties b/releng/galileo/dependencies.properties
index b7a1a42ff..95e7ea9f3 100644
--- a/releng/galileo/dependencies.properties
+++ b/releng/galileo/dependencies.properties
@@ -45,8 +45,8 @@ orbitthirdpartyzip.build.id=R20100114021427
 orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
 orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
 orbitthirdpartyzip.file=orbit-${orbitthirdpartyzip.build.id}.zip
-orbitthirdpartyzip.name=Orbit thirdparty zip
-orbitthirdpartyzip.description=Orbit thirdparty zip
+orbitthirdpartyzip.name=Third Party code from Orbit.
+orbitthirdpartyzip.description=Not technically required and contains much more than needed for WTP, but some committers like using it in a PDE runtime target.
 orbitthirdpartyzip.build.home=http://download.eclipse.org/tools/orbit/
 
 
@@ -105,9 +105,9 @@ eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
 # Eclipse Test Framework will be used for testing and building the tests
 # groupID : eclipseTestFramework
 
-eclipsetestFramework.id=${wtp.eclipse.build.id}
+eclipseTestFramework.id=${wtp.eclipse.build.id}
 eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.file=eclipse-test-framework-${eclipseTestFramework.id}.zip
 
 eclipseTestFramework.name=Eclipse Test Framework v3.5.
 eclipseTestFramework.description=Infrastructure to assist running automated JUnits.
diff --git a/releng/helios/dependencies.properties b/releng/helios/dependencies.properties
index 241c4dd9d..713f642f0 100644
--- a/releng/helios/dependencies.properties
+++ b/releng/helios/dependencies.properties
@@ -48,8 +48,8 @@ orbitthirdpartyzip.build.id=R20100519200754
 orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
 orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
 orbitthirdpartyzip.file=orbit-${orbitthirdpartyzip.build.id}.zip
-orbitthirdpartyzip.name=Orbit thirdparty zip
-orbitthirdpartyzip.description=Orbit thirdparty zip
+orbitthirdpartyzip.name=Third Party code from Orbit.
+orbitthirdpartyzip.description=Not technically required and contains much more than needed for WTP, but some committers like using it in a PDE runtime target.
 orbitthirdpartyzip.build.home=http://download.eclipse.org/tools/orbit/
 
 
@@ -95,11 +95,11 @@ eclipseplatform.repo=
 # Eclipse Test Framework
 # groupID : eclipseTestFramework
 
-eclipsetestFramework.id=${eclipse.id}
+eclipseTestFramework.id=${eclipse.id}
 eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.file=eclipse-test-framework-${eclipseTestFramework.id}.zip
 
-eclipseTestFramework.repo=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.repo=eclipse-test-framework-${eclipseTestFramework.id}.zip
 #eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 
 eclipseTestFramework.name=Eclipse Test Framework v3.6.
diff --git a/releng/indigo/dependencies.properties b/releng/indigo/dependencies.properties
index 7973060b7..b7602edcb 100644
--- a/releng/indigo/dependencies.properties
+++ b/releng/indigo/dependencies.properties
@@ -48,8 +48,8 @@ orbitthirdpartyzip.build.id=I20110302135238
 orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
 orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
 orbitthirdpartyzip.file=orbit-buildrepo-${orbitthirdpartyzip.build.id}.zip
-orbitthirdpartyzip.name=Orbit thirdparty zip
-orbitthirdpartyzip.description=Orbit thirdparty zip
+orbitthirdpartyzip.name=Third Party code from Orbit.
+orbitthirdpartyzip.description=Not technically required and contains much more than needed for WTP, but some committers like using it in a PDE runtime target.
 orbitthirdpartyzip.build.home=http://download.eclipse.org/tools/orbit/
 
 orbitthirdpartymap.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
@@ -93,11 +93,11 @@ eclipseplatform.repo=org.eclipse.platform-${eclipse.id}.zip
 # Eclipse Test Framework
 # groupID : eclipseTestFramework
 
-eclipsetestFramework.id=${eclipse.id}
+eclipseTestFramework.id=${eclipse.id}
 eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.file=eclipse-test-framework-${eclipseTestFramework.id}.zip
 
-eclipseTestFramework.repo=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.repo=eclipse-test-framework-${eclipseTestFramework.id}.zip
 eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 
 eclipseTestFramework.name=Eclipse Test Framework v3.7.
diff --git a/releng/indigo4/dependencies.properties b/releng/indigo4/dependencies.properties
index 7973060b7..b7602edcb 100644
--- a/releng/indigo4/dependencies.properties
+++ b/releng/indigo4/dependencies.properties
@@ -48,8 +48,8 @@ orbitthirdpartyzip.build.id=I20110302135238
 orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
 orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
 orbitthirdpartyzip.file=orbit-buildrepo-${orbitthirdpartyzip.build.id}.zip
-orbitthirdpartyzip.name=Orbit thirdparty zip
-orbitthirdpartyzip.description=Orbit thirdparty zip
+orbitthirdpartyzip.name=Third Party code from Orbit.
+orbitthirdpartyzip.description=Not technically required and contains much more than needed for WTP, but some committers like using it in a PDE runtime target.
 orbitthirdpartyzip.build.home=http://download.eclipse.org/tools/orbit/
 
 orbitthirdpartymap.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
@@ -93,11 +93,11 @@ eclipseplatform.repo=org.eclipse.platform-${eclipse.id}.zip
 # Eclipse Test Framework
 # groupID : eclipseTestFramework
 
-eclipsetestFramework.id=${eclipse.id}
+eclipseTestFramework.id=${eclipse.id}
 eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.file=eclipse-test-framework-${eclipseTestFramework.id}.zip
 
-eclipseTestFramework.repo=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.repo=eclipse-test-framework-${eclipseTestFramework.id}.zip
 eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 
 eclipseTestFramework.name=Eclipse Test Framework v3.7.
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index ce8a3627c..dae73eff7 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -11,9 +11,8 @@ eclipse.builder.fetch=true
 
 # WTP specific builder. Remember this is not (and could not be) the one that is built during the run. 
 # If updates needed, a seperate run (possibly of "wtpbuilder job"). 
-wtpBuildTools.url=http://download.eclipse.org/webtools/downloads/drops/T3.3.0/I-3.3.0-20100922145151/buildrepository/wtp-buildTools/plugins/
-wtpBuildTools.file=org.eclipse.wtp.releng.tools_1.1.3.v201009221438.jar
-
+wtpBuildTools.url=http://download.eclipse.org/webtools/downloads/drops/T3.3.0/I-3.3.0-20110307091426/buildrepository/wtp-buildTools/plugins/
+wtpBuildTools.file=org.eclipse.wtp.releng.tools_1.2.1.v201103070911.jar
 
 
 #   This parameter is specific to the compiler