diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
| commit | e3fe8128e41bb7c576f02ba234dfabf5c399cb60 (patch) | |
| tree | cd148a38fb32cdb1a36fc576b9f36fe864003e40 /build_files/buildbot | |
| parent | 31be6fccf83095f4245f97730ccc7e61e51cfcec (diff) | |
| parent | 5a1954a5cbd7b0b1458fdc80ada5acd036278309 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/master.cfg | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index dad7f1e01d2..c721d5a4ba9 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -246,8 +246,6 @@ def git_submodules_update(): def lib_svn_step(dir): name = "lib svn" - if dir == "darwin": - name = "C++11 lib svn" return SVN(name=name, baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, codebase='lib svn', @@ -277,9 +275,6 @@ def generic_builder(id, libdir='', branch='', rsync=False): f = BuildFactory() if libdir != '': f.addStep(lib_svn_step(libdir)) - # Special trick to make sure we always have all the libs. - if libdir.startswith("darwin"): - f.addStep(lib_svn_step("darwin")) for submodule in ('blender-translations', 'blender-addons', @@ -312,7 +307,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders -add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=1) +add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin', generic_builder, hour=1) add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2) add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1) add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1) |