X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cdist;h=dc25bc2892c4f014da6acea6ac2bca8b1a30c44a;hb=bc4f98a60ccaa888d4cdac91f77b29b3220433f8;hp=44978d5dc126ae0d67a02bd3d5e4c39f19582f3b;hpb=21dbb2106ad9ba059208ab23f074be1f94cef790;p=cdist.git diff --git a/cdist b/cdist index 44978d5..dc25bc2 100755 --- a/cdist +++ b/cdist @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2012-2017 Carl Hetherington +# Copyright (C) 2012-2018 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 @@ -55,10 +55,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)) @@ -106,6 +106,8 @@ class Config: Option('osx_sdk_prefix'), Option('osx_sdk'), BoolOption('docker_sudo'), + Option('docker_hub_repository'), + Option('flatpak_state_dir'), Option('parallel', 4) ] try: @@ -125,6 +127,12 @@ class Config: except: raise + def has(self, k): + for o in self.options: + if o.key == k and o.value is not None: + return True + return False + def get(self, k): for o in self.options: if o.key == k: @@ -152,6 +160,9 @@ def log(m): if not globals.quiet: print('\x1b[33m* %s\x1b[0m' % m) +def escape_spaces(s): + return s.replace(' ', '\\ ') + def scp_escape(n): """Escape a host:filename string for use with an scp command""" s = n.split(':') @@ -181,8 +192,8 @@ def copyfile(a, b): host = b[:bc] path = b[bc+1:] temp_path = os.path.join(os.path.dirname(path), ".tmp." + os.path.basename(path)) - command('scp %s %s' % (scp_escape(a), scp_escape('%s:%s' % (host, temp_path)))) - command('ssh %s -- mv %s %s' % (host, mv_escape(temp_path), mv_escape(path))) + command('scp %s %s' % (scp_escape(a), scp_escape(host + ":" + temp_path))) + command('ssh %s -- mv "%s" "%s"' % (host, escape_spaces(temp_path), escape_spaces(path))) else: command('scp %s %s' % (scp_escape(a), scp_escape(b))) @@ -250,7 +261,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="") @@ -286,6 +296,22 @@ def devel_to_git(git_commit, filename): filename = filename.replace('devel', '-%s' % git_commit) return filename +def argument_options(args): + opts = dict() + if args.option is not None: + for o in args.option: + b = o.split(':') + if len(b) != 2: + raise Error("Bad option `%s'" % o) + if b[1] == 'False': + opts[b[0]] = False + elif b[1] == 'True': + opts[b[0]] = True + else: + opts[b[0]] = b[1] + return opts + + class TreeDirectory: def __init__(self, tree): self.tree = tree @@ -323,6 +349,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 @@ -357,6 +391,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 @@ -372,40 +407,55 @@ 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 def setup(self): pass - def package(self, project, checkout, output_dir): + def package(self, project, checkout, output_dir, options): tree = globals.trees.get(project, checkout, self) - tree.build_dependencies() - tree.build() - packages = tree.call('package', tree.version) + if self.build_dependencies: + tree.build_dependencies(options) + tree.build(options) + if len(inspect.getargspec(tree.cscript['package']).args) == 3: + packages = tree.call('package', tree.version, options) + else: + log("Deprecated cscript package() method with no options parameter") + packages = tree.call('package', tree.version) + if isinstance(packages, (str, unicode)): copyfile(packages, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, packages)))) else: for p in packages: copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))) - def build(self, project, checkout): + def build(self, project, checkout, options): tree = globals.trees.get(project, checkout, self) - tree.build_dependencies() - tree.build() + if self.build_dependencies: + tree.build_dependencies(options) + tree.build(options) - def test(self, tree, test): + def test(self, tree, test, options): """test is the test case to run, or None""" - tree.build_dependencies() - tree.build() + if self.build_dependencies: + tree.build_dependencies(options) + tree.build(options) return tree.call('test', test) def set(self, a, b): @@ -448,18 +498,36 @@ 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): super(DockerTarget, self).__init__(platform, directory) self.version = version self.mounts = [] + self.privileged = False def setup(self): - mounts = '-v %s:%s ' % (self.directory, self.directory) + opts = '-v %s:%s ' % (self.directory, self.directory) for m in self.mounts: - mounts += '-v %s:%s ' % (m, m) - self.container = command_and_read('%s run -u %s %s -itd %s /bin/bash' % (config.docker(), getpass.getuser(), mounts, self.image)).read().strip() + opts += '-v %s:%s ' % (m, m) + if self.privileged: + opts += '--privileged=true ' + 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 -u %s %s -itd %s /bin/bash' % (config.docker(), getpass.getuser(), opts, tag)).read().strip() def command(self, cmd): dir = os.path.join(self.directory, os.path.relpath(os.getcwd(), self.directory)) @@ -473,6 +541,33 @@ class DockerTarget(Target): self.mounts.append(m) +class FlatpakTarget(Target): + def __init__(self, project, checkout): + super(FlatpakTarget, self).__init__('flatpak') + self.build_dependencies = False + self.project = project + self.checkout = checkout + + def setup(self): + pass + + def command(self, cmd): + command(cmd) + + def checkout_dependencies(self): + tree = globals.trees.get(self.project, self.checkout, self) + return tree.checkout_dependencies() + + def flatpak(self): + return 'flatpak' + + def flatpak_builder(self): + b = 'flatpak-builder' + if config.has('flatpak_state_dir'): + b += ' --state-dir=%s' % config.get('flatpak_state_dir') + return b + + class WindowsTarget(DockerTarget): """ This target exposes the following additional API: @@ -480,8 +575,8 @@ class WindowsTarget(DockerTarget): version: Windows version ('xp' or None) bits: bitness of Windows (32 or 64) name: name of our target e.g. x86_64-w64-mingw32.shared - library_prefix: path to Windows libraries - tool_path: path to toolchain binaries + 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) @@ -492,18 +587,18 @@ class WindowsTarget(DockerTarget): self.name = 'i686-w64-mingw32.shared' else: self.name = 'x86_64-w64-mingw32.shared' - self.library_prefix = '%s/usr/%s' % (config.get('mxe_prefix'), self.name) + self.environment_prefix = '%s/usr/%s' % (config.get('mxe_prefix'), self.name) - self.set('PKG_CONFIG_LIBDIR', '%s/lib/pkgconfig' % self.library_prefix) + self.set('PKG_CONFIG_LIBDIR', '%s/lib/pkgconfig' % self.environment_prefix) self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/bin/pkgconfig' % (self.directory, self.directory)) - self.set('PATH', '%s/bin:%s:%s' % (self.library_prefix, self.tool_path, os.environ['PATH'])) + self.set('PATH', '%s/bin:%s:%s' % (self.environment_prefix, self.tool_path, os.environ['PATH'])) self.set('CC', '%s-gcc' % self.name) self.set('CXX', '%s-g++' % self.name) self.set('LD', '%s-ld' % self.name) self.set('RANLIB', '%s-ranlib' % self.name) self.set('WINRC', '%s-windres' % self.name) - cxx = '-I%s/include -I%s/include' % (self.library_prefix, self.directory) - link = '-L%s/lib -L%s/lib' % (self.library_prefix, self.directory) + cxx = '-I%s/include -I%s/include' % (self.environment_prefix, self.directory) + link = '-L%s/lib -L%s/lib' % (self.environment_prefix, self.directory) self.set('CXXFLAGS', '"%s"' % cxx) self.set('CPPFLAGS', '') self.set('LINKFLAGS', '"%s"' % link) @@ -511,24 +606,29 @@ class WindowsTarget(DockerTarget): self.image = 'windows' + @property + def library_prefix(self): + log('Deprecated property library_prefix: use environment_prefix') + return self.environment_prefix + @property def windows_prefix(self): - log('Deprecated property windows_prefix') - return self.library_prefix + log('Deprecated property windows_prefix: use environment_prefix') + return self.environment_prefix @property def mingw_prefixes(self): - log('Deprecated property mingw_prefixes') - return [self.library_prefix] + log('Deprecated property mingw_prefixes: use environment_prefix') + return [self.environment_prefix] @property def mingw_path(self): - log('Deprecated property mingw_path') + log('Deprecated property mingw_path: use tool_path') return self.tool_path @property def mingw_name(self): - log('Deprecated property mingw_name') + log('Deprecated property mingw_name: use name') return self.name @@ -540,12 +640,14 @@ class LinuxTarget(DockerTarget): distro: distribution ('debian', 'ubuntu', 'centos' or 'fedora') version: distribution version (e.g. '12.04', '8', '6.5') bits: bitness of the distribution (32 or 64) + detail: None or 'appimage' if we are building for appimage """ def __init__(self, distro, version, bits, directory=None): super(LinuxTarget, self).__init__('linux', directory, version) self.distro = distro self.bits = bits + self.detail = None self.set('CXXFLAGS', '-I%s/include' % self.directory) self.set('CPPFLAGS', '') @@ -559,10 +661,23 @@ class LinuxTarget(DockerTarget): else: self.image = '%s-%s-%s' % (self.distro, self.version, self.bits) - def test(self, tree, test): + 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) - super(LinuxTarget, self).test(tree, test) + super(LinuxTarget, self).test(tree, test, options) + + +class AppImageTarget(LinuxTarget): + def __init__(self, work): + super(AppImageTarget, self).__init__('ubuntu', '16.04', 64, work) + self.detail = 'appimage' + self.privileged = True class OSXTarget(Target): @@ -599,25 +714,38 @@ class OSXSingleTarget(OSXTarget): self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % enviro) self.set('MACOSX_DEPLOYMENT_TARGET', config.get('osx_sdk')) - def package(self, project, checkout, output_dir): + 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) - def package(self, project, checkout, output_dir): + 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() - tree.build() + tree.build_dependencies(options) + tree.build(options) tree = globals.trees.get(project, checkout, self) with TreeDirectory(tree): - for p in tree.call('package', tree.version): + if len(inspect.getargspec(tree.cscript['package']).args) == 3: + packages = tree.call('package', tree.version, options) + else: + log("Deprecated cscript package() method with no options parameter") + packages = tree.call('package', tree.version) + for p in packages: copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))) class SourceTarget(Target): @@ -632,7 +760,7 @@ class SourceTarget(Target): def cleanup(self): rmtree(self.directory) - def package(self, project, checkout, output_dir): + def package(self, project, checkout, output_dir, options): tree = globals.trees.get(project, checkout, self) with TreeDirectory(tree): name = read_wscript_variable(os.getcwd(), 'APPNAME') @@ -649,6 +777,8 @@ class SourceTarget(Target): # or mageia-version-{32,64} # or osx-{32,64} # or source +# or flatpak +# or appimage # @param debug True to build with debugging symbols (where possible) def target_factory(args): s = args.target @@ -682,11 +812,16 @@ def target_factory(args): target = OSXUniversalTarget(args.work) elif s == 'source': target = SourceTarget() + elif s == 'flatpak': + target = FlatpakTarget(args.project, args.checkout) + elif s == 'appimage': + target = AppImageTarget(args.work) if target is None: 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: @@ -756,7 +891,8 @@ class Tree(object): 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) @@ -764,45 +900,59 @@ class Tree(object): with TreeDirectory(self): return self.cscript[function](self.target, *args) - def build_dependencies(self, options=None): + 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(): + if not k in options: + options[k] = v + def dependencies(self, options): if not 'dependencies' in self.cscript: return if len(inspect.getargspec(self.cscript['dependencies']).args) == 2: deps = self.call('dependencies', options) else: - log("Deprecated cscipt dependencies() method with no options parameter") + log("Deprecated cscript dependencies() method with no options parameter") deps = self.call('dependencies') for d in deps: dep = globals.trees.get(d[0], d[1], self.target, self.name) - options = dict() - # Make the options to pass in from the option_defaults of the thing - # we are building and any options specified by the parent. - if 'option_defaults' in dep.cscript: - for k, v in dep.cscript['option_defaults']().items(): - options[k] = v - + # Start with the options passed in + dep_options = copy.copy(options) + # Add things specified by the parent if len(d) > 2: for k, v in d[2].items(): - options[k] = v + if not k in dep_options: + dep_options[k] = v + # Then fill in the dependency's defaults + dep.add_defaults(dep_options) + + for i in dep.dependencies(dep_options): + yield i + yield (dep, dep_options) - msg = 'Building dependency %s %s of %s' % (d[0], d[1], self.name) - if len(options) > 0: - msg += ' with options %s' % options - log(msg) + def checkout_dependencies(self, options={}): + for i in self.dependencies(options): + pass - dep.build_dependencies(options) - dep.build(options) + def build_dependencies(self, options): + for i in self.dependencies(options): + i[0].build(i[1]) - def build(self, options=None): + def build(self, options): if self.built: return variables = copy.copy(self.target.variables) + # Start with the options passed in + options = copy.copy(options) + # Fill in the defaults + self.add_defaults(options) + if not globals.dry_run: if len(inspect.getargspec(self.cscript['build']).args) == 2: self.call('build', options) @@ -859,6 +1009,8 @@ def main(): 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') args = parser.parse_args() # Override configured stuff @@ -893,7 +1045,7 @@ def main(): raise Error('you must specify -t or --target') target = target_factory(args) - target.build(args.project, args.checkout) + target.build(args.project, args.checkout, argument_options(args)) if not args.keep: target.cleanup() @@ -901,20 +1053,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': - 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 + output_dir = args.output - makedirs(output_dir) - target.package(args.project, args.checkout, output_dir) + makedirs(output_dir) - if not args.keep: + # 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 target is not None and not args.keep: target.cleanup() elif globals.command == 'release': @@ -1065,7 +1229,7 @@ def main(): target = target_factory(args) tree = globals.trees.get(args.project, args.checkout, target) with TreeDirectory(tree): - target.test(tree, args.test) + target.test(tree, args.test, argument_options(args)) except Error as e: if target is not None and not args.keep: target.cleanup()