diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-07 16:46:03 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-07 16:46:03 +0000 |
| commit | f624dc956fcb059273edcffdde2d942be2124914 (patch) | |
| tree | 33a5cc5eae9e8775cbd3f7bdd383493c578f2cef /morphlib/builder2.py | |
| parent | ab90f3561ce43dba089686c743ecf0c4d6f33d31 (diff) | |
| parent | 48af89acfd6ae207ecb8e4548f9f0ded8b0cabde (diff) | |
| download | morph-f624dc956fcb059273edcffdde2d942be2124914.tar.gz | |
Merge branch 'liw/pre-commands' into staging
Conflicts:
morphlib/morph2.py
Diffstat (limited to 'morphlib/builder2.py')
| -rw-r--r-- | morphlib/builder2.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 82a95820..73745d66 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -377,10 +377,20 @@ class ChunkBuilder(BuilderBase): relative_destdir = self.staging_area.relative(destdir) self.build_env.env['DESTDIR'] = relative_destdir - steps = [('configure', False), - ('build', True), - ('test', False), - ('install', False)] + steps = [ + ('pre-configure', False), + ('configure', False), + ('post-configure', False), + ('pre-build', True), + ('build', True), + ('post-build', True), + ('pre-test', False), + ('test', False), + ('post-test', False), + ('pre-install', False), + ('install', False), + ('post-install', False), + ] for step, in_parallel in steps: with self.build_watch(step): key = '%s-commands' % step |