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

add release branch (currently WX_2_9_BRANCH) definitions and reenable VC build slaves for it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-26 11:00:54 +00:00
parent a3ef8eb503
commit 0e6e5fc88f
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/buildbot/config/common.xml
View File

@@ -31,6 +31,13 @@
<fileNotImportant>docs/* interface/*</fileNotImportant> <fileNotImportant>docs/* interface/*</fileNotImportant>
</scheduler> </scheduler>
<scheduler>
<name>release_quick</name>
<branch><RELEASE_BRANCH/></branch>
<treeStableTimer>900</treeStableTimer>
<fileNotImportant>docs/* interface/*</fileNotImportant>
</scheduler>
<scheduler> <scheduler>
<name>stable_quick</name> <name>stable_quick</name>
<branch><STABLE_BRANCH/></branch> <branch><STABLE_BRANCH/></branch>
@@ -75,6 +82,10 @@
<name><STABLE_BRANCH/></name> <name><STABLE_BRANCH/></name>
</slavelock> </slavelock>
<slavelock>
<name><RELEASE_BRANCH/></name>
</slavelock>
<!-- <!--
Map SVN user ids to email addresses. Map SVN user ids to email addresses.
--> -->

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

@@ -22,6 +22,8 @@
<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_2_8_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_BRANCH</xsl:template>
<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>
<!-- <!--

6
build/buildbot/config/xp_vc.xml
View File

@@ -106,7 +106,6 @@
</steps> </steps>
</build> </build>
<!-- VZ: disable because this results in buildbot configuration error
<build> <build>
<name>XPSP2 VC9 wxMSW 2.9.x debug</name> <name>XPSP2 VC9 wxMSW 2.9.x debug</name>
<builddir>XPSP2_VC9_wxMSW_29x_debug</builddir> <builddir>XPSP2_VC9_wxMSW_29x_debug</builddir>
@@ -114,7 +113,7 @@
<sandbox>VC9</sandbox> <sandbox>VC9</sandbox>
<make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make> <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
<steps> <steps>
<checkout branch="branches/WX_2_9_0_BRANCH"/> <checkout branch="{$RELEASE_BRANCH}"/>
<compile-all tests="true"/> <compile-all tests="true"/>
<run-tests/> <run-tests/>
</steps> </steps>
@@ -127,10 +126,9 @@
<sandbox>VC6</sandbox> <sandbox>VC6</sandbox>
<make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make> <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
<steps> <steps>
<checkout branch="branches/WX_2_9_0_BRANCH"/> <checkout branch="{$RELEASE_BRANCH}"/>
<compile-all tests="true"/> <compile-all tests="true"/>
<run-tests/> <run-tests/>
</steps> </steps>
</build> </build>
-->
</bot> </bot>