X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=5adfcb3058df19280ddf37615907e6120a6253ad;hb=5398c1592834132478e75ec17c2806e36b7a98fb;hp=d40237410e5780e3ac1714265f1644046cd71fc9;hpb=29d0c4b33b7bc6434d32d735358b8768e965c117;p=lilypond.git diff --git a/SConstruct b/SConstruct index d40237410e..5adfcb3058 100644 --- a/SConstruct +++ b/SConstruct @@ -60,19 +60,13 @@ prefix=os.path.join (os.environ['HOME'], 'usr', 'pkg', 'lilypond') # TODO: -# * install doc +# * usability # * more program configure tests (mfont, ...?) -# * split doc target: doc input examples mutopia? - -# * more fine-grained config.hh -- move lilypondprefix to version.hh? -# - config.hh: changes after system upgrades, affects all files -# - version.hh: prefix, version etc? affects few +# * install doc -# - what about GUILE_*_VERSION, seems to be the major culprit, -# for config.hh dependency escalation. Is the lily-guile.hh -# workaround necessary at all for GUILE > 1.5? +# * split doc target: doc input examples mutopia? # * grep FIXME $(find . -name 'S*t') @@ -92,7 +86,7 @@ usage = r'''Usage: scons [KEY=VALUE].. [TARGET|DIR].. TARGETS: clean, config, doc, dist, install, mf-essential, po-update, - realclean, release, tar, TAGS + realclean, release, sconsclean, tar, TAGS ''' @@ -135,6 +129,8 @@ opts.AddOptions ( BoolOption ('verbose', 'run commands with verbose flag', 0), BoolOption ('checksums', 'use checksums instead of timestamps', + 0), + BoolOption ('fast', 'use timestamps, implicit cache, prune CPPPATH', 1), ) @@ -178,19 +174,20 @@ Help (usage + opts.GenerateHelpText (env)) opts.Update (env) -# Using content checksums prevents rebuilds after [re]configure if -# config.hh has not changed. -if env['checksums']: +if env['fast']: + # Usability switch (Anthony Roach). + # See http://www.scons.org/cgi-bin/wiki/GoFastButton + # First do: scons realclean . + env['checksums'] = 0 + SetOption ('max_drift', 1) + SetOption ('implicit_cache', 1) +elif env['checksums']: + # Always use checksums (makes more sense than timestamps). SetOption ('max_drift', 0) - TargetSignatures ("content") - -# build web in out-www, so that scons is a drop-in replacement for make -# we can revise the entire web building when web is built with scons. -web_kluts = '' -# Hmm: scons: *** maximum recursion limit exceeded -if 0 and 'web' in COMMAND_LINE_TARGETS: - web_kluts = 'out-scons' #env['out'] - env['out'] = 'out-www' + # Using *content* checksums prevents rebuilds after + # [re]configure if config.hh has not changed. Too bad that it + # is unusably slow. + TargetSignatures ('content') absbuild = Dir (env['build']).abspath outdir = os.path.join (Dir (env['build']).abspath, env['out']) @@ -202,6 +199,10 @@ version_hh = os.path.join (outdir, 'version.hh') env.Alias ('config', config_cache) +cachedir = os.path.join (outdir, 'build-cache') + +if not os.path.exists(cachedir): + os.makedirs(cachedir) CacheDir (os.path.join (outdir, 'build-cache')) @@ -324,7 +325,10 @@ def configure (target, source, env): command = r"""python -c 'import sys; sys.stdout.write ("%s/include/python%s" % (sys.prefix, sys.version[:3]))'""" #" PYTHON_INCLUDE = os.popen (command).read () - env.Append (CPPPATH = PYTHON_INCLUDE) + if env['fast']: + env.Append (CCFLAGS = ['-I%s ' % PYTHON_INCLUDE]) + else: + env.Append (CPPPATH = PYTHON_INCLUDE) headers = ('sys/stat.h', 'assert.h', 'kpathsea/kpathsea.h', 'Python.h') for i in headers: @@ -359,6 +363,10 @@ def configure (target, source, env): if conf.CheckLib ('kpathsea', 'kpse_find_tfm'): conf.env['DEFINES']['HAVE_KPSE_FIND_TFM'] = '1' + if env['fast']: + cpppath = [] + if env.has_key ('CPPPATH'): + cpppath = env['CPPPATH'] #this could happen after flower... env.ParseConfig ('guile-config compile') @@ -374,6 +382,13 @@ def configure (target, source, env): conf.env['DEFINES']['HAVE_PANGO_CVS'] = '1' conf.env['DEFINES']['HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC'] = '1' + if env['fast']: + # Using CCFLAGS = -I rather than CPPPATH = [ + # ] speeds up SCons + env['CCFLAGS'] += map (lambda x: '-I' + x, + env['CPPPATH'][len (cpppath):]) + env['CPPPATH'] = cpppath + if required: print print '********************************' @@ -475,10 +490,11 @@ env.PrependENVPath ('PATH', if os.environ.has_key ('TEXMF'): env.Append (ENV = {'TEXMF' : os.environ['TEXMF']}) -env.Append (ENV = {'TEXMF' : '{$LILYPONDPREFIX,' \ - + os.popen ('kpsexpand \$TEXMF').read ()[:-1] + '}' }) - - +env.Append (ENV = { + 'TEXMF' : '{$LILYPONDPREFIX,' \ + + os.popen ('kpsexpand \$TEXMF').read ()[:-1] + '}', + 'LILYPONDPREFIX' : os.path.join (run_prefix, 'share/lilypond'), + }) BUILD_ABC2LY = '${set__x}$PYTHON $srcdir/scripts/abc2ly.py' BUILD_LILYPOND = '${set__x}$PYTHON $srcdir/scripts/lilypond.py${__verbose}' @@ -544,6 +560,13 @@ if 'clean' in COMMAND_LINE_TARGETS: os.unlink (config_cache) Exit (s) +if 'sconsclean' in COMMAND_LINE_TARGETS: + command = 'rm -rf scons.cache $(find . -name ".scon*")' + s = os.system (command) + if os.path.exists (config_cache): + os.unlink (config_cache) + Exit (s) + if 'realclean' in COMMAND_LINE_TARGETS: command = 'rm -rf $(find . -name "out-scons" -o -name ".scon*")' sys.stdout.write ('Running %s ... ' % command) @@ -584,7 +607,6 @@ env.Append ( LILYPONDPREFIX = os.path.join (run_prefix, 'share/lilypond'), LIBPATH = [os.path.join (absbuild, 'flower', env['out']),], - ##CPPPATH = [outdir, '#',], # do not read auto*'s header CPPPATH = [outdir, ], LILYPOND_PATH = ['.', '$srcdir/input', '$srcdir/input/regression', @@ -701,74 +723,98 @@ def flatten (tree, lst): lst.append (i) return lst -subdirs = flatten (cvs_dirs ('.'), []) +if env['fast']\ + and 'all' not in COMMAND_LINE_TARGETS\ + and 'doc' not in COMMAND_LINE_TARGETS\ + and 'web' not in COMMAND_LINE_TARGETS\ + and 'install' not in COMMAND_LINE_TARGETS\ + and 'clean' not in COMMAND_LINE_TARGETS: + subdirs = ['lily', 'lily/include', 'flower', 'flower/include', 'mf'] +else: + subdirs = flatten (cvs_dirs ('.'), []) + +src_files = reduce (lambda x, y: x + y, map (cvs_files, subdirs)) readme_files = ['AUTHORS', 'README', 'INSTALL', 'NEWS'] -foo = map (lambda x: env.TXT (x + '.txt', - os.path.join ('Documentation/topdocs', x)), - readme_files) txt_files = map (lambda x: x + '.txt', readme_files) -src_files = reduce (lambda x, y: x + y, map (cvs_files, subdirs)) -tar_base = package.name + '-' + version -tar_name = tar_base + '.tar.gz' -ball_prefix = os.path.join (outdir, tar_base) -tar_ball = os.path.join (outdir, tar_name) - -dist_files = src_files + txt_files -ball_files = map (lambda x: os.path.join (ball_prefix, x), dist_files) -map (lambda x: env.Depends (tar_ball, x), ball_files) -map (lambda x: env.Command (os.path.join (ball_prefix, x), x, - 'ln $SOURCE $TARGET'), dist_files) -tar = env.Command (tar_ball, src_files, - ['rm -f $$(find $TARGET.dir -name .sconsign)', - 'tar czf $TARGET -C $TARGET.dir %s' % tar_base,]) -env.Alias ('tar', tar) - -dist_ball = os.path.join (package.release_dir, tar_name) -env.Command (dist_ball, tar_ball, - 'if [ -e $SOURCE -a -e $TARGET ]; then rm $TARGET; fi;' \ - + 'ln $SOURCE $TARGET') -env.Depends ('dist', dist_ball) -patch_name = os.path.join (outdir, tar_base + '.diff.gz') -patch = env.PATCH (patch_name, tar_ball) -env.Depends (patch_name, dist_ball) -env.Alias ('release', patch) + + +# +# speeds up build by +- 5% +# +if not env['fast']: + foo = map (lambda x: env.TXT (x + '.txt', + os.path.join ('Documentation/topdocs', x)), + readme_files) + tar_base = package.name + '-' + version + tar_name = tar_base + '.tar.gz' + ball_prefix = os.path.join (outdir, tar_base) + tar_ball = os.path.join (outdir, tar_name) + + dist_files = src_files + txt_files + ball_files = map (lambda x: os.path.join (ball_prefix, x), dist_files) + map (lambda x: env.Depends (tar_ball, x), ball_files) + map (lambda x: env.Command (os.path.join (ball_prefix, x), x, + 'ln $SOURCE $TARGET'), dist_files) + tar = env.Command (tar_ball, src_files, + ['rm -f $$(find $TARGET.dir -name .sconsign)', + 'tar czf $TARGET -C $TARGET.dir %s' % tar_base,]) + env.Alias ('tar', tar) + + dist_ball = os.path.join (package.release_dir, tar_name) + env.Command (dist_ball, tar_ball, + 'if [ -e $SOURCE -a -e $TARGET ]; then rm $TARGET; fi;' \ + + 'ln $SOURCE $TARGET') + env.Depends ('dist', dist_ball) + patch_name = os.path.join (outdir, tar_base + '.diff.gz') + patch = env.PATCH (patch_name, tar_ball) + env.Depends (patch_name, dist_ball) + env.Alias ('release', patch) #### web -web_base = os.path.join (outdir, 'web') -web_ball = web_base + '.tar.gz' -env['footify'] = 'MAILADDRESS=bug-lilypond@gnu.org $PYTHON stepmake/bin/add-html-footer.py --name=lilypond --version=$TOPLEVEL_VERSION' -web_ext = ['.html', '.ly', '.midi', '.pdf', '.png', '.ps.gz', '.txt',] -web_path = '-path "*/$out/*"' + string.join (web_ext, ' -or -path "*/$out/*"') -env['web_path'] = web_path -web_list = os.path.join (outdir, 'weblist') -# compatible make heritits -# fixme: generate in $outdir is cwd/builddir -env.Command (web_list, - ## this is correct, but takes > 5min if you have a peder :-) - ##'doc', - '#/VERSION', - ['$PYTHON buildscripts/mutopia-index.py -o examples.html ./', - 'cd $absbuild && $footify $$(find . -name "*.html" -print)', - # uhg? - 'cd $absbuild && rm -f $$(find . -name "*.html~" -print)', - 'cd $absbuild && find Documentation input $web_path \ - > $TARGET', - '''echo '' > $absbuild/index.html''', - '''echo 'Redirecting to the documentation index...' >> $absbuild/index.html''', - # UGHR? all .html cruft in cwd goes into the web ball? - 'cd $absbuild && ls *.html >> $TARGET',]) -env.Command (web_ball, web_list, - ['cat $SOURCE | tar -C $absbuild -czf $TARGET -T -',]) -env.Alias ('web', web_ball) -env.Alias ('roll-web', web_ball) +if not env['fast']: + web_base = os.path.join (outdir, 'web') + web_ball = web_base + '.tar.gz' + env['footify'] = 'MAILADDRESS=bug-lilypond@gnu.org $PYTHON stepmake/bin/add-html-footer.py --name=lilypond --version=$TOPLEVEL_VERSION' + web_ext = ['.html', '.ly', '.midi', '.pdf', '.png', '.ps.gz', '.txt',] + web_path = '-path "*/$out/*"' + string.join (web_ext, ' -or -path "*/$out/*"') + env['web_path'] = web_path + web_list = os.path.join (outdir, 'weblist') + # compatible make heritits + # fixme: generate in $outdir is cwd/builddir + env.Command (web_list, + ## this is correct, but takes > 5min if you have a peder :-) + ##'doc', + '#/VERSION', + ['$PYTHON buildscripts/mutopia-index.py -o examples.html ./', + 'cd $absbuild && $footify $$(find . -name "*.html" -print)', + 'cd $absbuild && rm -f $$(find . -name "*.html~" -print)', + 'cd $absbuild && find Documentation input $web_path \ + > $TARGET', + '''echo '' > $absbuild/index.html''', + '''echo 'Redirecting to the documentation index...' >> $absbuild/index.html''', + 'cd $absbuild && ls *.html >> $TARGET',]) + env.Command (web_ball, web_list, + ['cat $SOURCE | tar -C $absbuild -czf $TARGET -T -',]) + #env.Alias ('web', web_ball) + www_base = os.path.join (outdir, 'www') + www_ball = www_base + '.tar.gz' + env.Command (www_ball, web_ball, + ['rm -rf $out/tmp', + 'mkdir -p $absbuild/$out/tmp', + 'tar -C $absbuild/$out/tmp -xzf $SOURCE', + 'cd $absbuild/$out/tmp && for i in $$(find . -name "$out"); ' + + ' do mv $$i $$(dirname $$i)/out-www; done', + 'tar -C $absbuild/$out/tmp -czf $TARGET .']) + env.Alias ('web', www_ball) #### tags env.Append ( - ETAGSFLAGS = ["""--regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'""", - """--regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'"""]) -# filter-out some files? -env.Command ('TAGS', src_files, 'etags $ETAGSFLAGS $SOURCES') - + ETAGSFLAGS = """--regex='{c++}/^LY_DEFINE *(\([^,]+\)/\\1/' \ + --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\\1/'""") +code_ext = ['.cc', '.hh', '.scm', '.tcc',] +env.Command ('TAGS', filter (lambda x: os.path.splitext (x)[1] in code_ext, + src_files), + 'etags $ETAGSFLAGS $SOURCES') # Note: SConscripts are only needed in directories where something needs # to be done, building or installing @@ -779,9 +825,5 @@ for d in subdirs: # and ./out build. if os.path.abspath (b) != os.path.abspath (d): env.BuildDir (b, d, duplicate = 0) - if web_kluts: - # look in out-scons - env.Repository (os.path.join (env['build'], d, - web_kluts)) SConscript (os.path.join (b, 'SConscript'))