prep to restore 4.1 builds
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/publish.xml b/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
index d9436cc..8b49c9d 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
@@ -604,11 +604,6 @@
includes="**/*.php,*.xml"
token="@4x.mirror.prefixuri@"
value="${4x.mirror.prefixuri}"/>
- <replace
- dir="${resultDir}"
- includes="**/*.php,*.xml"
- token="@4x.fspath.prefix@"
- value="${eclipse.fspath.prefix}"/>
<replace
dir="${resultDir}"
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/buildvariables.php
index 32071ba..553b255 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/buildvariables.php
@@ -44,7 +44,7 @@
$e4xBuildHome="@4xBuildHome@";
$e4xName="@4xName@";
$e4xDescription="@4xDescription@";
-
+$e4xMirrorPrefixuri="@4x.mirror.prefixuri@";
$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php
index 3cb756b..77fa15a 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php
+++ b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php
@@ -11,9 +11,8 @@
not necessarily required, but instead some subset. Also listed are
some frequently needed links for committer-required packages when
creating new development environments, or targets to run against.</p>
- <p>Note that WTP requires Java 5 or higher (and, for some things,
- actually requires a JDK rather than only a JRE) even though many other
- <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
+ <p>Note that WTP as a whole requires Java 6 even though subsets of WTP and other
+ <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> might
run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
JRE levels</a>.</p>
<p></p>
@@ -75,7 +74,7 @@
echo "<td align=\"right\">";
- echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $e4xURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $e4xMirrorPrefixuri, $e4xURL, $recommendedFile, $eclipseFSpathPrefix);
echo " or <a href=\"" . $e4xBuildURL . "\">appropriate platform</a>";
echo " or <a href=\"" . $e4xBuildHome . "\">equivalent</a></td>";
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/index.html.template.php
index 6bbccd2..32e233c 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/index.html.template.php
@@ -100,7 +100,9 @@
or Eclipse 4.1. But for Indigo, our "official" set of binaries will be that produced when compiling against Eclipse 3.7.</p>
<p>To run and test WTP with Eclipse 4.1, simply start with Eclipse 4.1 SDK, unzipped.
Then, install our normal prereqs into it -- EMF and XSD, GEF, DTP, (and, optionally Unit Tests Framework) -- either as listed above, or from the same download page
- you get WTP from. Then, install a WTP 3.3 build distribution into it.
+ you get WTP from. Then, into that 4.1 based install, add a WTP 3.3 build distribution obtained from one of the
+ normal WTP download pages, where WTP was compiled against 3.7. It sounds more complicated that it is ...
+ it is the same as you'd normall do for WTP, but you just start with a different Eclipse SDK.
</td>
</tr>