[Bf-blender-cvs] [1013418] master: Buildbot: Use proper archive name for CMake OSX slave
Sergey Sharybin
noreply at git.blender.org
Sun Dec 20 10:12:58 CET 2015
Commit: 101341845c9d85423246d2e612784e8e3009e70f
Author: Sergey Sharybin
Date: Sun Dec 20 14:12:04 2015 +0500
Branches: master
https://developer.blender.org/rB101341845c9d85423246d2e612784e8e3009e70f
Buildbot: Use proper archive name for CMake OSX slave
===================================================================
M build_files/buildbot/slave_pack.py
===================================================================
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index a4ea426..5355c70 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -119,6 +119,15 @@ else:
blender_full_version = '.'.join(blender_version[0:2])
git_hash = tokens[2].split('.')[1]
platform = builder.split('_')[0]
+ if platform == 'mac':
+ # Special exception for OSX
+ platform = 'OSX-10.6-'
+ if builder.endswith('x86_64_10_6_cmake'):
+ platform += 'x86_64'
+ elif builder.endswith('i386_10_6_cmake'):
+ platform += 'i386'
+ elif builder.endswith('ppc_10_6_cmake'):
+ platform += 'ppc'
builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
if branch != '':
builderified_name = branch + "-" + builderified_name
More information about the Bf-blender-cvs
mailing list