294564 refactoring needed to have truly independent JSDT build
diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
index bb4323c..82dd608 100644
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ b/releng.wtpbuilder/buildtemplates/build.xml
@@ -21,7 +21,7 @@
-->
<property
name="componentpropertyfile"
- value="pave.properties"/>
+ value="jsdt.properties"/>
<property
file="${componentpropertyfile}"/>
<!--
diff --git a/releng.wtpbuilder/buildtemplates/buildall.xml b/releng.wtpbuilder/buildtemplates/buildall.xml
index ff58844..3884a60 100644
--- a/releng.wtpbuilder/buildtemplates/buildall.xml
+++ b/releng.wtpbuilder/buildtemplates/buildall.xml
@@ -19,15 +19,22 @@
name="componentpropertyfile"
value="vex.properties"/>
</ant>
+ <!--
<ant>
<property
name="componentpropertyfile"
value="servadapt.properties"/>
</ant>
+ -->
<ant>
<property
name="componentpropertyfile"
value="pave.properties"/>
</ant>
+ <ant>
+ <property
+ name="componentpropertyfile"
+ value="jsdt.properties"/>
+ </ant>
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template/build.properties b/releng.wtpbuilder/buildtemplates/components/template/build.properties
index ffa4455..5bed879 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/build.properties
+++ b/releng.wtpbuilder/buildtemplates/components/template/build.properties
@@ -44,14 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=@prereq.eclipseplatform@
-prereq.eclipse=@prereq.eclipse@
-prereq.emf=@prereq.emf@
-prereq.emfxsd=@prereq.emfxsd@
-prereq.emfvalidation=@prereq.emfvalidation@
-prereq.gef=@prereq.gef@
-prereq.dtp=@prereq.dtp@
-prereq.wst=@prereq.wst@
-prereq.jst=@prereq.jst@
-prereq.wtp=@prereq.wtp@
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 817a393..b10babf 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -23,52 +23,52 @@
<condition
property="getprereq.eclipse">
<istrue
- value="${prereq.eclipse}"/>
+ value="@prereq.eclipse@"/>
</condition>
<condition
property="getprereq.eclipseplatform">
<istrue
- value="${prereq.eclipseplatform}"/>
+ value="@prereq.eclipseplatform@"/>
</condition>
<condition
property="getprereq.emf">
<istrue
- value="${prereq.emf}"/>
+ value="@prereq.emf@"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
- value="${prereq.emfxsd}"/>
+ value="@prereq.emfxsd@"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
- value="${prereq.emfvalidation}"/>
+ value="@prereq.emfvalidation@"/>
</condition>
<condition
property="getprereq.gef">
<istrue
- value="${prereq.gef}"/>
+ value="@prereq.gef@"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
- value="${prereq.dtp}"/>
+ value="@prereq.dtp@"/>
</condition>
<condition
property="getprereq.wst">
<istrue
- value="${prereq.wst}"/>
+ value="@prereq.wst@"/>
</condition>
<condition
property="getprereq.jst">
<istrue
- value="${prereq.jst}"/>
+ value="@prereq.jst@"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
- value="${prereq.wtp}"/>
+ value="@prereq.wtp@"/>
</condition>
<target
name="get">
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties b/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties
index 59c4ea0..5bed879 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties
@@ -44,15 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=@prereq.eclipseplatform@
-prereq.eclipse=@prereq.eclipse@
-prereq.emf=@prereq.emf@
-prereq.emfxsd=@prereq.emfxsd@
-prereq.emfvalidation=@prereq.emfvalidation@
-prereq.gef=@prereq.gef@
-prereq.dtp=@prereq.dtp@
-prereq.wst=@prereq.wst@
-prereq.jst=@prereq.jst@
-prereq.wtp=@prereq.wtp@
-
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index 817a393..a09c8f8 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -20,56 +20,57 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="@prereq.eclipse@"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="@prereq.eclipseplatform@"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="@prereq.emf@"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="@prereq.emfxsd@"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="@prereq.emfvalidation@"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="@prereq.gef@"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="@prereq.dtp@"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="@prereq.wst@"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="@prereq.jst@"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="@prereq.wtp@"/>
+ </condition>
+
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties b/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties
index df39bcd..4d26330 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties
@@ -44,13 +44,3 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=@prereq.eclipseplatform@
-prereq.eclipse=@prereq.eclipse@
-prereq.emf=@prereq.emf@
-prereq.emfxsd=@prereq.emfxsd@
-prereq.emfvalidation=@prereq.emfvalidation@
-prereq.gef=@prereq.gef@
-prereq.dtp=@prereq.dtp@
-prereq.wst=@prereq.wst@
-prereq.jst=@prereq.jst@
-prereq.wtp=@prereq.wtp@
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 235d96c..90a412c 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="@prereq.eclipse@"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="@prereq.eclipseplatform@"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="@prereq.emf@"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="@prereq.emfxsd@"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="@prereq.emfvalidation@"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="@prereq.gef@"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="@prereq.dtp@"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="@prereq.wst@"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="@prereq.jst@"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="@prereq.wtp@"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
index d6b65f6..9c919a7 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
@@ -343,34 +343,34 @@
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <?php
- if ("true" === $prereq_eclipseplatform) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td width=\"40%\">Eclipse Platform</td>";
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipseplatformfilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipseplatformfilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipseplatformfilemacosx;
- }
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- echo "<td align=\"right\">";
+ echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
- echo " </tr>";
- }
- ?>
+ echo " </tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_eclipse) {
@@ -490,7 +490,58 @@
}
?>
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
@@ -500,12 +551,32 @@
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr />
- </td>
- </tr>
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_emfvalidation) {
diff --git a/releng.wtpbuilder/buildtemplates/vex.properties b/releng.wtpbuilder/buildtemplates/vex.properties
index 0dade92..0b434d8 100644
--- a/releng.wtpbuilder/buildtemplates/vex.properties
+++ b/releng.wtpbuilder/buildtemplates/vex.properties
@@ -23,7 +23,11 @@
# prereq is the basic prereq on top of platform, jdt, emf, gef
# (only realistic options for right now are wst, jst).
-basicprereq=wst
+prereq.eclipse=true
+prereq.emf=true
+prereq.emfxsd=true
+prereq.gef=true
+prereq.wst=true
# These next properties are mainly for distribution template files
diff --git a/releng.wtpbuilder/buildtemplates/xmlsec.properties b/releng.wtpbuilder/buildtemplates/xmlsec.properties
index c0e8374..6c7cdc0 100644
--- a/releng.wtpbuilder/buildtemplates/xmlsec.properties
+++ b/releng.wtpbuilder/buildtemplates/xmlsec.properties
@@ -24,7 +24,11 @@
# prereq is the basic prereq on top of platform, jdt, emf, gef
# (only realistic options for right now are wst, jst).
-basicprereq=wst
+prereq.eclipse=true
+prereq.emf=true
+prereq.emfxsd=true
+prereq.gef=true
+prereq.wst=true
# These next properties are mainly for distribution template files
diff --git a/releng.wtpbuilder/components/jaxws/build.properties b/releng.wtpbuilder/components/jaxws/build.properties
index e8db6cc..5bed879 100644
--- a/releng.wtpbuilder/components/jaxws/build.properties
+++ b/releng.wtpbuilder/components/jaxws/build.properties
@@ -44,14 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/jaxws/dependency.xml b/releng.wtpbuilder/components/jaxws/dependency.xml
index 817a393..3aa2d0b 100644
--- a/releng.wtpbuilder/components/jaxws/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws/dependency.xml
@@ -23,52 +23,52 @@
<condition
property="getprereq.eclipse">
<istrue
- value="${prereq.eclipse}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.eclipseplatform">
<istrue
- value="${prereq.eclipseplatform}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emf">
<istrue
- value="${prereq.emf}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
- value="${prereq.emfxsd}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
- value="${prereq.emfvalidation}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.gef">
<istrue
- value="${prereq.gef}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
- value="${prereq.dtp}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wst">
<istrue
- value="${prereq.wst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.jst">
<istrue
- value="${prereq.jst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
- value="${prereq.wtp}"/>
+ value="false"/>
</condition>
<target
name="get">
diff --git a/releng.wtpbuilder/components/jaxws_sdk/build.properties b/releng.wtpbuilder/components/jaxws_sdk/build.properties
index ddd3c4f..5bed879 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/build.properties
+++ b/releng.wtpbuilder/components/jaxws_sdk/build.properties
@@ -44,15 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
-
diff --git a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
index 817a393..2023e34 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
@@ -20,56 +20,57 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
+
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/jaxws_tests/build.properties b/releng.wtpbuilder/components/jaxws_tests/build.properties
index 52efd55..4d26330 100644
--- a/releng.wtpbuilder/components/jaxws_tests/build.properties
+++ b/releng.wtpbuilder/components/jaxws_tests/build.properties
@@ -44,13 +44,3 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/jaxws_tests/dependency.xml b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
index 235d96c..b4a2703 100644
--- a/releng.wtpbuilder/components/jaxws_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/jsdt/build.properties b/releng.wtpbuilder/components/jsdt/build.properties
index 2eb5c8e..5bed879 100644
--- a/releng.wtpbuilder/components/jsdt/build.properties
+++ b/releng.wtpbuilder/components/jsdt/build.properties
@@ -44,14 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=true
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/jsdt/dependency.xml b/releng.wtpbuilder/components/jsdt/dependency.xml
index 817a393..53b2560 100644
--- a/releng.wtpbuilder/components/jsdt/dependency.xml
+++ b/releng.wtpbuilder/components/jsdt/dependency.xml
@@ -23,52 +23,52 @@
<condition
property="getprereq.eclipse">
<istrue
- value="${prereq.eclipse}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.eclipseplatform">
<istrue
- value="${prereq.eclipseplatform}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emf">
<istrue
- value="${prereq.emf}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
- value="${prereq.emfxsd}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
- value="${prereq.emfvalidation}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.gef">
<istrue
- value="${prereq.gef}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
- value="${prereq.dtp}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wst">
<istrue
- value="${prereq.wst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.jst">
<istrue
- value="${prereq.jst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
- value="${prereq.wtp}"/>
+ value="false"/>
</condition>
<target
name="get">
diff --git a/releng.wtpbuilder/components/jsdt_sdk/build.properties b/releng.wtpbuilder/components/jsdt_sdk/build.properties
index ddd1f52..5bed879 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/build.properties
+++ b/releng.wtpbuilder/components/jsdt_sdk/build.properties
@@ -44,15 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=true
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
-
diff --git a/releng.wtpbuilder/components/jsdt_sdk/dependency.xml b/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
index 817a393..c3f0161 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
@@ -20,56 +20,57 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
+
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/jsdt_tests/build.properties b/releng.wtpbuilder/components/jsdt_tests/build.properties
index 16f3e6a..4d26330 100644
--- a/releng.wtpbuilder/components/jsdt_tests/build.properties
+++ b/releng.wtpbuilder/components/jsdt_tests/build.properties
@@ -44,13 +44,3 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=true
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/jsdt_tests/dependency.xml b/releng.wtpbuilder/components/jsdt_tests/dependency.xml
index 235d96c..73f8a7e 100644
--- a/releng.wtpbuilder/components/jsdt_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jsdt_tests/dependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/pave/build.properties b/releng.wtpbuilder/components/pave/build.properties
index 639ee42..5bed879 100644
--- a/releng.wtpbuilder/components/pave/build.properties
+++ b/releng.wtpbuilder/components/pave/build.properties
@@ -44,14 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.emfvalidation=true
-prereq.gef=true
-prereq.dtp=true
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=true
diff --git a/releng.wtpbuilder/components/pave/dependency.xml b/releng.wtpbuilder/components/pave/dependency.xml
index 817a393..fe961cb 100644
--- a/releng.wtpbuilder/components/pave/dependency.xml
+++ b/releng.wtpbuilder/components/pave/dependency.xml
@@ -23,52 +23,52 @@
<condition
property="getprereq.eclipse">
<istrue
- value="${prereq.eclipse}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.eclipseplatform">
<istrue
- value="${prereq.eclipseplatform}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emf">
<istrue
- value="${prereq.emf}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
- value="${prereq.emfxsd}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
- value="${prereq.emfvalidation}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.gef">
<istrue
- value="${prereq.gef}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
- value="${prereq.dtp}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.wst">
<istrue
- value="${prereq.wst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.jst">
<istrue
- value="${prereq.jst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
- value="${prereq.wtp}"/>
+ value="true"/>
</condition>
<target
name="get">
diff --git a/releng.wtpbuilder/components/pave_sdk/build.properties b/releng.wtpbuilder/components/pave_sdk/build.properties
index 70f083a..5bed879 100644
--- a/releng.wtpbuilder/components/pave_sdk/build.properties
+++ b/releng.wtpbuilder/components/pave_sdk/build.properties
@@ -44,15 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.emfvalidation=true
-prereq.gef=true
-prereq.dtp=true
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=true
-
diff --git a/releng.wtpbuilder/components/pave_sdk/dependency.xml b/releng.wtpbuilder/components/pave_sdk/dependency.xml
index 817a393..ce8708f 100644
--- a/releng.wtpbuilder/components/pave_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/pave_sdk/dependency.xml
@@ -20,56 +20,57 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="true"/>
+ </condition>
+
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/pave_tests/build.properties b/releng.wtpbuilder/components/pave_tests/build.properties
index 98ea0b7..4d26330 100644
--- a/releng.wtpbuilder/components/pave_tests/build.properties
+++ b/releng.wtpbuilder/components/pave_tests/build.properties
@@ -44,13 +44,3 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.emfvalidation=true
-prereq.gef=true
-prereq.dtp=true
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=true
diff --git a/releng.wtpbuilder/components/pave_tests/dependency.xml b/releng.wtpbuilder/components/pave_tests/dependency.xml
index 235d96c..12ba4e8 100644
--- a/releng.wtpbuilder/components/pave_tests/dependency.xml
+++ b/releng.wtpbuilder/components/pave_tests/dependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="true"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/vex/build.properties b/releng.wtpbuilder/components/vex/build.properties
index e8db6cc..5bed879 100644
--- a/releng.wtpbuilder/components/vex/build.properties
+++ b/releng.wtpbuilder/components/vex/build.properties
@@ -44,14 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/vex/dependency.xml b/releng.wtpbuilder/components/vex/dependency.xml
index 817a393..caafe1f 100644
--- a/releng.wtpbuilder/components/vex/dependency.xml
+++ b/releng.wtpbuilder/components/vex/dependency.xml
@@ -23,52 +23,52 @@
<condition
property="getprereq.eclipse">
<istrue
- value="${prereq.eclipse}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.eclipseplatform">
<istrue
- value="${prereq.eclipseplatform}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emf">
<istrue
- value="${prereq.emf}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
- value="${prereq.emfxsd}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
- value="${prereq.emfvalidation}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.gef">
<istrue
- value="${prereq.gef}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
- value="${prereq.dtp}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wst">
<istrue
- value="${prereq.wst}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.jst">
<istrue
- value="${prereq.jst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
- value="${prereq.wtp}"/>
+ value="false"/>
</condition>
<target
name="get">
diff --git a/releng.wtpbuilder/components/vex_sdk/build.properties b/releng.wtpbuilder/components/vex_sdk/build.properties
index ddd3c4f..5bed879 100644
--- a/releng.wtpbuilder/components/vex_sdk/build.properties
+++ b/releng.wtpbuilder/components/vex_sdk/build.properties
@@ -44,15 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
-
diff --git a/releng.wtpbuilder/components/vex_sdk/dependency.xml b/releng.wtpbuilder/components/vex_sdk/dependency.xml
index 817a393..20bc365 100644
--- a/releng.wtpbuilder/components/vex_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/vex_sdk/dependency.xml
@@ -20,56 +20,57 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
+
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/vex_tests/build.properties b/releng.wtpbuilder/components/vex_tests/build.properties
index 52efd55..4d26330 100644
--- a/releng.wtpbuilder/components/vex_tests/build.properties
+++ b/releng.wtpbuilder/components/vex_tests/build.properties
@@ -44,13 +44,3 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/vex_tests/dependency.xml b/releng.wtpbuilder/components/vex_tests/dependency.xml
index 235d96c..2b856ef 100644
--- a/releng.wtpbuilder/components/vex_tests/dependency.xml
+++ b/releng.wtpbuilder/components/vex_tests/dependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/xmlsec/build.properties b/releng.wtpbuilder/components/xmlsec/build.properties
index e8db6cc..5bed879 100644
--- a/releng.wtpbuilder/components/xmlsec/build.properties
+++ b/releng.wtpbuilder/components/xmlsec/build.properties
@@ -44,14 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/xmlsec/dependency.xml b/releng.wtpbuilder/components/xmlsec/dependency.xml
index 817a393..caafe1f 100644
--- a/releng.wtpbuilder/components/xmlsec/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec/dependency.xml
@@ -23,52 +23,52 @@
<condition
property="getprereq.eclipse">
<istrue
- value="${prereq.eclipse}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.eclipseplatform">
<istrue
- value="${prereq.eclipseplatform}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.emf">
<istrue
- value="${prereq.emf}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
- value="${prereq.emfxsd}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
- value="${prereq.emfvalidation}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.gef">
<istrue
- value="${prereq.gef}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
- value="${prereq.dtp}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wst">
<istrue
- value="${prereq.wst}"/>
+ value="true"/>
</condition>
<condition
property="getprereq.jst">
<istrue
- value="${prereq.jst}"/>
+ value="false"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
- value="${prereq.wtp}"/>
+ value="false"/>
</condition>
<target
name="get">
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/build.properties b/releng.wtpbuilder/components/xmlsec_sdk/build.properties
index ddd3c4f..5bed879 100644
--- a/releng.wtpbuilder/components/xmlsec_sdk/build.properties
+++ b/releng.wtpbuilder/components/xmlsec_sdk/build.properties
@@ -44,15 +44,4 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
-
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
index 817a393..20bc365 100644
--- a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
@@ -20,56 +20,57 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
+
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/components/xmlsec_tests/build.properties b/releng.wtpbuilder/components/xmlsec_tests/build.properties
index 52efd55..4d26330 100644
--- a/releng.wtpbuilder/components/xmlsec_tests/build.properties
+++ b/releng.wtpbuilder/components/xmlsec_tests/build.properties
@@ -44,13 +44,3 @@
flattenDependencies=true
parallelCompilation=true
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
index 235d96c..2b856ef 100644
--- a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index 416d8dc..60e41cb 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
@@ -425,6 +425,47 @@
value="${buildBranch}"/>
<!-- Insert PreRequsites -->
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformFile@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformURL@"
+ value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformBuildURL@"
+ value="${eclipseplatform.url}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilelinux@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilewindows@"
+ value="${eclipseplatform.file.win32-win32-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilemacos@"
+ value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformBuildHome@"
+ value="${eclipseplatform.build.home}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatform.mirror.prefixuri@"
+ value="${eclipseplatform.mirror.prefixuri}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatform.fspath.prefix@"
+ value="${eclipseplatform.fspath.prefix}"/>
+
+
+
+
<replace
file="${resultingIndex}"
token="@eclipseFile@"
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
index 121a462..decc598 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
@@ -28,7 +28,7 @@
$eclipseDescription="@eclipseDescription@";
$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipseplatform.fspath.prefix@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
@@ -343,34 +343,34 @@
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <?php
- if ("true" === $prereq_eclipseplatform) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td width=\"40%\">Eclipse Platform</td>";
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipseplatformfilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipseplatformfilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipseplatformfilemacosx;
- }
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- echo "<td align=\"right\">";
+ echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
- echo " </tr>";
- }
- ?>
+ echo " </tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_eclipse) {
@@ -490,7 +490,58 @@
}
?>
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
@@ -500,12 +551,32 @@
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr />
- </td>
- </tr>
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_emfvalidation) {
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
index 4e0c1d9..d6bb7df 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
index da0cb41..209e8af 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
@@ -343,34 +343,34 @@
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <?php
- if ("true" === $prereq_eclipseplatform) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td width=\"40%\">Eclipse Platform</td>";
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipseplatformfilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipseplatformfilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipseplatformfilemacosx;
- }
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- echo "<td align=\"right\">";
+ echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
- echo " </tr>";
- }
- ?>
+ echo " </tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_eclipse) {
@@ -490,7 +490,58 @@
}
?>
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
@@ -500,12 +551,32 @@
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr />
- </td>
- </tr>
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_emfvalidation) {
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
index 4e0c1d9..238bcfe 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
index 9485ce9..b779ce4 100644
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
@@ -343,34 +343,34 @@
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <?php
- if ("true" === $prereq_eclipseplatform) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td width=\"40%\">Eclipse Platform</td>";
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipseplatformfilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipseplatformfilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipseplatformfilemacosx;
- }
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- echo "<td align=\"right\">";
+ echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
- echo " </tr>";
- }
- ?>
+ echo " </tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_eclipse) {
@@ -490,7 +490,58 @@
}
?>
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
@@ -500,12 +551,32 @@
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr />
- </td>
- </tr>
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_emfvalidation) {
diff --git a/releng.wtpbuilder/distribution/vex.site/publish.xml b/releng.wtpbuilder/distribution/vex.site/publish.xml
index 416d8dc..60e41cb 100644
--- a/releng.wtpbuilder/distribution/vex.site/publish.xml
+++ b/releng.wtpbuilder/distribution/vex.site/publish.xml
@@ -425,6 +425,47 @@
value="${buildBranch}"/>
<!-- Insert PreRequsites -->
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformFile@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformURL@"
+ value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformBuildURL@"
+ value="${eclipseplatform.url}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilelinux@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilewindows@"
+ value="${eclipseplatform.file.win32-win32-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilemacos@"
+ value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformBuildHome@"
+ value="${eclipseplatform.build.home}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatform.mirror.prefixuri@"
+ value="${eclipseplatform.mirror.prefixuri}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatform.fspath.prefix@"
+ value="${eclipseplatform.fspath.prefix}"/>
+
+
+
+
<replace
file="${resultingIndex}"
token="@eclipseFile@"
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
index af6262f..0fda879 100644
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
@@ -28,7 +28,7 @@
$eclipseDescription="@eclipseDescription@";
$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipseplatform.fspath.prefix@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
@@ -127,14 +127,14 @@
$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-$prereq_eclipse="false";
+$prereq_eclipse="true";
$prereq_eclipseplatform="false";
-$prereq_emf="false";
-$prereq_emfxsd="false";
+$prereq_emf="true";
+$prereq_emfxsd="true";
$prereq_emfvalidation="false";
-$prereq_gef="false";
+$prereq_gef="true";
$prereq_dtp="false";
-$prereq_wst="false";
+$prereq_wst="true";
$prereq_jst="false";
$prereq_wtp="false";
@@ -343,34 +343,34 @@
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <?php
- if ("true" === $prereq_eclipseplatform) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td width=\"40%\">Eclipse Platform</td>";
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipseplatformfilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipseplatformfilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipseplatformfilemacosx;
- }
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- echo "<td align=\"right\">";
+ echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
- echo " </tr>";
- }
- ?>
+ echo " </tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_eclipse) {
@@ -490,7 +490,58 @@
}
?>
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
@@ -500,12 +551,32 @@
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr />
- </td>
- </tr>
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_emfvalidation) {
diff --git a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
index 4e0c1d9..09ef6ee 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
index 416d8dc..60e41cb 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
@@ -425,6 +425,47 @@
value="${buildBranch}"/>
<!-- Insert PreRequsites -->
+
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformFile@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformURL@"
+ value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformBuildURL@"
+ value="${eclipseplatform.url}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilelinux@"
+ value="${eclipseplatform.file.linux-gtk-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilewindows@"
+ value="${eclipseplatform.file.win32-win32-x86}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformfilemacos@"
+ value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatformBuildHome@"
+ value="${eclipseplatform.build.home}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatform.mirror.prefixuri@"
+ value="${eclipseplatform.mirror.prefixuri}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseplatform.fspath.prefix@"
+ value="${eclipseplatform.fspath.prefix}"/>
+
+
+
+
<replace
file="${resultingIndex}"
token="@eclipseFile@"
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
index 7c22d76..21234aa 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
@@ -28,7 +28,7 @@
$eclipseDescription="@eclipseDescription@";
$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipseplatform.fspath.prefix@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
@@ -127,14 +127,14 @@
$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-$prereq_eclipse="false";
+$prereq_eclipse="true";
$prereq_eclipseplatform="false";
-$prereq_emf="false";
-$prereq_emfxsd="false";
+$prereq_emf="true";
+$prereq_emfxsd="true";
$prereq_emfvalidation="false";
-$prereq_gef="false";
+$prereq_gef="true";
$prereq_dtp="false";
-$prereq_wst="false";
+$prereq_wst="true";
$prereq_jst="false";
$prereq_wtp="false";
@@ -343,34 +343,34 @@
<td>
<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
- <?php
- if ("true" === $prereq_eclipseplatform) {
- echo "<tr valign=\"top\">";
- echo "<td width=\"10%\"></td>";
- echo "<td width=\"40%\">Eclipse Platform</td>";
+ <?php
+ if ("true" === $prereq_eclipseplatform) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td width=\"40%\">Eclipse Platform</td>";
- //customize page depending on user's browser/platform, if we can detect it
- $usersPlatform = getPlatform();
- // assume windows by default, since likely most frequent, even for cases where
- // platform is "unknown". I've noticed Opera reports 'unknown' :(
- $recommendedFile=$eclipseplatformfilewindows;
- if (strcmp($usersPlatform,"linux")== 0) {
- $recommendedFile=$eclipseplatformfilelinux;
- } else if (strcmp($usersPlatform,"mac") == 0) {
- $recommendedFile=$eclipseplatformfilemacosx;
- }
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipseplatformfilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipseplatformfilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipseplatformfilemacosx;
+ }
- echo "<td align=\"right\">";
+ echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
- echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
- echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
- echo " </tr>";
- }
- ?>
+ echo " </tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_eclipse) {
@@ -490,7 +490,58 @@
}
?>
+ <?php
+ if ("true" === $prereq_wst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $wstName . " " . $wstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
+ if ("true" === $prereq_jst) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $jstName . " " . $jstDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_wtp) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $wtpName . " " . $wtpDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
@@ -500,12 +551,32 @@
- <tr valign="middle">
- <td width="10%"></td>
- <td colspan="2">
- <hr />
- </td>
- </tr>
+ <?php
+ if ("true" === $prereq_emf) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfsourceName . " " . $emfsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+ <?php
+ if ("true" === $prereq_emfxsd) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emfxsdsourceName . " " . $emfxsdsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
<?php
if ("true" === $prereq_emfvalidation) {
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml b/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml
index 4e0c1d9..09ef6ee 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml
@@ -20,56 +20,56 @@
<property
file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="${prereq.eclipse}"/>
- </condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="${prereq.eclipseplatform}"/>
- </condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="${prereq.emf}"/>
- </condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="${prereq.emfxsd}"/>
- </condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="${prereq.emfvalidation}"/>
- </condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="${prereq.gef}"/>
- </condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="${prereq.dtp}"/>
- </condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="${prereq.wst}"/>
- </condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="${prereq.jst}"/>
- </condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="${prereq.wtp}"/>
- </condition>
+ <condition
+ property="getprereq.eclipse">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.eclipseplatform">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.emf">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfxsd">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.emfvalidation">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.gef">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.dtp">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wst">
+ <istrue
+ value="true"/>
+ </condition>
+ <condition
+ property="getprereq.jst">
+ <istrue
+ value="false"/>
+ </condition>
+ <condition
+ property="getprereq.wtp">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--