Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-10 13:57:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only build one arch for normal builds on OSX so dependency tracking will be turned on, so we can do incremental builds, so we can have a faster turn-around time on those builders.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-07-12 09:19:05 +00:00
parent 3670519430
commit 0ac876316d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
buildbot/master.cfg
View File

@@ -130,20 +130,13 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
# all of them need to fetch the source
factory = BuildFactory()
# old
#factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk',
# workdir="wxWidgets", mode='copy'))
#factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk',
# workdir="Phoenix", mode='copy'))
# Do an incremental update, keeping prior build tree
mode = 'incremental'
method = None
clean = ''
# Since the wx build doesn't have good dependency checking on MSW, clean first.
# Generation of dependency files is turned off for universal builds, so clean on osx too.
if port in ['win32', 'win64', 'osx']:
if port in ['win32', 'win64']:
clean = 'clean'
# Start from a clean build tree for the daily builds
@@ -162,7 +155,14 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
else:
cmd = 'python -u build.py %s %s dox touch etg --nodoc sip build' % (pyVer, clean)
if port == 'osx':
cmd += ' --mac_arch=i386,x86_64'
if buildType == 'buildOnly':
# Only build one arch for the normal builds, so dependency
# tracking will be turned on so we can have faster turn-around
# times for those builds.
cmd += ' --mac_arch=x86_64'
else:
# Build both architectures for the distribution builders
cmd += ' --mac_arch=i386,x86_64'
if port == 'msw':
cmd += ' --cairo'
if buildType == 'dist':