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),
)
TOPLEVEL_VERSION = version,
)
-# Hardcoded usability switch (Anthony Roach).
-# See http://www.scons.org/cgi-bin/wiki/GoFastButton
-# First do: scons realclean .
-GO_FAST_BUTTON = 1
-
# Add all config_vars to opts, so that they will be read and saved
# together with the other configure options.
map (lambda x: opts.AddOptions ((x,)), config_vars)
opts.Update (env)
-if GO_FAST_BUTTON:
+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_deps_unchanged', 1)
- print "If scons feels slow, use --implicit-deps-unchanged"
+ SetOption ('implicit_cache', 1)
elif env['checksums']:
# Always use checksums (makes more sense than timestamps).
SetOption ('max_drift', 0)
command = r"""python -c 'import sys; sys.stdout.write ("%s/include/python%s" % (sys.prefix, sys.version[:3]))'""" #"
PYTHON_INCLUDE = os.popen (command).read ()
- if GO_FAST_BUTTON:
+ if env['fast']:
env.Append (CCFLAGS = ['-I%s ' % PYTHON_INCLUDE])
else:
env.Append (CPPPATH = PYTHON_INCLUDE)
if conf.CheckLib ('kpathsea', 'kpse_find_tfm'):
conf.env['DEFINES']['HAVE_KPSE_FIND_TFM'] = '1'
- if GO_FAST_BUTTON:
+ if env['fast']:
cpppath = []
if env.has_key ('CPPPATH'):
cpppath = env['CPPPATH']
+
+ ## FIXME: linkage, check for libguile.h and scm_boot_guile
#this could happen after flower...
env.ParseConfig ('guile-config compile')
conf.env['DEFINES']['HAVE_PANGO_CVS'] = '1'
conf.env['DEFINES']['HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC'] = '1'
- if GO_FAST_BUTTON:
+ if env['fast']:
# Using CCFLAGS = -I<system-dir> rather than CPPPATH = [
# <system-dir>] speeds up SCons
env['CCFLAGS'] += map (lambda x: '-I' + x,
('lily/', 'bin/lilypond-bin'),
('scripts/', 'bin/lilypond'),
('scripts/', 'bin/lilypond-book'),
- ('mf', 'share/lilypond/dvips'),
+ ('mf', 'share/lilypond/dvips/mf-out'),
+ ('#ps', 'share/lilypond/dvips/ps'),
('#ps', 'share/lilypond/tex/music-drawing-routines.ps'),
- ('mf', 'share/lilypond/afm'),
+ ('mf', 'share/lilypond/otf'),
('mf', 'share/lilypond/tfm'),
+ ('tex', 'share/lilypond/tex/enc'),
('#mf', 'share/lilypond/fonts/mf'),
- ('mf', 'share/lilypond/fonts/afm'),
+ ('mf', 'share/lilypond/fonts/map'),
+ ('mf', 'share/lilypond/fonts/otf'),
('mf', 'share/lilypond/fonts/tfm'),
('mf', 'share/lilypond/fonts/type1'),
('#tex', 'share/lilypond/tex/source'),
- ('mf', 'share/lilypond/tex/generate'),
+ ('tex', 'share/lilypond/tex/tex-out'),
+ ('mf', 'share/lilypond/tex/mf-out'),
('#ly', 'share/lilypond/ly'),
('#scm', 'share/lilypond/scm'),
('#ps', 'share/lilypond/ps'),
lst.append (i)
return lst
-if GO_FAST_BUTTON\
+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','flower', 'mf']
+ 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)',
- 'cd $absbuild && rm -f $$(find . -name "*.html~" -print)',
- 'cd $absbuild && find Documentation input $web_path \
- > $TARGET',
- '''echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $absbuild/index.html''',
- '''echo '<html><body>Redirecting to the documentation index...</body></html>' >> $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)
+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 '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $absbuild/index.html''',
+ '''echo '<html><body>Redirecting to the documentation index...</body></html>' >> $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