[Bf-blender-cvs] [5baf1dddd54] tmp-buildbot-cleanup: Buildbot related files have been moved to own repository
James Monteath
noreply at git.blender.org
Fri May 28 12:19:02 CEST 2021
Commit: 5baf1dddd54eb320799632e69cef5b711250cba3
Author: James Monteath
Date: Fri May 28 10:16:39 2021 +0200
Branches: tmp-buildbot-cleanup
https://developer.blender.org/rB5baf1dddd54eb320799632e69cef5b711250cba3
Buildbot related files have been moved to own repository
===================================================================
D build_files/buildbot/buildbot_utils.py
D build_files/buildbot/codesign/absolute_and_relative_filename.py
D build_files/buildbot/codesign/archive_with_indicator.py
D build_files/buildbot/codesign/base_code_signer.py
D build_files/buildbot/codesign/config_builder.py
D build_files/buildbot/codesign/config_common.py
D build_files/buildbot/codesign/config_server_template.py
D build_files/buildbot/codesign/exception.py
D build_files/buildbot/codesign/linux_code_signer.py
D build_files/buildbot/codesign/macos_code_signer.py
D build_files/buildbot/codesign/simple_code_signer.py
D build_files/buildbot/codesign/util.py
D build_files/buildbot/codesign/windows_code_signer.py
D build_files/buildbot/codesign_server_linux.py
D build_files/buildbot/codesign_server_macos.py
D build_files/buildbot/codesign_server_windows.bat
D build_files/buildbot/codesign_server_windows.py
D build_files/buildbot/worker_bundle_dmg.py
D build_files/buildbot/worker_codesign.cmake
D build_files/buildbot/worker_codesign.py
D build_files/buildbot/worker_compile.py
D build_files/buildbot/worker_pack.py
D build_files/buildbot/worker_test.py
D build_files/buildbot/worker_update.py
===================================================================
diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py
deleted file mode 100644
index 7e9858d9268..00000000000
--- a/build_files/buildbot/buildbot_utils.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import argparse
-import os
-import re
-import subprocess
-import sys
-
-
-def is_tool(name):
- """Check whether `name` is on PATH and marked as executable."""
-
- # from whichcraft import which
- from shutil import which
-
- return which(name) is not None
-
-
-class Builder:
- def __init__(self, name, branch, codesign):
- self.name = name
- self.branch = branch
- self.is_release_branch = re.match("^blender-v(.*)-release$", branch) is not None
- self.codesign = codesign
-
- # Buildbot runs from build/ directory
- self.blender_dir = os.path.abspath(os.path.join('..', 'blender.git'))
- self.build_dir = os.path.abspath(os.path.join('..', 'build'))
- self.install_dir = os.path.abspath(os.path.join('..', 'install'))
- self.upload_dir = os.path.abspath(os.path.join('..', 'install'))
-
- # Detect platform
- if name.startswith('mac'):
- self.platform = 'mac'
- self.command_prefix = []
- elif name.startswith('linux'):
- self.platform = 'linux'
- if is_tool('scl'):
- self.command_prefix = ['scl', 'enable', 'devtoolset-9', '--']
- else:
- self.command_prefix = []
- elif name.startswith('win'):
- self.platform = 'win'
- self.command_prefix = []
- else:
- raise ValueError('Unkonw platform for builder ' + self.platform)
-
- # Always 64 bit now
- self.bits = 64
-
-
-def create_builder_from_arguments():
- parser = argparse.ArgumentParser()
- parser.add_argument('builder_name')
- parser.add_argument('branch', default='master', nargs='?')
- parser.add_argument("--codesign", action="store_true")
- args = parser.parse_args()
- return Builder(args.builder_name, args.branch, args.codesign)
-
-
-class VersionInfo:
- def __init__(self, builder):
- # Get version information
- buildinfo_h = os.path.join(builder.build_dir, "source", "creator", "buildinfo.h")
- blender_h = os.path.join(builder.blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
-
- version_number = int(self._parse_header_file(blender_h, 'BLENDER_VERSION'))
- version_number_patch = int(self._parse_header_file(blender_h, 'BLENDER_VERSION_PATCH'))
- version_numbers = (version_number // 100, version_number % 100, version_number_patch)
- self.short_version = "%d.%d" % (version_numbers[0], version_numbers[1])
- self.version = "%d.%d.%d" % version_numbers
- self.version_cycle = self._parse_header_file(blender_h, 'BLENDER_VERSION_CYCLE')
- self.hash = self._parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
-
- if self.version_cycle == "release":
- # Final release
- self.full_version = self.version
- self.is_development_build = False
- elif self.version_cycle == "rc":
- # Release candidate
- self.full_version = self.version + self.version_cycle
- self.is_development_build = False
- else:
- # Development build
- self.full_version = self.version + '-' + self.hash
- self.is_development_build = True
-
- def _parse_header_file(self, filename, define):
- import re
- regex = re.compile(r"^#\s*define\s+%s\s+(.*)" % define)
- with open(filename, "r") as file:
- for l in file:
- match = regex.match(l)
- if match:
- return match.group(1)
- return None
-
-
-def call(cmd, env=None, exit_on_error=True):
- print(' '.join(cmd))
-
- # Flush to ensure correct order output on Windows.
- sys.stdout.flush()
- sys.stderr.flush()
-
- retcode = subprocess.call(cmd, env=env)
- if exit_on_error and retcode != 0:
- sys.exit(retcode)
- return retcode
diff --git a/build_files/buildbot/codesign/absolute_and_relative_filename.py b/build_files/buildbot/codesign/absolute_and_relative_filename.py
deleted file mode 100644
index cb42710e785..00000000000
--- a/build_files/buildbot/codesign/absolute_and_relative_filename.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-from dataclasses import dataclass
-from pathlib import Path
-from typing import List
-
-
- at dataclass
-class AbsoluteAndRelativeFileName:
- """
- Helper class which keeps track of absolute file path for a direct access and
- corresponding relative path against given base.
-
- The relative part is used to construct a file name within an archive which
- contains files which are to be signed or which has been signed already
- (depending on whether the archive is addressed to signing server or back
- to the buildbot worker).
- """
-
- # Base directory which is where relative_filepath is relative to.
- base_dir: Path
-
- # Full absolute path of the corresponding file.
- absolute_filepath: Path
-
- # Derived from full file path, contains part of the path which is relative
- # to a desired base path.
- relative_filepath: Path
-
- def __init__(self, base_dir: Path, filepath: Path):
- self.base_dir = base_dir
- self.absolute_filepath = filepath.resolve()
- self.relative_filepath = self.absolute_filepath.relative_to(
- self.base_dir)
-
- @classmethod
- def from_path(cls, path: Path) -> 'AbsoluteAndRelativeFileName':
- assert path.is_absolute()
- assert path.is_file()
-
- base_dir = path.parent
- return AbsoluteAndRelativeFileName(base_dir, path)
-
- @classmethod
- def recursively_from_directory(cls, base_dir: Path) \
- -> List['AbsoluteAndRelativeFileName']:
- """
- Create list of AbsoluteAndRelativeFileName for all the files in the
- given directory.
-
- NOTE: Result will be pointing to a resolved paths.
- """
- assert base_dir.is_absolute()
- assert base_dir.is_dir()
-
- base_dir = base_dir.resolve()
-
- result = []
- for filename in base_dir.glob('**/*'):
- if not filename.is_file():
- continue
- result.append(AbsoluteAndRelativeFileName(base_dir, filename))
- return result
diff --git a/build_files/buildbot/codesign/archive_with_indicator.py b/build_files/buildbot/codesign/archive_with_indicator.py
deleted file mode 100644
index aebf5a15417..00000000000
--- a/build_files/buildbot/codesign/archive_with_indicator.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import dataclasses
-import json
-import os
-
-from pathlib import Path
-from typing import Optional
-
-import codesign.util as util
-
-
-class ArchiveStateError(Exception):
- message: str
-
- def __init__(self, message):
- self.message = message
- super().__init__(self.message)
-
-
- at dataclasses.dataclass
-class ArchiveState:
- """
- Additional information (state) of the archive
-
- Includes information like expected file size of the archive file in the case
- the archive file is expected to be successfully created.
-
- If the archive can not be created, this state will contain error message
- indicating details of error.
- """
-
- # Size in bytes of the corresponding archive.
- file_size: Optional[int] = None
-
- # Non-empty value indicates that error has happenned.
- error_message: str = ''
-
- def has_error(self) -> bool:
- """
- Check whether the archive is at error state
- """
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list