X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cdist;h=20deb5ffe34115dcbceae33dd31433a0f820f228;hb=b49b875439a296a1e6312d12ddb8d2cd8b6d2788;hp=1aff482f92954f4cc653e8c4fe7259c1f618b2ed;hpb=69807456e188e2964f94c22a8acf4f77c0aefb39;p=cdist.git diff --git a/cdist b/cdist index 1aff482..20deb5f 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' @@ -107,6 +109,8 @@ class Config: Option('osx_environment_prefix'), Option('osx_sdk_prefix'), Option('osx_sdk'), + Option('osx_keychain_file'), + Option('osx_keychain_password'), Option('apple_id'), Option('apple_password'), BoolOption('docker_sudo'), @@ -446,7 +450,7 @@ class Target(object): self.set('CCACHE_BASEDIR', os.path.realpath(self.directory)) self.set('CCACHE_NOHASHDIR', '') else: - self.directory = directory + self.directory = os.path.realpath(directory) self.rmdir = False @@ -480,7 +484,13 @@ class Target(object): if self.build_dependencies: tree.build_dependencies(options) tree.build(options) - return tree.call('test', test) + + 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) def set(self, a, b): self.variables[a] = b @@ -542,16 +552,19 @@ class DockerTarget(Target): return '' return '-u %s' % getpass.getuser() + def _mount_option(self, d): + return '-v %s:%s ' % (os.path.realpath(d), os.path.realpath(d)) + def setup(self): - opts = '-v %s:%s ' % (self.directory, self.directory) + opts = self._mount_option(self.directory) for m in self.mounts: - opts += '-v %s:%s ' % (m, m) + opts += self._mount_option(m) + if config.has('git_reference'): + opts += self._mount_option(config.get('git_reference')) if self.privileged: opts += '--privileged=true ' - if config.has('git_reference'): - opts += '-v %s:%s ' % (config.get('git_reference'), config.get('git_reference')) if self.ccache: - opts += "-e CCACHE_DIR=/ccache/%s --mount source=ccache,target=/ccache" % self.image + opts += "-e CCACHE_DIR=/ccache/%s-%d --mount source=ccache,target=/ccache" % (self.image, os.getuid()) tag = self.image if config.has('docker_hub_repository'): @@ -624,8 +637,6 @@ class WindowsTarget(DockerTarget): 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.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) @@ -640,6 +651,15 @@ class WindowsTarget(DockerTarget): if environment_version is not None: self.image += '_%s' % environment_version + def setup(self): + super().setup() + if self.ccache: + self.set('CC', '"ccache %s-gcc"' % self.name) + self.set('CXX', '"ccache %s-g++"' % self.name) + else: + self.set('CC', '%s-gcc' % self.name) + self.set('CXX', '%s-g++' % self.name) + @property def library_prefix(self): log_normal('Deprecated property library_prefix: use environment_prefix') @@ -723,10 +743,16 @@ class OSXTarget(Target): self.environment_prefix = config.get('osx_environment_prefix') self.apple_id = config.get('apple_id') self.apple_password = config.get('apple_password') + self.osx_keychain_file = config.get('osx_keychain_file') + self.osx_keychain_password = config.get('osx_keychain_password') def command(self, c): command('%s %s' % (self.variables_string(False), c)) + def build(self, *a, **k): + self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file)) + return super().build(*a, **k) + class OSXSingleTarget(OSXTarget): def __init__(self, bits, directory=None): @@ -906,6 +932,8 @@ class Tree(object): 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)) @@ -927,14 +955,14 @@ class Tree(object): 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] - url = url.split(' ')[1] - ref = '' - if config.has('git_reference'): - ref_path = os.path.join(config.get('git_reference'), os.path.basename(url)) - if os.path.exists(ref_path): - ref = '--reference %s' % ref_path - command('git submodule --quiet update %s %s' % (ref, path)) + command('git submodule --quiet update %s %s' % (ref, path)) if os.path.exists('%s/wscript' % proj): v = read_wscript_variable(proj, "VERSION"); @@ -967,7 +995,7 @@ class Tree(object): def dependencies(self, options): """ yield details of the dependencies of this tree. Each dependency is returned - as a tuple of (tree, options). The 'options' parameter are the options that + as a tuple of (tree, options, parent_tree). The 'options' parameter are the options that we want to force for 'self'. """ if not 'dependencies' in self.cscript: @@ -989,7 +1017,7 @@ class Tree(object): dep_options = d[2] if len(d) > 2 else {} for i in dep.dependencies(dep_options): yield i - yield (dep, dep_options) + yield (dep, dep_options, self) def checkout_dependencies(self, options={}): for i in self.dependencies(options): @@ -1040,7 +1068,8 @@ def main(): "test": "run the project's unit tests", "shell": "build the project then start a shell", "checkout": "check out the project", - "revision": "print the head git revision number" + "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" @@ -1288,6 +1317,19 @@ def main(): shutil.copytree('.', args.output) target.cleanup() + elif globals.command == 'dependencies': + if args.target is None: + raise Error('you must specify -t or --target') + if args.checkout is None: + raise Error('you must specify -c or --checkout') + + target = target_factory(args) + tree = globals.trees.get(args.project, args.checkout, target) + print("strict digraph {") + for d in list(tree.dependencies({})): + print("%s -> %s;" % (d[2].name.replace("-", "-"), d[0].name.replace("-", "_"))) + print("}") + else: raise Error('invalid command %s' % globals.command)