X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cdist;h=28c174ea95ad5485d5df54634a4aa3662a66c995;hb=7d3a6c79250b5acdd0914883ef1b08f9a0c8ffe3;hp=32571f73a7050fa55ce14af14b67af8b7688602d;hpb=b65c36ffa24bb5cc62453c13f8fe3da6cc998011;p=cdist.git diff --git a/cdist b/cdist index 32571f7..28c174e 100755 --- a/cdist +++ b/cdist @@ -17,20 +17,22 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. from __future__ import print_function -import os -import sys -import shutil -import glob -import tempfile + import argparse -import datetime -import subprocess -import re import copy -import inspect +import datetime import getpass -import shlex +import glob +import inspect import multiprocessing +import os +import re +import shlex +import shutil +import subprocess +import sys +import tempfile +import time TEMPORARY_DIRECTORY = '/var/tmp' @@ -68,6 +70,10 @@ class Trees: self.trees.append(nt) return nt + def add_built(self, name, specifier, target): + self.trees.append(Tree(name, specifier, target, None, built=True)) + + class Globals: quiet = False command = None @@ -206,7 +212,7 @@ def copytree(a, b): command('scp -r %s %s' % (scp_escape(a), scp_escape(b))) def copyfile(a, b): - log_normal('copy %s -> %s' % (scp_escape(a), scp_escape(b))) + log_normal('copy %s -> %s with cwd %s' % (scp_escape(a), scp_escape(b), os.getcwd())) if b.startswith('s3://'): command('s3cmd -P put "%s" "%s"' % (a, b)) else: @@ -276,45 +282,6 @@ def read_wscript_variable(directory, variable): f.close() return None -def set_version_in_wscript(version): - f = open('wscript', 'rw') - o = open('wscript.tmp', 'w') - while True: - l = f.readline() - if l == '': - break - - s = l.split() - if len(s) == 3 and s[0] == "VERSION": - print("VERSION = '%s'" % version, file=o) - else: - print(l, file=o, end="") - f.close() - o.close() - - os.rename('wscript.tmp', 'wscript') - -def append_version_to_changelog(version): - try: - f = open('ChangeLog', 'r') - except: - log_normal('Could not open ChangeLog') - return - - c = f.read() - f.close() - - f = open('ChangeLog', 'w') - now = datetime.datetime.now() - f.write('%d-%02d-%02d Carl Hetherington \n\n\t* Version %s released.\n\n' % (now.year, now.month, now.day, version)) - f.write(c) - -def append_version_to_debian_changelog(version): - if not os.path.exists('debian'): - log_normal('Could not find debian directory') - return - - command('dch -b -v %s-1 "New upstream release."' % version) def devel_to_git(git_commit, filename): if git_commit is not None: @@ -455,20 +422,24 @@ class Target(object): def setup(self): pass - def package(self, project, checkout, output_dir, options): - tree = self.build(project, checkout, options) - tree.add_defaults(options) + def _build_packages(self, tree, options): if len(inspect.getfullargspec(tree.cscript['package']).args) == 3: packages = tree.call('package', tree.version, options) else: log_normal("Deprecated cscript package() method with no options parameter") packages = tree.call('package', tree.version) - if isinstance(packages, list): - for p in packages: - copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))) - else: - copyfile(packages, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, packages)))) + return packages if isinstance(packages, list) else [packages] + + def _copy_packages(self, tree, packages, output_dir): + for p in packages: + copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))) + + def package(self, project, checkout, output_dir, options, no_notarize): + tree = self.build(project, checkout, options) + tree.add_defaults(options) + p = self._build_packages(tree, options) + self._copy_packages(tree, p, output_dir) def build(self, project, checkout, options): tree = globals.trees.get(project, checkout, self) @@ -477,18 +448,17 @@ class Target(object): tree.build(options) return tree - def test(self, tree, test, options): + def test(self, project, checkout, target, test, options): """test is the test case to run, or None""" - if self.build_dependencies: - tree.build_dependencies(options) - tree.build(options) + tree = globals.trees.get(project, checkout, target) tree.add_defaults(options) - if len(inspect.getfullargspec(tree.cscript['test']).args) == 3: - return tree.call('test', options, test) - else: - log_normal('Deprecated cscript test() method with no options parameter') - return tree.call('test', test) + with TreeDirectory(tree): + if len(inspect.getfullargspec(tree.cscript['test']).args) == 3: + return tree.call('test', options, test) + else: + log_normal('Deprecated cscript test() method with no options parameter') + return tree.call('test', test) def set(self, a, b): self.variables[a] = b @@ -720,10 +690,10 @@ class LinuxTarget(DockerTarget): self.set('CC', '"ccache gcc"') self.set('CXX', '"ccache g++"') - def test(self, tree, test, options): + def test(self, project, checkout, target, test, options): self.append_with_colon('PATH', '%s/bin' % self.directory) self.append_with_colon('LD_LIBRARY_PATH', '%s/lib' % self.directory) - super(LinuxTarget, self).test(tree, test, options) + super(LinuxTarget, self).test(project, checkout, target, test, options) class AppImageTarget(LinuxTarget): @@ -733,6 +703,38 @@ class AppImageTarget(LinuxTarget): self.privileged = True +def notarize(dmg, bundle_id): + p = subprocess.run( + ['xcrun', 'altool', '--notarize-app', '-t', 'osx', '-f', dmg, '--primary-bundle-id', bundle_id, '-u', config.get('apple_id'), '-p', config.get('apple_password'), '--output-format', 'xml'], + capture_output=True + ) + + def string_after(process, key): + lines = p.stdout.decode('utf-8').splitlines() + request_uuid = None + for i in range(0, len(lines)): + if lines[i].find(key) != -1: + return lines[i+1].strip().replace('', '').replace('', '') + + raise Error("Missing expected response %s from Apple" % key) + + request_uuid = string_after(p, "RequestUUID") + + for i in range(0, 30): + print('Checking up on %s' % request_uuid) + p = subprocess.run(['xcrun', 'altool', '--notarization-info', request_uuid, '-u', apple_id, '-p', apple_password, '--output-format', 'xml'], capture_output=True) + status = string_after(p, 'Status') + print('Got %s' % status) + if status == 'invalid': + raise Error("Notarization failed") + elif status == 'success': + subprocess.run(['xcrun', 'stapler', 'staple', dmg]) + return + time.sleep(30) + + raise Error("Notarization timed out") + + class OSXTarget(Target): def __init__(self, directory=None): super(OSXTarget, self).__init__('osx', directory) @@ -783,13 +785,24 @@ class OSXSingleTarget(OSXTarget): self.set('CC', '"ccache gcc"') self.set('CXX', '"ccache g++"') + def package(self, project, checkout, output_dir, options, no_notarize): + tree = self.build(project, checkout, options) + tree.add_defaults(options) + p = self._build_packages(tree, options) + for x in p: + if not isinstance(x, tuple): + raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)') + if not no_notarize: + notarize(x[0], x[1]) + self._copy_packages(tree, [x[0] for x in p], output_dir) + class OSXUniversalTarget(OSXTarget): def __init__(self, directory=None): super(OSXUniversalTarget, self).__init__(directory) self.bits = None - def package(self, project, checkout, output_dir, options): + def package(self, project, checkout, output_dir, options, no_notarize): for b in [32, 64]: target = OSXSingleTarget(b, os.path.join(self.directory, '%d' % b)) @@ -866,7 +879,7 @@ def target_factory(args): elif s.startswith('osx-'): target = OSXSingleTarget(int(s.split('-')[1]), args.work) elif s == 'osx': - if globals.command == 'build': + if args.command == 'build': target = OSXSingleTarget(64, args.work) else: target = OSXUniversalTarget(args.work) @@ -912,55 +925,56 @@ class Tree(object): required_by -- name of the tree that requires this one """ - def __init__(self, name, specifier, target, required_by): + def __init__(self, name, specifier, target, required_by, built=False): self.name = name self.specifier = specifier self.target = target self.version = None self.git_commit = None - self.built = False + self.built = built self.required_by = required_by cwd = os.getcwd() + proj = '%s/src/%s' % (target.directory, self.name) - flags = '' - redirect = '' - if globals.quiet: - flags = '-q' - redirect = '>/dev/null' - if config.has('git_reference'): - ref = '--reference-if-able %s/%s.git' % (config.get('git_reference'), self.name) - else: - ref = '' - command('git clone %s %s %s/%s.git %s/src/%s' % (flags, ref, config.get('git_prefix'), self.name, target.directory, self.name)) - os.chdir('%s/src/%s' % (target.directory, self.name)) + if not built: + flags = '' + redirect = '' + if globals.quiet: + flags = '-q' + redirect = '>/dev/null' + if config.has('git_reference'): + ref = '--reference-if-able %s/%s.git' % (config.get('git_reference'), self.name) + else: + ref = '' + command('git clone %s %s %s/%s.git %s/src/%s' % (flags, ref, config.get('git_prefix'), self.name, target.directory, self.name)) + os.chdir('%s/src/%s' % (target.directory, self.name)) - spec = self.specifier - if spec is None: - spec = 'master' + spec = self.specifier + if spec is None: + spec = 'master' - command('git checkout %s %s %s' % (flags, spec, redirect)) - self.git_commit = command_and_read('git rev-parse --short=7 HEAD')[0].strip() - - proj = '%s/src/%s' % (target.directory, self.name) + command('git checkout %s %s %s' % (flags, spec, redirect)) + self.git_commit = command_and_read('git rev-parse --short=7 HEAD')[0].strip() self.cscript = {} exec(open('%s/cscript' % proj).read(), self.cscript) - # cscript can include submodules = False to stop submodules being fetched - if (not 'submodules' in self.cscript or self.cscript['submodules'] == True) and os.path.exists('.gitmodules'): - command('git submodule --quiet init') - paths = command_and_read('git config --file .gitmodules --get-regexp path') - urls = command_and_read('git config --file .gitmodules --get-regexp url') - for path, url in zip(paths, urls): - ref = '' - if config.has('git_reference'): - url = url.split(' ')[1] - ref_path = os.path.join(config.get('git_reference'), os.path.basename(url)) - if os.path.exists(ref_path): - ref = '--reference %s' % ref_path - path = path.split(' ')[1] - command('git submodule --quiet update %s %s' % (ref, path)) + if not built: + # cscript can include submodules = False to stop submodules being fetched + if (not 'submodules' in self.cscript or self.cscript['submodules'] == True) and os.path.exists('.gitmodules'): + command('git submodule --quiet init') + paths = command_and_read('git config --file .gitmodules --get-regexp path') + urls = command_and_read('git config --file .gitmodules --get-regexp url') + for path, url in zip(paths, urls): + ref = '' + if config.has('git_reference'): + url = url.split(' ')[1] + ref_path = os.path.join(config.get('git_reference'), os.path.basename(url)) + if os.path.exists(ref_path): + ref = '--reference %s' % ref_path + path = path.split(' ')[1] + command('git submodule --quiet update %s %s' % (ref, path)) if os.path.exists('%s/wscript' % proj): v = read_wscript_variable(proj, "VERSION"); @@ -1049,6 +1063,7 @@ class Tree(object): self.target.variables = variables self.built = True + # # Command-line parser # @@ -1057,32 +1072,27 @@ def main(): commands = { "build": "build project", - "package": "package and build project", - "release": "release a project using its next version number (changing wscript and tagging)", + "package": "build and package the project", + "release": "release a project using its next version number (adding a tag)", "pot": "build the project's .pot files", "manual": "build the project's manual", "doxygen": "build the project's Doxygen documentation", "latest": "print out the latest version", - "test": "run the project's unit tests", - "shell": "build the project then start a shell", + "test": "build the project and run its unit tests", + "shell": "start a shell in the project''s work directory", "checkout": "check out the project", "revision": "print the head git revision number", "dependencies" : "print details of the project's dependencies as a .dot file" } - one_of = "Command is one of:\n" + one_of = "" summary = "" for k, v in commands.items(): - one_of += "\t%s\t%s\n" % (k, v) + one_of += "\t%s%s\n" % (k.ljust(20), v) summary += k + " " parser = argparse.ArgumentParser() - parser.add_argument('command', help=summary) parser.add_argument('-p', '--project', help='project name') - parser.add_argument('--minor', help='minor version number bump', action='store_true') - parser.add_argument('--micro', help='micro version number bump', action='store_true') - parser.add_argument('--latest-major', help='major version to return with latest', type=int) - parser.add_argument('--latest-minor', help='minor version to return with latest', type=int) parser.add_argument('-c', '--checkout', help='string to pass to git for checkout') parser.add_argument('-o', '--output', help='output directory', default='.') parser.add_argument('-q', '--quiet', help='be quiet', action='store_true') @@ -1092,14 +1102,34 @@ def main(): parser.add_argument('--debug', help='build with debugging symbols where possible', action='store_true') parser.add_argument('-w', '--work', help='override default work directory') parser.add_argument('-g', '--git-prefix', help='override configured git prefix') - parser.add_argument('--test', help="name of test to run (with `test'), defaults to all") parser.add_argument('-n', '--dry-run', help='run the process without building anything', action='store_true') parser.add_argument('-e', '--environment', help='pass the value of the named environment variable into the build', action='append') parser.add_argument('-m', '--mount', help='mount a given directory in the build environment', action='append') - parser.add_argument('--no-version-commit', help="use just tags for versioning, don't modify wscript, ChangeLog etc.", action='store_true') parser.add_argument('--option', help='set an option for the build (use --option key:value)', action='append') parser.add_argument('--ccache', help='use ccache', action='store_true') parser.add_argument('--verbose', help='be verbose', action='store_true') + + subparsers = parser.add_subparsers(help='command to run', dest='command') + parser_build = subparsers.add_parser("build", help="build project") + parser_package = subparsers.add_parser("package", help="build and package project") + parser_package.add_argument('--no-notarize', help='do not notarize .dmg packages', action='store_true') + parser_release = subparsers.add_parser("release", help="release a project using its next version number (adding a tag)") + parser_release.add_argument('--minor', help='minor version number bump', action='store_true') + parser_release.add_argument('--micro', help='micro version number bump', action='store_true') + parser_pot = subparsers.add_parser("pot", help="build the project's .pot files") + parser_manual = subparsers.add_parser("manual", help="build the project's manual") + parser_doxygen = subparsers.add_parser("doxygen", help="build the project's Doxygen documentation") + parser_latest = subparsers.add_parser("latest", help="print out the latest version") + parser_latest.add_argument('--latest-major', help='major version to return', type=int) + parser_latest.add_argument('--latest-minor', help='minor version to return', type=int) + parser_test = subparsers.add_parser("test", help="build the project and run its unit tests") + parser_test.add_argument('--no-implicit-build', help='do not build first', action='store_true') + parser_test.add_argument('--test', help="name of test to run, defaults to all") + parser_shell = subparsers.add_parser("shell", help="build the project then start a shell") + parser_checkout = subparsers.add_parser("checkout", help="check out the project") + parser_revision = subparsers.add_parser("revision", help="print the head git revision number") + parser_dependencies = subparsers.add_parser("dependencies", help="print details of the project's dependencies as a .dot file") + global args args = parser.parse_args() @@ -1134,14 +1164,9 @@ def main(): globals.quiet = args.quiet globals.verbose = args.verbose - globals.command = args.command globals.dry_run = args.dry_run - if not globals.command in commands: - e = 'command must be one of:\n' + one_of - raise Error('command must be one of:\n%s' % one_of) - - if globals.command == 'build': + if args.command == 'build': if args.target is None: raise Error('you must specify -t or --target') @@ -1150,7 +1175,7 @@ def main(): if not args.keep: target.cleanup() - elif globals.command == 'package': + elif args.command == 'package': if args.target is None: raise Error('you must specify -t or --target') @@ -1167,7 +1192,7 @@ def main(): output_dir = args.output makedirs(output_dir) - target.package(args.project, args.checkout, output_dir, get_command_line_options(args)) + target.package(args.project, args.checkout, output_dir, get_command_line_options(args), args.no_notarize) except Error as e: if target is not None and not args.keep: target.cleanup() @@ -1176,7 +1201,7 @@ def main(): if target is not None and not args.keep: target.cleanup() - elif globals.command == 'release': + elif args.command == 'release': if args.minor is False and args.micro is False: raise Error('you must specify --minor or --micro') @@ -1191,25 +1216,12 @@ def main(): version.bump_micro() with TreeDirectory(tree): - if not args.no_version_commit: - set_version_in_wscript(version) - append_version_to_changelog(version) - append_version_to_debian_changelog(version) - command('git commit -a -m "Bump version"') - command('git tag -m "v%s" v%s' % (version, version)) - - if not args.no_version_commit: - version.to_devel() - set_version_in_wscript(version) - command('git commit -a -m "Bump version"') - command('git push') - command('git push --tags') target.cleanup() - elif globals.command == 'pot': + elif args.command == 'pot': target = SourceTarget() tree = globals.trees.get(args.project, args.checkout, target) @@ -1219,7 +1231,7 @@ def main(): target.cleanup() - elif globals.command == 'manual': + elif args.command == 'manual': target = SourceTarget() tree = globals.trees.get(args.project, args.checkout, target) @@ -1232,7 +1244,7 @@ def main(): target.cleanup() - elif globals.command == 'doxygen': + elif args.command == 'doxygen': target = SourceTarget() tree = globals.trees.get(args.project, args.checkout, target) @@ -1245,7 +1257,7 @@ def main(): target.cleanup() - elif globals.command == 'latest': + elif args.command == 'latest': target = SourceTarget() tree = globals.trees.get(args.project, args.checkout, target) @@ -1271,32 +1283,31 @@ def main(): print(latest) target.cleanup() - elif globals.command == 'test': + elif args.command == 'test': if args.target is None: raise Error('you must specify -t or --target') target = None try: target = target_factory(args) - tree = globals.trees.get(args.project, args.checkout, target) - with TreeDirectory(tree): - target.test(tree, args.test, get_command_line_options(args)) - except Error as e: + options = get_command_line_options(args) + if args.no_implicit_build: + globals.trees.add_built(args.project, args.checkout, target) + else: + target.build(args.project, args.checkout, options) + target.test(args.project, args.checkout, target, args.test, options) + finally: if target is not None and not args.keep: target.cleanup() - raise - if target is not None and not args.keep: - target.cleanup() - - elif globals.command == 'shell': + elif args.command == 'shell': if args.target is None: raise Error('you must specify -t or --target') target = target_factory(args) target.command('bash') - elif globals.command == 'revision': + elif args.command == 'revision': target = SourceTarget() tree = globals.trees.get(args.project, args.checkout, target) @@ -1304,7 +1315,7 @@ def main(): print(command_and_read('git rev-parse HEAD')[0].strip()[:7]) target.cleanup() - elif globals.command == 'checkout': + elif args.command == 'checkout': if args.output is None: raise Error('you must specify -o or --output') @@ -1315,7 +1326,7 @@ def main(): shutil.copytree('.', args.output) target.cleanup() - elif globals.command == 'dependencies': + elif args.command == 'dependencies': if args.target is None: raise Error('you must specify -t or --target') if args.checkout is None: @@ -1328,8 +1339,6 @@ def main(): print("%s -> %s;" % (d[2].name.replace("-", "-"), d[0].name.replace("-", "_"))) print("}") - else: - raise Error('invalid command %s' % globals.command) try: main()