#!/usr/bin/python
-# Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
#
# 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
TEMPORARY_DIRECTORY = '/tmp'
-class Globals:
- quiet = False
- command = None
-
-globals = Globals()
-
class Error(Exception):
def __init__(self, value):
self.value = value
def __repr__(self):
return str(self)
+class Trees:
+ """
+ Store for Tree objects which re-uses already-created objects
+ and checks for requests for different versions of the same thing.
+ """
+
+ def __init__(self):
+ self.trees = []
+
+ def get(self, name, specifier, target):
+ for t in self.trees:
+ if t.name == name and t.specifier == specifier and t.target == target:
+ return t
+ elif t.name == name and t.specifier != specifier:
+ raise Error('conflicting versions of %s requested (%s and %s)' % (name, specifier, t.specifier))
+
+ nt = Tree(name, specifier, target)
+ self.trees.append(nt)
+ return nt
+
+class Globals:
+ quiet = False
+ command = None
+ trees = Trees()
+
+globals = Globals()
+
+
#
# Configuration
#
else:
return '\"%s\"' % s[0]
-def command(c):
- if os.system(c) != 0:
- raise Error('%s failed' % c)
-
def copytree(a, b):
log('copy %s -> %s' % (scp_escape(b), scp_escape(b)))
command('scp -r %s %s' % (scp_escape(a), scp_escape(b)))
log('remove %s' % a)
shutil.rmtree(a, ignore_errors=True)
-def command(c, can_fail=False):
+def command(c):
log(c)
r = os.system(c)
- if (r >> 8) and not can_fail:
+ if (r >> 8):
raise Error('command %s failed' % c)
def command_and_read(c):
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 "Writing %s" % version
+ print >>o,"VERSION = '%s'" % version
+ else:
+ print >>o,l,
+ f.close()
+ o.close()
+
+ os.rename('wscript.tmp', 'wscript')
+
+def append_version_to_changelog(version):
+ try:
+ f = open('ChangeLog', 'r')
+ except:
+ log('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 <cth@carlh.net>\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('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:
+ filename = filename.replace('devel', '-%s' % git_commit)
+ return filename
+
+class TreeDirectory:
+ def __init__(self, tree):
+ self.tree = tree
+ def __enter__(self):
+ self.cwd = os.getcwd()
+ os.chdir('%s/src/%s' % (self.tree.target.directory, self.tree.name))
+ def __exit__(self, type, value, traceback):
+ os.chdir(self.cwd)
+
#
# Version
#
#
class Target(object):
- # @param directory directory to work in; if None we will use a temporary directory
- # Temporary directories will be removed after use; specified directories will not
+ """
+ platform -- platform string (e.g. 'windows', 'linux', 'osx')
+ directory -- directory to work in; if None we will use a temporary directory
+ Temporary directories will be removed after use; specified directories will not.
+ """
def __init__(self, platform, directory=None):
self.platform = platform
self.parallel = int(config.get('parallel'))
+ # self.directory is the working directory
if directory is None:
self.directory = tempfile.mkdtemp('', 'tmp', TEMPORARY_DIRECTORY)
self.rmdir = True
self.variables = {}
self.debug = False
- def build_dependencies(self, project):
- cwd = os.getcwd()
- if 'dependencies' in project.cscript:
- for d in project.cscript['dependencies'](self):
- log('Building dependency %s %s of %s' % (d[0], d[1], project.name))
- dep = Project(d[0], '.', d[1])
- dep.checkout(self)
- self.build_dependencies(dep)
-
- # Make the options to pass in from the option_defaults of the thing
- # we are building and any options specified by the parent.
- options = {}
- if 'option_defaults' in dep.cscript:
- options = dep.cscript['option_defaults']()
- if len(d) > 2:
- for k, v in d[2].iteritems():
- options[k] = v
-
- self.build(dep, options)
-
- os.chdir(cwd)
-
- def build(self, project, options=None):
- variables = copy.copy(self.variables)
- if len(inspect.getargspec(project.cscript['build']).args) == 2:
- project.cscript['build'](self, options)
- else:
- project.cscript['build'](self)
- self.variables = variables
-
- def package(self, project):
- project.checkout(self)
- self.build_dependencies(project)
- self.build(project)
- return project.cscript['package'](self, project.version)
+ def package(self, project, checkout):
+ tree = globals.trees.get(project, checkout, self)
+ tree.build_dependencies()
+ tree.build(tree)
+ return tree.call('package', tree.version), tree.git_commit
- def test(self, project):
- project.checkout(self)
- self.build_dependencies(project)
- self.build(project)
- project.cscript['test'](self)
+ def test(self, tree):
+ tree.build_dependencies()
+ tree.build()
+ return tree.call('test')
def set(self, a, b):
self.variables[a] = b
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):
+ def package(self, project, checkout):
raise Error('cannot package non-universal OS X versions')
class OSXUniversalTarget(OSXTarget):
def __init__(self, directory=None):
super(OSXUniversalTarget, self).__init__(directory)
- self.parts = []
- self.parts.append(OSXSingleTarget(32, os.path.join(self.directory, '32')))
- self.parts.append(OSXSingleTarget(64, os.path.join(self.directory, '64')))
- def package(self, project):
- for p in self.parts:
- project.checkout(p)
- p.build_dependencies(project)
- p.build(project)
+ def package(self, project, checkout):
- return project.cscript['package'](self, project.version)
-
+ for b in [32, 64]:
+ target = OSXSingleTarget(b, os.path.join(self.directory, '%d' % b))
+ tree = globals.trees.get(project, checkout, target)
+ tree.build_dependencies()
+ tree.build()
+
+ tree = globals.trees.get(project, checkout, self)
+ with TreeDirectory(tree):
+ return tree.call('package', tree.version), tree.git_commit
#
# Source
def cleanup(self):
rmtree(self.directory)
- def package(self, project):
- project.checkout(self)
- name = read_wscript_variable(os.getcwd(), 'APPNAME')
- command('./waf dist')
- return os.path.abspath('%s-%s.tar.bz2' % (name, project.version))
+ def package(self, project, checkout):
+ tree = globals.trees.get(project, checkout, self)
+ with TreeDirectory(self, tree):
+ name = read_wscript_variable(os.getcwd(), 'APPNAME')
+ command('./waf dist')
+ return os.path.abspath('%s-%s.tar.bz2' % (name, tree.version)), tree.git_commit
# @param s Target string:
#
-# Project
+# Tree
#
-class Project(object):
- def __init__(self, name, directory, specifier=None):
+class Tree(object):
+ """Description of a tree, which is a checkout of a project,
+ possibly built. This class is never exposed to cscripts.
+ Attributes:
+ name -- name of git repository (without the .git)
+ specifier -- git tag or revision to use
+ target --- target object that we are using
+ version --- version from the wscript (if one is present)
+ git_commit -- git revision that is actually being used
+ built --- true if the tree has been built yet in this run
+ """
+
+ def __init__(self, name, specifier, target):
self.name = name
- self.directory = directory
- self.version = None
self.specifier = specifier
+ self.target = target
+ self.version = None
self.git_commit = None
- if self.specifier is None:
- self.specifier = 'master'
+ self.built = False
+
+ cwd = os.getcwd()
- def checkout(self, target):
flags = ''
redirect = ''
if globals.quiet:
redirect = '>/dev/null'
command('git clone %s %s/%s.git %s/src/%s' % (flags, config.get('git_prefix'), self.name, target.directory, self.name))
os.chdir('%s/src/%s' % (target.directory, self.name))
- command('git checkout %s %s %s' % (flags, self.specifier, redirect))
+
+ 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').readline().strip()
command('git submodule init --quiet')
command('git submodule update --quiet')
- os.chdir(self.directory)
- proj = '%s/src/%s/%s' % (target.directory, self.name, self.directory)
+ proj = '%s/src/%s' % (target.directory, self.name)
+
+ self.cscript = {}
+ execfile('%s/cscript' % proj, self.cscript)
- self.read_cscript('%s/cscript' % proj)
-
if os.path.exists('%s/wscript' % proj):
v = read_wscript_variable(proj, "VERSION");
if v is not None:
self.version = Version(v)
- def read_cscript(self, s):
- self.cscript = {}
- execfile(s, self.cscript)
-
-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 "Writing %s" % version
- print >>o,"VERSION = '%s'" % version
- else:
- print >>o,l,
- f.close()
- o.close()
-
- os.rename('wscript.tmp', 'wscript')
+ os.chdir(cwd)
-def append_version_to_changelog(version):
- try:
- f = open('ChangeLog', 'r')
- except:
- log('Could not open ChangeLog')
- return
+ def call(self, function, *args):
+ with TreeDirectory(self):
+ return self.cscript[function](self.target, *args)
- c = f.read()
- f.close()
+ def build_dependencies(self):
+ if 'dependencies' in self.cscript:
+ for d in self.cscript['dependencies'](self.target):
+ log('Building dependency %s %s of %s' % (d[0], d[1], self.name))
+ dep = globals.trees.get(d[0], d[1], self.target)
+ dep.build_dependencies()
- f = open('ChangeLog', 'w')
- now = datetime.datetime.now()
- f.write('%d-%02d-%02d Carl Hetherington <cth@carlh.net>\n\n\t* Version %s released.\n\n' % (now.year, now.month, now.day, version))
- f.write(c)
+ # Make the options to pass in from the option_defaults of the thing
+ # we are building and any options specified by the parent.
+ options = {}
+ if 'option_defaults' in dep.cscript:
+ options = dep.cscript['option_defaults']()
+ if len(d) > 2:
+ for k, v in d[2].iteritems():
+ options[k] = v
-def append_version_to_debian_changelog(version):
- if not os.path.exists('debian'):
- log('Could not find debian directory')
- return
+ dep.build(options)
- command('dch -b -v %s-1 "New upstream release."' % version)
+ def build(self, options=None):
+ if self.built:
+ return
-def devel_to_git(project, filename):
- if project.git_commit is not None:
- filename = filename.replace('devel', '-%s' % project.git_commit)
- return filename
+ variables = copy.copy(self.target.variables)
+ if len(inspect.getargspec(self.cscript['build']).args) == 2:
+ self.call('build', options)
+ else:
+ self.call('build')
+
+ self.target.variables = variables
+ self.built = True
#
# Command-line parser
parser = argparse.ArgumentParser()
parser.add_argument('command', help=summary)
parser.add_argument('-p', '--project', help='project name')
- parser.add_argument('-d', '--directory', help='directory within project repo', default='.')
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('--major', help='major version to return with latest', type=int)
globals.quiet = args.quiet
globals.command = args.command
- project = Project(args.project, args.directory, args.checkout)
-
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)
raise Error('you must specify -t or --target')
target = target_factory(args.target, args.debug, args.work)
- project.checkout(target)
- target.build_dependencies(project)
- target.build(project)
+ tree = globals.trees.get(args.project, args.checkout, target)
+ tree.build_dependencies()
+ tree.build()
if not args.keep:
target.cleanup()
raise Error('you must specify -t or --target')
target = target_factory(args.target, args.debug, args.work)
-
- packages = target.package(project)
+ packages, git_commit = target.package(args.project, args.checkout)
if hasattr(packages, 'strip') or (not hasattr(packages, '__getitem__') and not hasattr(packages, '__iter__')):
packages = [packages]
except:
pass
for p in packages:
- copyfile(p, '%s/%s' % (out, os.path.basename(devel_to_git(project, p))))
+ copyfile(p, '%s/%s' % (out, os.path.basename(devel_to_git(git_commit, p))))
else:
+ try:
+ makedirs(args.output)
+ except:
+ pass
for p in packages:
- copyfile(p, '%s%s' % (args.output, os.path.basename(devel_to_git(project, p))))
+ copyfile(p, '%s%s' % (args.output, os.path.basename(devel_to_git(git_commit, p))))
if not args.keep:
target.cleanup()
raise Error('you must specify --minor or --micro')
target = SourceTarget()
- project.checkout(target)
+ tree = globals.trees.get(args.project, args.checkout, target)
- version = project.version
+ version = tree.version
version.to_release()
if args.minor:
version.bump_minor()
elif globals.command == 'pot':
target = SourceTarget()
- project.checkout(target)
+ tree = globals.trees.get(args.project, args.checkout, target)
- pots = project.cscript['make_pot'](target)
+ pots = tree.call('make_pot')
for p in pots:
copyfile(p, '%s%s' % (args.output, os.path.basename(p)))
elif globals.command == 'changelog':
target = SourceTarget()
- project.checkout(target)
+ tree = globals.trees.get(args.project, args.checkout, target)
+
+ with TreeDirectory(tree):
+ text = open('ChangeLog', 'r')
- text = open('ChangeLog', 'r')
html = tempfile.NamedTemporaryFile()
versions = 8
elif globals.command == 'manual':
target = SourceTarget()
- project.checkout(target)
+ tree = globals.trees.get(args.project, args.checkout, target)
- outs = project.cscript['make_manual'](target)
+ outs = tree.call('make_manual')
for o in outs:
if os.path.isfile(o):
copyfile(o, '%s%s' % (args.output, os.path.basename(o)))
elif globals.command == 'doxygen':
target = SourceTarget()
- project.checkout(target)
+ tree = globals.trees.get(args.project, args.checkout, target)
- dirs = project.cscript['make_doxygen'](target)
+ dirs = tree.call('make_doxygen')
if hasattr(dirs, 'strip') or (not hasattr(dirs, '__getitem__') and not hasattr(dirs, '__iter__')):
dirs = [dirs]
elif globals.command == 'latest':
target = SourceTarget()
- project.checkout(target)
-
- f = command_and_read('git log --tags --simplify-by-decoration --pretty="%d"')
- latest = None
- while latest is None:
- t = f.readline()
- m = re.compile(".*\((.*)\).*").match(t)
- if m:
- tags = m.group(1).split(', ')
- for t in tags:
- s = t.split()
- if len(s) > 1:
- t = s[1]
- if len(t) > 0 and t[0] == 'v':
- v = Version(t[1:])
- if args.major is None or v.major == args.major:
- latest = v
+ tree = globals.trees.get(args.project, args.checkout, target)
+
+ with TreeDirectory(tree):
+ f = command_and_read('git log --tags --simplify-by-decoration --pretty="%d"')
+ latest = None
+ while latest is None:
+ t = f.readline()
+ m = re.compile(".*\((.*)\).*").match(t)
+ if m:
+ tags = m.group(1).split(', ')
+ for t in tags:
+ s = t.split()
+ if len(s) > 1:
+ t = s[1]
+ if len(t) > 0 and t[0] == 'v':
+ v = Version(t[1:])
+ if args.major is None or v.major == args.major:
+ latest = v
print latest
target.cleanup()
target = None
try:
target = target_factory(args.target, args.debug, args.work)
- target.test(project)
+ tree = globals.trees.get(args.project, args.checkout, target)
+ with TreeDirectory(tree):
+ target.test(tree)
except Error as e:
if target is not None:
target.cleanup()
elif globals.command == 'revision':
target = SourceTarget()
- project.checkout(target)
- print command_and_read('git rev-parse HEAD').readline().strip()[:7]
+ tree = globals.trees.get(args.project, args.checkout, target)
+ with TreeDirectory(tree):
+ print command_and_read('git rev-parse HEAD').readline().strip()[:7]
target.cleanup()
else: