Mercurial > gub

changeset 5876:a5681c276fa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build test+docs with multiple CPUs.
author Graham Percival <graham@percival-music.ca>
date Fri, 01 Jan 2010 03:31:12 +0000
parents 10de3d9b3e98
children c6e9fa177a62
files gub/build.py gub/specs/lilypond-doc.py gub/specs/lilypond-test.py
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/build.py	Wed Dec 30 00:02:04 2009 +0000
+++ b/gub/build.py	Fri Jan 01 03:31:12 2010 +0000
@@ -345,6 +345,12 @@
         return ''
 
     @context.subst_method
+    def cpu_count (self):
+        if not self.parallel_build_broken:
+            return self.settings.cpu_count_str
+        return '1'
+
+    @context.subst_method
     def src_package_ball (self):
         return '%(src_package_uploads)s/%(name)s%(ball_suffix)s-src.%(platform)s.tar.gz'
 
--- a/gub/specs/lilypond-doc.py	Wed Dec 30 00:02:04 2009 +0000
+++ b/gub/specs/lilypond-doc.py	Fri Jan 01 03:31:12 2010 +0000
@@ -13,12 +13,12 @@
                 'tools::rsync', # ugh, we depend on *rsync* !?
                 #'tools::texlive',
                 ])
-    parallel_build_broken = True
     make_flags = misc.join_lines ('''
 CROSS=no
 DOCUMENTATION=yes
 WEB_TARGETS="offline online"
 TARGET_PYTHON=/usr/bin/python
+CPU_COUNT=%(cpu_count)s
 ''')
     compile_flags = lilypond.LilyPond_base.compile_flags + ' top-doc all doc'
     install_flags = (' install-doc install-help2man'
--- a/gub/specs/lilypond-test.py	Wed Dec 30 00:02:04 2009 +0000
+++ b/gub/specs/lilypond-test.py	Fri Jan 01 03:31:12 2010 +0000
@@ -8,6 +8,9 @@
     @context.subst_method
     def test_ball (self):
         return '%(uploads)s/lilypond-%(version)s-%(build_number)s.test-output.tar.bz2'
+    make_flags = misc.join_lines ('''
+CPU_COUNT=%(cpu_count)s
+''')
     compile_flags = lilypond.LilyPond_base.compile_flags + ' test'
         #return (lilypond.LilyPond_base.install_command
     install_command = 'true'