diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
commit | 871b7ba8922650c34b487fec29a9d677b1aeadfd (patch) | |
tree | a13c8635e43919aed3ad48afe096f6501bbeb9a2 /build_files/buildbot/slave_compile.py | |
parent | 55263c8a4c03c1add138e5191f98a8b68591289f (diff) | |
parent | 9fd0060c0f3458e53b38003d1388f16cb56f45d8 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
-rw-r--r-- | build_files/buildbot/slave_compile.py | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index a77f237e978..fc430971c19 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -48,7 +48,7 @@ if 'cmake' in builder: # cmake # Some fine-tuning configuration - blender_dir = os.path.join('..', blender_dir) + blender_dir = os.path.abspath(blender_dir) build_dir = os.path.abspath(os.path.join('..', 'build', builder)) install_dir = os.path.abspath(os.path.join('..', 'install', builder)) targets = ['blender'] @@ -157,10 +157,6 @@ if 'cmake' in builder: if target != 'blender': target_build_dir += '_' + target target_name = 'install' - # Make sure build directory exists and enter it - if not os.path.isdir(target_build_dir): - os.mkdir(target_build_dir) - os.chdir(target_build_dir) # Tweaking CMake options to respect the target target_cmake_options = cmake_options[:] if target == 'cuda': @@ -171,6 +167,19 @@ if 'cmake' in builder: # other targets don't compile cuda binaries. if 'cuda' in targets and target != 'cuda': target_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF") + # Do extra git fetch because not all platform/git/buildbot combinations + # update the origin remote, causing buildinfo to detect local changes. + os.chdir(blender_dir) + print("Fetching remotes") + command = ['git', 'fetch', '--all'] + print(command) + retcode = subprocess.call(target_chroot_prefix + command) + if retcode != 0: + sys.exit(retcode) + # Make sure build directory exists and enter it + if not os.path.isdir(target_build_dir): + os.mkdir(target_build_dir) + os.chdir(target_build_dir) # Configure the build print("CMake options:") print(target_cmake_options) @@ -185,11 +194,11 @@ if 'cmake' in builder: if 'win32' in builder or 'win64' in builder: command = ['cmake', '--build', '.', '--target', target_name, '--config', 'Release'] else: - command = target_chroot_prefix + ['make', '-s', '-j2', target_name] + command = ['make', '-s', '-j2', target_name] print("Executing command:") print(command) - retcode = subprocess.call(command) + retcode = subprocess.call(target_chroot_prefix + command) if retcode != 0: sys.exit(retcode) |