diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml index 9deaa2588d756b133b95a450d148866b82c96f40..7d85499a071c79a78b70325341e39bd9bd26d222 100644 --- a/releng.wtpbuilder/scripts/build/runbuild.xml +++ b/releng.wtpbuilder/scripts/build/runbuild.xml @@ -248,12 +248,26 @@ <!-- set buildBranch, and create label.properties--> <target name="init"> + <condition + property="buildBranch" + value="R3.0.1"> + <equals + arg1="${mapVersionTag}" + arg2="R3_0_1_patches" /> + </condition> + <condition + property="buildBranch" + value="R3.1"> + <equals + arg1="${mapVersionTag}" + arg2="HEAD" /> + </condition> <condition property="buildBranch" value="R3.0"> <equals arg1="${mapVersionTag}" - arg2="HEAD" /> + arg2="R3_0_maintenance" /> </condition> <condition property="buildBranch" @@ -301,7 +315,7 @@ <!-- this happens, for example, when using a "tempTest" branch --> <property name="buildBranch" - value="R3.0" /> + value="R3.1" /> <!-- strip trailing blanks. Seems either Eclipse, or CVS make it hard to not have trailing spaces --> <replaceregexp