Buildbot: initial work to enable CMake OSX slave
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 20 Dec 2015 08:59:04 +0000 (13:59 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 20 Dec 2015 08:59:04 +0000 (13:59 +0500)
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py
build_files/buildbot/slave_test.py

index 0afbd9f372e13197753f7fde30064324c419cfc0..2f5110e9d9c8e6889b6841be1953d8bed4369df7 100644 (file)
@@ -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')
index c0f9a84ea18cf63c153769b446a152e112a16e99..a4ea426dddac075cddc0656bf9ae9d350d8c5443 100644 (file)
@@ -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')]
index 973e17a1f3ba7f9cdcb8ed7af18af8dc7d398978..07fe27ce9675b2b7f4047fe03cbab3dde02aa36e 100644 (file)
@@ -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)