Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-12-20 11:59:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-12-20 11:59:04 +0300
commit03d9f9a6194dd2caa44de1d67b3198b8fa9edc75 (patch)
treef691487db99b5688f925f42939f3262c5fe165ca /build_files/buildbot
parent7ac5f2fef6bf3f77cac5e90e1d7de20990b79c53 (diff)
Buildbot: initial work to enable CMake OSX slave
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/slave_compile.py2
-rw-r--r--build_files/buildbot/slave_pack.py2
-rw-r--r--build_files/buildbot/slave_test.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 0afbd9f372e..2f5110e9d9c 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -56,6 +56,8 @@ if 'cmake' in builder:
cmake_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
if builder.startswith('mac'):
+ remove_cache = True
+ install_dir = None
# Set up OSX architecture
if builder.endswith('x86_64_cmake'):
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index c0f9a84ea18..a4ea426ddda 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -103,7 +103,7 @@ if builder.find('scons') != -1:
sys.exit(retcode)
else:
# CMake
- if 'win' in builder:
+ if 'win' in builder or 'mac' in builder:
os.chdir(build_dir)
files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')]
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 973e17a1f3b..07fe27ce967 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -35,7 +35,7 @@ blender_dir = '../blender.git'
if "cmake" in builder:
# cmake
- if "linux" in builder:
+ if "linux" in builder or 'mac' in builder:
print("Automated tests are still DISABLED!")
sys.exit(0)