fix odd buildBranch logic
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index c4ce5d1..1dea930 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -35,8 +35,8 @@
<property name="eclipse.builder.fetch" value="${eclipse.builder.fetch}" />
<property name="logExtension" value="${logExtension}" />
</ant>
-
-
+
+
</target>
@@ -92,7 +92,7 @@
<target name="init">
<dirname file="${ant.file}" property="wtp.builder.home" />
- <condition property="buildBranch" value="R2.0">
+ <condition property="buildBranch" value="R3.0">
<equals arg1="${mapVersionTag}" arg2="HEAD" />
</condition>
<condition property="buildBranch" value="R0.7">
@@ -104,14 +104,17 @@
<condition property="buildBranch" value="R1.5">
<equals arg1="${mapVersionTag}" arg2="R1_5_maintenance" />
</condition>
- <!-- if not set above, assume R2.0 -->
- <!-- this happens, for example, when using a "tempTest" branch -->
- <property name="buildBranch" value="R2.0"/>
-
+ <condition property="buildBranch" value="R2.0">
+ <equals arg1="${mapVersionTag}" arg2="R2_0_maintenance" />
+ </condition>
+ <!-- if not set above, assume R3.0 -->
+ <!-- this happens, for example, when using a "tempTest" branch -->
+ <property name="buildBranch" value="R3.0" />
+
<touch file="${user.home}/.cvspass" />
<property file="${wtp.builder.home}/build.properties" />
-
+
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${buildDirectory}/label.properties" />
@@ -135,5 +138,5 @@
</target>
-
+
</project>
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index ce586b9..87d773b 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -180,29 +180,33 @@
</target>
- <target name="getWTPBaseBuilder" depends="checkWTPBaseBuilder" unless="wtpBuilderPresent">
- <get
- dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"
- src="${wtpBuildTools.url}/${wtpBuildTools.file}"
- usetimestamp="true" />
- </target>
+ <target
+ name="getWTPBaseBuilder"
+ depends="checkWTPBaseBuilder"
+ unless="wtpBuilderPresent">
+ <get
+ dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"
+ src="${wtpBuildTools.url}/${wtpBuildTools.file}"
+ usetimestamp="true" />
+ </target>
- <target name="checkWTPBaseBuilder">
- <condition property="wtpBuilderPresent">
- <available file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"/>
- </condition>
- </target>
-
-
-
-
-
+ <target name="checkWTPBaseBuilder">
+ <condition property="wtpBuilderPresent">
+ <available
+ file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}" />
+ </condition>
+ </target>
+
+
+
+
+
<target name="init">
<condition
property="buildBranch"
- value="R2.0">
+ value="R3.0">
<equals
arg1="${mapVersionTag}"
arg2="HEAD" />
@@ -228,7 +232,19 @@
arg1="${mapVersionTag}"
arg2="R1_5_maintenance" />
</condition>
-
+ <condition
+ property="buildBranch"
+ value="R2.0">
+ <equals
+ arg1="${mapVersionTag}"
+ arg2="R2_0_maintenance" />
+ </condition>
+ <!-- if not set above, assume R3.0 -->
+ <!-- this happens, for example, when using a "tempTest" branch -->
+ <property
+ name="buildBranch"
+ value="R3.0" />
+
<property file="${wtp.builder.home}/build.properties" />