From c10ac1bb5c9d0e3bffa97cb5499680c6f1b682b7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Sep 2017 20:52:22 +0200 Subject: macOS: officially upgrade to 10.9 libraries from lib/darwin. This removes a bunch of code that is no longer needed, and running "make update" will now automatically download the new libraries. Differential Revision: https://developer.blender.org/D2861 --- build_files/buildbot/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index dad7f1e01d2..d5be6e1bf9e 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -312,7 +312,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) -- cgit v1.2.3 From 97eefc1fd9069794cbfbba23de01fc1813f738d7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Sep 2017 23:21:27 +0200 Subject: Code cleanup: remove unnecessary buildbot code after macOS library upgrade. --- build_files/buildbot/master.cfg | 5 ----- 1 file changed, 5 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index d5be6e1bf9e..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', -- cgit v1.2.3