diff options
Diffstat (limited to 'build_files/buildbot')
-rw-r--r-- | build_files/buildbot/buildbot_utils.py | 2 | ||||
-rw-r--r-- | build_files/buildbot/worker_compile.py | 6 | ||||
-rw-r--r-- | build_files/buildbot/worker_pack.py | 4 | ||||
-rw-r--r-- | build_files/buildbot/worker_test.py | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py index a0c33155da1..919b197b380 100644 --- a/build_files/buildbot/buildbot_utils.py +++ b/build_files/buildbot/buildbot_utils.py @@ -24,6 +24,7 @@ import re import subprocess import sys + def is_tool(name): """Check whether `name` is on PATH and marked as executable.""" @@ -32,6 +33,7 @@ def is_tool(name): return which(name) is not None + class Builder: def __init__(self, name, branch, codesign): self.name = name diff --git a/build_files/buildbot/worker_compile.py b/build_files/buildbot/worker_compile.py index 8e19c9436f8..e569a1cf568 100644 --- a/build_files/buildbot/worker_compile.py +++ b/build_files/buildbot/worker_compile.py @@ -23,6 +23,7 @@ import shutil import buildbot_utils + def get_cmake_options(builder): codesign_script = os.path.join( builder.blender_dir, 'build_files', 'buildbot', 'worker_codesign.cmake') @@ -49,6 +50,7 @@ def get_cmake_options(builder): return options + def update_git(builder): # Do extra git fetch because not all platform/git/buildbot combinations # update the origin remote, causing buildinfo to detect local changes. @@ -58,6 +60,7 @@ def update_git(builder): command = ['git', 'fetch', '--all'] buildbot_utils.call(builder.command_prefix + command) + def clean_directories(builder): # Make sure no garbage remained from the previous run if os.path.isdir(builder.install_dir): @@ -73,6 +76,7 @@ def clean_directories(builder): print("Removing {}" . format(buildinfo)) os.remove(full_path) + def cmake_configure(builder): # CMake configuration os.chdir(builder.build_dir) @@ -87,6 +91,7 @@ def cmake_configure(builder): command = ['cmake', builder.blender_dir] + cmake_options buildbot_utils.call(builder.command_prefix + command) + def cmake_build(builder): # CMake build os.chdir(builder.build_dir) @@ -109,6 +114,7 @@ def cmake_build(builder): print("CMake build:") buildbot_utils.call(builder.command_prefix + command) + if __name__ == "__main__": builder = buildbot_utils.create_builder_from_arguments() update_git(builder) diff --git a/build_files/buildbot/worker_pack.py b/build_files/buildbot/worker_pack.py index 96c8db8e6c8..82b406cd42d 100644 --- a/build_files/buildbot/worker_pack.py +++ b/build_files/buildbot/worker_pack.py @@ -29,6 +29,7 @@ from pathlib import Path import buildbot_utils + def get_package_name(builder, platform=None): info = buildbot_utils.VersionInfo(builder) @@ -41,6 +42,7 @@ def get_package_name(builder, platform=None): return package_name + def sign_file_or_directory(path): from codesign.simple_code_signer import SimpleCodeSigner code_signer = SimpleCodeSigner() @@ -64,6 +66,7 @@ def create_buildbot_upload_zip(builder, package_files): sys.stderr.write('Create buildbot_upload.zip failed: ' + str(ex) + '\n') sys.exit(1) + def create_tar_xz(src, dest, package_name): # One extra to remove leading os.sep when cleaning root for package_root ln = len(src) + 1 @@ -91,6 +94,7 @@ def create_tar_xz(src, dest, package_name): package.add(entry[0], entry[1], recursive=False, filter=_fakeroot) package.close() + def cleanup_files(dirpath, extension): for f in os.listdir(dirpath): filepath = os.path.join(dirpath, f) diff --git a/build_files/buildbot/worker_test.py b/build_files/buildbot/worker_test.py index b959568a5c6..db02801007e 100644 --- a/build_files/buildbot/worker_test.py +++ b/build_files/buildbot/worker_test.py @@ -22,18 +22,21 @@ import buildbot_utils import os import sys + def get_ctest_arguments(builder): args = ['--output-on-failure'] if builder.platform == 'win': args += ['-C', 'Release'] return args + def test(builder): os.chdir(builder.build_dir) command = builder.command_prefix + ['ctest'] + get_ctest_arguments(builder) buildbot_utils.call(command) + if __name__ == "__main__": builder = buildbot_utils.create_builder_from_arguments() test(builder) |