X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cdist;h=c68ee22fd3f56ca74d76f5b2ca50e55bdf72fe84;hb=2d8593120332a88764ccdee3d02a40177e56a62b;hp=6d08d52eadd6ed2823a6bcfbffe2c366e88d3d3e;hpb=199e2713fa3728845265569e933ce3b8a43d77ee;p=cdist.git diff --git a/cdist b/cdist index 6d08d52..c68ee22 100755 --- a/cdist +++ b/cdist @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2012-2018 Carl Hetherington +# Copyright (C) 2012-2020 Carl Hetherington # # 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 @@ -30,6 +30,7 @@ import copy import inspect import getpass import shlex +import multiprocessing TEMPORARY_DIRECTORY = '/var/tmp' @@ -55,10 +56,10 @@ class Trees: if t.name == name and t.specifier == specifier and t.target == target: return t elif t.name == name and t.specifier != specifier: - a = specifier + a = specifier if specifier is not None else "[Any]" if required_by is not None: a += ' by %s' % required_by - b = t.specifier + b = t.specifier if t.specifier is not None else "[Any]" if t.required_by is not None: b += ' by %s' % t.required_by raise Error('conflicting versions of %s required (%s versus %s)' % (name, a, b)) @@ -105,9 +106,25 @@ class Config: Option('osx_environment_prefix'), Option('osx_sdk_prefix'), Option('osx_sdk'), + Option('apple_id'), + Option('apple_password'), BoolOption('docker_sudo'), + BoolOption('docker_no_user'), + Option('docker_hub_repository'), Option('flatpak_state_dir'), - Option('parallel', 4) ] + Option('parallel', multiprocessing.cpu_count()) ] + + config_dir = '%s/.config' % os.path.expanduser('~') + if not os.path.exists(config_dir): + os.mkdir(config_dir) + config_file = '%s/cdist' % config_dir + if not os.path.exists(config_file): + f = open(config_file, 'w') + for o in self.options: + print('# %s ' % o.key, file=f) + f.close() + print('Template config file written to %s; please edit and try again.' % config_file, file=sys.stderr) + sys.exit(1) try: f = open('%s/.config/cdist' % os.path.expanduser('~'), 'r') @@ -231,9 +248,11 @@ def command(c): def command_and_read(c): log(c) - p = subprocess.Popen(c.split(), stdout=subprocess.PIPE) - f = os.fdopen(os.dup(p.stdout.fileno())) - return f + p = subprocess.Popen(c.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (out, err) = p.communicate() + if p.returncode != 0: + raise Error('command %s failed (%s)' % (c, err)) + return out.splitlines() def read_wscript_variable(directory, variable): f = open('%s/wscript' % directory, 'r') @@ -260,7 +279,6 @@ def set_version_in_wscript(version): s = l.split() if len(s) == 3 and s[0] == "VERSION": - print("Writing %s" % version) print("VERSION = '%s'" % version, file=o) else: print(l, file=o, end="") @@ -349,6 +367,14 @@ class Version: else: self.micro = 0 + @classmethod + def from_git_tag(cls, tag): + bits = tag.split('-') + c = cls(bits[0]) + if len(bits) > 1 and int(bits[1]) > 0: + c.devel = True + return c + def bump_minor(self): self.minor += 1 self.micro = 0 @@ -383,6 +409,7 @@ class Target(object): directory: directory to work in variables: dict of environment variables debug: True to build a debug version, otherwise False + ccache: True to use ccache, False to not set(a, b): set the value of variable 'a' to 'b' unset(a): unset the value of variable 'a' command(c): run the command 'c' in the build environment @@ -398,19 +425,23 @@ class Target(object): self.platform = platform self.parallel = int(config.get('parallel')) + # Environment variables that we will use when we call cscripts + self.variables = {} + self.debug = False + self._ccache = False + # True to build our dependencies ourselves; False if this is taken care + # of in some other way + self.build_dependencies = True + if directory is None: self.directory = tempfile.mkdtemp('', 'tmp', TEMPORARY_DIRECTORY) self.rmdir = True + self.set('CCACHE_BASEDIR', os.path.realpath(self.directory)) + self.set('CCACHE_NOHASHDIR', '') else: self.directory = directory self.rmdir = False - # Environment variables that we will use when we call cscripts - self.variables = {} - self.debug = False - # True to build our dependencies ourselves; False if this is taken care - # of in some other way - self.build_dependencies = True def setup(self): pass @@ -485,26 +516,45 @@ class Target(object): def mount(self, m): pass + @property + def ccache(self): + return self._ccache + + @ccache.setter + def ccache(self, v): + self._ccache = v class DockerTarget(Target): - def __init__(self, platform, directory, version): + def __init__(self, platform, directory): super(DockerTarget, self).__init__(platform, directory) - self.version = version self.mounts = [] self.privileged = False + def _user_tag(self): + if config.get('docker_no_user'): + return '' + return '-u %s' % getpass.getuser() + def setup(self): opts = '-v %s:%s ' % (self.directory, self.directory) for m in self.mounts: opts += '-v %s:%s ' % (m, m) if self.privileged: opts += '--privileged=true ' - self.container = command_and_read('%s run -u %s %s -itd %s /bin/bash' % (config.docker(), getpass.getuser(), opts, self.image)).read().strip() + if self.ccache: + opts += "-e CCACHE_DIR=/ccache --volumes-from ccache-%s" % self.image + + tag = self.image + if config.has('docker_hub_repository'): + tag = '%s:%s' % (config.get('docker_hub_repository'), tag) + + self.container = command_and_read('%s run %s %s -itd %s /bin/bash' % (config.docker(), self._user_tag(), opts, tag))[0].strip() def command(self, cmd): dir = os.path.join(self.directory, os.path.relpath(os.getcwd(), self.directory)) - command('%s exec -u %s -t %s /bin/bash -c \'export %s; cd %s; %s\'' % (config.docker(), getpass.getuser(), self.container, self.variables_string(), dir, cmd)) + interactive_flag = '-i ' if sys.stdin.isatty() else '' + command('%s exec %s %s -t %s /bin/bash -c \'export %s; cd %s; %s\'' % (config.docker(), self._user_tag(), interactive_flag, self.container, self.variables_string(), dir, cmd)) def cleanup(self): super(DockerTarget, self).cleanup() @@ -551,8 +601,9 @@ class WindowsTarget(DockerTarget): environment_prefix: path to Windows environment for the appropriate target (libraries and some tools) tool_path: path to 32- and 64-bit tools """ - def __init__(self, version, bits, directory=None): - super(WindowsTarget, self).__init__('windows', directory, version) + def __init__(self, windows_version, bits, directory, environment_version): + super(WindowsTarget, self).__init__('windows', directory) + self.version = windows_version self.bits = bits self.tool_path = '%s/usr/bin' % config.get('mxe_prefix') @@ -578,6 +629,8 @@ class WindowsTarget(DockerTarget): self.set('LDFLAGS', '"%s"' % link) self.image = 'windows' + if environment_version is not None: + self.image += '_%s' % environment_version @property def library_prefix(self): @@ -617,8 +670,9 @@ class LinuxTarget(DockerTarget): """ def __init__(self, distro, version, bits, directory=None): - super(LinuxTarget, self).__init__('linux', directory, version) + super(LinuxTarget, self).__init__('linux', directory) self.distro = distro + self.version = version self.bits = bits self.detail = None @@ -634,6 +688,12 @@ class LinuxTarget(DockerTarget): else: self.image = '%s-%s-%s' % (self.distro, self.version, self.bits) + def setup(self): + super(LinuxTarget, self).setup() + if self.ccache: + self.set('CC', '"ccache gcc"') + self.set('CXX', '"ccache g++"') + def test(self, tree, test, options): self.append_with_colon('PATH', '%s/bin' % self.directory) self.append_with_colon('LD_LIBRARY_PATH', '%s/lib' % self.directory) @@ -642,7 +702,7 @@ class LinuxTarget(DockerTarget): class AppImageTarget(LinuxTarget): def __init__(self, work): - super(AppImageTarget, self).__init__('ubuntu', '14.04', 64, work) + super(AppImageTarget, self).__init__('ubuntu', '16.04', 64, work) self.detail = 'appimage' self.privileged = True @@ -653,6 +713,8 @@ class OSXTarget(Target): self.sdk = config.get('osx_sdk') self.sdk_prefix = config.get('osx_sdk_prefix') self.environment_prefix = config.get('osx_environment_prefix') + self.apple_id = config.get('apple_id') + self.apple_password = config.get('apple_password') def command(self, c): command('%s %s' % (self.variables_string(False), c)) @@ -680,19 +742,26 @@ class OSXSingleTarget(OSXTarget): self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/lib/pkgconfig:/usr/lib/pkgconfig' % (self.directory, enviro)) self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % enviro) self.set('MACOSX_DEPLOYMENT_TARGET', config.get('osx_sdk')) + self.set('CCACHE_BASEDIR', self.directory) - def package(self, project, checkout, output_dir, options): - raise Error('cannot package non-universal OS X versions') + @Target.ccache.setter + def ccache(self, v): + Target.ccache.fset(self, v) + if v: + self.set('CC', '"ccache gcc"') + self.set('CXX', '"ccache g++"') class OSXUniversalTarget(OSXTarget): def __init__(self, directory=None): super(OSXUniversalTarget, self).__init__(directory) + self.bits = None def package(self, project, checkout, output_dir, options): for b in [32, 64]: target = OSXSingleTarget(b, os.path.join(self.directory, '%d' % b)) + target.ccache = self.ccache tree = globals.trees.get(project, checkout, target) tree.build_dependencies(options) tree.build(options) @@ -745,9 +814,9 @@ def target_factory(args): if s.startswith('windows-'): x = s.split('-') if len(x) == 2: - target = WindowsTarget(None, int(x[1]), args.work) + target = WindowsTarget(None, int(x[1]), args.work, args.environment_version) elif len(x) == 3: - target = WindowsTarget(x[1], int(x[2]), args.work) + target = WindowsTarget(x[1], int(x[2]), args.work, args.environment_version) else: raise Error("Bad Windows target name `%s'") elif s.startswith('ubuntu-') or s.startswith('debian-') or s.startswith('centos-') or s.startswith('fedora-') or s.startswith('mageia-'): @@ -780,6 +849,7 @@ def target_factory(args): raise Error("Bad target `%s'" % s) target.debug = args.debug + target.ccache = args.ccache if args.environment is not None: for e in args.environment: @@ -834,22 +904,26 @@ class Tree(object): spec = 'master' command('git checkout %s %s %s' % (flags, spec, redirect)) - self.git_commit = command_and_read('git rev-parse --short=7 HEAD').readline().strip() - command('git submodule init --quiet') - command('git submodule update --quiet') + self.git_commit = command_and_read('git rev-parse --short=7 HEAD')[0].strip() proj = '%s/src/%s' % (target.directory, self.name) 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: + command('git submodule init --quiet') + command('git submodule update --quiet') + if os.path.exists('%s/wscript' % proj): v = read_wscript_variable(proj, "VERSION"); if v is not None: try: self.version = Version(v) except: - self.version = Version(subprocess.Popen(shlex.split('git -C %s describe --tags --abbrev=0' % proj), stdout=subprocess.PIPE).communicate()[0][1:]) + tag = subprocess.Popen(shlex.split('git -C %s describe --tags' % proj), stdout=subprocess.PIPE).communicate()[0][1:] + self.version = Version.from_git_tag(tag) os.chdir(cwd) @@ -860,7 +934,13 @@ class Tree(object): def add_defaults(self, options): """Add the defaults from this into a dict options""" if 'option_defaults' in self.cscript: - for k, v in self.cscript['option_defaults']().items(): + from_cscript = self.cscript['option_defaults'] + if isinstance(from_cscript, dict): + defaults_dict = from_cscript + else: + log("Deprecated cscript option_defaults method; replace with a dict") + defaults_dict = from_cscript() + for k, v in defaults_dict.items(): if not k in options: options[k] = v @@ -897,12 +977,19 @@ class Tree(object): def build_dependencies(self, options): for i in self.dependencies(options): + global args + if args.verbose: + print('Building a dependency of %s %s %s with %s' % (self.name, self.specifier, self.version, options)) i[0].build(i[1]) def build(self, options): if self.built: return + global args + if args.verbose: + print("* Building %s %s %s with %s" % (self.name, self.specifier, self.version, options)) + variables = copy.copy(self.target.variables) # Start with the options passed in @@ -956,7 +1043,8 @@ def main(): 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') - parser.add_argument('-t', '--target', help='target') + parser.add_argument('-t', '--target', help='target', action='append') + parser.add_argument('--environment-version', help='version of environment to use') parser.add_argument('-k', '--keep', help='keep working tree', action='store_true') parser.add_argument('--debug', help='build with debugging symbols where possible', action='store_true') parser.add_argument('-w', '--work', help='override default work directory') @@ -967,8 +1055,19 @@ def main(): 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') + global args args = parser.parse_args() + # Check for incorrect multiple parameters + if args.target is not None: + if len(args.target) > 1: + parser.error('multiple -t options specified') + sys.exit(1) + else: + args.target = args.target[0] + # Override configured stuff if args.git_prefix is not None: config.set('git_prefix', args.git_prefix) @@ -1009,27 +1108,32 @@ def main(): if args.target is None: raise Error('you must specify -t or --target') - target = target_factory(args) + target = None + try: + target = target_factory(args) - if target.platform == 'linux' and target.detail != "appimage": - if target.distro != 'arch': - output_dir = os.path.join(args.output, '%s-%s-%d' % (target.distro, target.version, target.bits)) + if target.platform == 'linux' and target.detail != "appimage": + if target.distro != 'arch': + output_dir = os.path.join(args.output, '%s-%s-%d' % (target.distro, target.version, target.bits)) + else: + output_dir = os.path.join(args.output, '%s-%d' % (target.distro, target.bits)) else: - output_dir = os.path.join(args.output, '%s-%d' % (target.distro, target.bits)) - else: - output_dir = args.output - - makedirs(output_dir) + output_dir = args.output - # Start with the options passed on the command line - options = copy.copy(argument_options(args)) - # Fill in the defaults - tree = globals.trees.get(args.project, args.checkout, target) - tree.add_defaults(options) + makedirs(output_dir) - target.package(args.project, args.checkout, output_dir, options) + # Start with the options passed on the command line + options = copy.copy(argument_options(args)) + # Fill in the defaults + tree = globals.trees.get(args.project, args.checkout, target) + tree.add_defaults(options) + target.package(args.project, args.checkout, output_dir, options) + except Error as e: + if target is not None and not args.keep: + target.cleanup() + raise - if not args.keep: + if target is not None and not args.keep: target.cleanup() elif globals.command == 'release': @@ -1154,8 +1258,10 @@ def main(): with TreeDirectory(tree): f = command_and_read('git log --tags --simplify-by-decoration --pretty="%d"') latest = None + line = 0 while latest is None: - t = f.readline() + t = f[line] + line += 1 m = re.compile(".*\((.*)\).*").match(t) if m: tags = m.group(1).split(', ') @@ -1201,7 +1307,7 @@ def main(): target = SourceTarget() tree = globals.trees.get(args.project, args.checkout, target) with TreeDirectory(tree): - print(command_and_read('git rev-parse HEAD').readline().strip()[:7]) + print(command_and_read('git rev-parse HEAD')[0].strip()[:7]) target.cleanup() elif globals.command == 'checkout':