From c78935a25f39a042cccee5bf58bae63c24227201 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 2 May 2007 08:01:38 +0000
Subject: [PATCH] ~ plus fix to pull wtpBuilder correctly (early)
---
releng.wtpbuilder/build.properties | 6 ------
releng.wtpbuilder/scripts/build/runBuild.properties | 4 ++++
releng.wtpbuilder/scripts/build/runbuild.xml | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
create mode 100644 releng.wtpbuilder/scripts/build/runBuild.properties
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index ecc8b884a..8a0105ace 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -42,12 +42,6 @@ eclipse.builder.version=v20070321b
eclipse.builder.fetch=true
-wtpBuildTools.url = http://download.eclipse.org/webtools/wtpBuildTools/drops/R2.0/T-T200704100508-200704100508/updateSite/plugins
-wtpBuildTools.file = org.eclipse.wtp.releng.tools_1.0.0.v200704100230.jar
-wtpBuildTools.name = wtp build tools
-wtpBuildTools.description = wtp build tools
-
-
archivesFormat=*,*,*-antZip
# This parameter is specific to the compiler
diff --git a/releng.wtpbuilder/scripts/build/runBuild.properties b/releng.wtpbuilder/scripts/build/runBuild.properties
new file mode 100644
index 000000000..7402b7d1f
--- /dev/null
+++ b/releng.wtpbuilder/scripts/build/runBuild.properties
@@ -0,0 +1,4 @@
+wtpBuildTools.url = http://download.eclipse.org/webtools/wtpBuildTools/drops/R2.0/T-T200704100508-200704100508/updateSite/plugins
+wtpBuildTools.file = org.eclipse.wtp.releng.tools_1.0.0.v200704100230.jar
+wtpBuildTools.name = wtp build tools
+wtpBuildTools.description = wtp build tools
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 0229c9c1a..84aa67475 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -123,8 +123,8 @@
tag="${eclipse.builder.version}" />
- <property file="../../build.properties" />
- <fail unless="wtpBuilderTools.url" />
+ <property file="runBuild.properties" />
+ <fail unless="wtpBuildTools.url" />
<!-- now add our WTP base builder -->
<get dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/" src="${wtpBuilderTools.url}/${wtpBuilder.file}"/>
--
GitLab