Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the branches to use in the buildbot builds.

Browse Source 
Stable branch is 3.0 now and not 2.8 any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-15 13:40:59 +00:00
parent 482a131352
commit 09f15c1640
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/buildbot/config/include/defs.xml
View File

@@ -19,9 +19,9 @@
Constants Constants
--> -->
<xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template> <xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
<xsl:template name="STABLE_BRANCH">branches/WX_2_8_BRANCH</xsl:template> <xsl:template name="STABLE_BRANCH">branches/WX_3_0_BRANCH</xsl:template>
<xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable> <xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>
<xsl:template name="RELEASE_BRANCH">branches/WX_2_9_0_BRANCH</xsl:template> <xsl:template name="RELEASE_BRANCH">branches/WX_3_1_0_BRANCH</xsl:template>
<xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable> <xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>
<xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template> <xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
@@ -45,7 +45,7 @@
Typically just: Typically just:
<checkout/> <checkout/>
for the trunk, or: for the trunk, or:
<checkout branch="branches/WX_2_8_BRANCH"/> <checkout branch="branches/WX_3_0_BRANCH"/>
to checkout a branch. to checkout a branch.
--> -->
<xsl:template name="checkout"> <xsl:template name="checkout">

2
build/buildbot/config/include/unix.xml
View File

@@ -37,7 +37,7 @@
Usage typically just: Usage typically just:
<checkout/> <checkout/>
for the trunk, or: for the trunk, or:
<checkout branch="branches/WX_2_8_BRANCH"/> <checkout branch="branches/WX_3_0_BRANCH"/>
to checkout a branch. to checkout a branch.
--> -->
<xsl:template name="checkout"> <xsl:template name="checkout">

2
build/buildbot/config/include/xp_vc.xml
View File

@@ -41,7 +41,7 @@
Usage typically just: Usage typically just:
<checkout/> <checkout/>
for the trunk, or: for the trunk, or:
<checkout branch="branches/WX_2_8_BRANCH"/> <checkout branch="branches/WX_3_0_BRANCH"/>
to checkout a branch. to checkout a branch.
--> -->
<xsl:template name="checkout"> <xsl:template name="checkout">

3
docs/tech/tn0022.txt
View File

@@ -175,3 +175,6 @@ milestone (ask Vadim or Robin to do it or to get admin password).
Run misc/scripts/inc_release to increment micro version, i.e. replace x.y.z Run misc/scripts/inc_release to increment micro version, i.e. replace x.y.z
with x.y.z+1 (minor or major versions updates require manual intervention). with x.y.z+1 (minor or major versions updates require manual intervention).
Update the definition of the stable and release branches in
build/buildbot/config/include/defs.xml after a minor version change.