[Bf-blender-cvs] [cc9528d3c8e] blender2.7: Buildbot: Attempt to fix wrong branch in buildinfo
Sergey Sharybin
noreply at git.blender.org
Thu Apr 18 11:52:39 CEST 2019
Commit: cc9528d3c8e71372528471e8071f494cdec067ee
Author: Sergey Sharybin
Date: Wed Apr 10 15:46:47 2019 +0200
Branches: blender2.7
https://developer.blender.org/rBcc9528d3c8e71372528471e8071f494cdec067ee
Buildbot: Attempt to fix wrong branch in buildinfo
For some reason the buildinfo header was not re-generated. The root
reason is not really clear to me, so simply remove the header similar
to the CMake cache.
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 595eacbda80..a339688c06a 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -154,6 +154,12 @@ if 'cmake' in builder:
if os.path.exists('CMakeCache.txt'):
print("Removing CMake cache")
os.remove('CMakeCache.txt')
+ # Remove buildinfo files to force buildbot to re-generate them.
+ for buildinfo in ('buildinfo.h', 'buildinfo.h.txt', ):
+ full_path = os.path.join('source', 'creator', buildinfo)
+ if os.path.exists(full_path):
+ print("Removing {}" . format(buildinfo))
+ os.remove(full_path)
retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options)
if retcode != 0:
print('Configuration FAILED!')
More information about the Bf-blender-cvs
mailing list