# 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')
scons [KEY=VALUE].. [TARGET|DIR]..
TARGETS: clean, config, doc, dist, install, mf-essential, po-update,
- realclean, release, tar, TAGS
+ realclean, release, sconsclean, tar, TAGS
'''
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),
)
ENV = ENV,
BASH = '/bin/bash',
+ CPPDEFINES = '-DHAVE_CONFIG_H',
PERL = '/usr/bin/perl',
PYTHON = '/usr/bin/python',
SH = '/bin/sh',
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")
+ # 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'])
env.Alias ('config', config_cache)
+cachedir = os.path.join (outdir, 'build-cache')
-CacheDir (os.path.join (outdir, 'build-cache'))
+if not os.path.exists (cachedir):
+ os.makedirs (cachedir)
+
+CacheDir (cachedir)
# No need to set $LILYPONDPREFIX to run lily, but cannot install...
if env['debugging'] and not 'install' in COMMAND_LINE_TARGETS:
def configure (target, source, env):
vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$', re.DOTALL)
def get_version (program):
- command = '(%(program)s --version || %(program)s -V) 2>&1' % vars ()
+ command = '(pkg-config --modversion %(program)s || %(program)s --version || %(program)s -V) 2>&1' % vars ()
pipe = os.popen (command)
output = pipe.read ()
if pipe.close ():
return None
v = re.sub (vre, '\\1', output)
+ if v[-1] == '\n':
+ v = v[:-1]
return string.split (v, '.')
def test_program (lst, program, minimal, description, package):
print 'not found'
lst.append ((description, package, minimal, program,
'not installed'))
- return
+ return 0
sys.stdout.write (string.join (actual, '.'))
sys.stdout.write ('\n')
if actual < string.split (minimal, '.'):
lst.append ((description, package, minimal, program,
string.join (actual, '.')))
+ return 0
+ return 1
+
+ def test_lib (lst, program, minimal, description):
+ # FIXME: test for Debian or RPM (or -foo?) based dists
+ # to guess (or get correct!: apt-cache search?)
+ # package name.
+ #if os.system ('pkg-config --atleast-version=0 freetype2'):
+ # barf
+ if test_program (lst, program, minimal, description,
+ 'lib%(program)s-dev or %(program)s-devel'
+ % vars ()):
+ env.ParseConfig ('pkg-config --cflags --libs %(program)s'
+ % vars ())
+ return 1
+ return 0
for i in ['bash', 'perl', 'python', 'sh']:
sys.stdout.write ('Checking for %s... ' % i)
'bison')
test_program (required, 'flex', '0.0', 'Flex -- lexer generator', 'flex')
-
optional = []
test_program (optional, 'makeinfo', '4.7', 'Makeinfo tool', 'texinfo')
- test_program (optional, 'guile', '1.6', 'GUILE scheme',
- 'libguile-dev or guile-devel')
- test_program (optional, 'mftrace', '1.0.27', 'Metafont tracing Type1',
+ test_program (optional, 'guile', '1.6', 'GUILE scheme', 'guile')
+ test_program (optional, 'mftrace', '1.1.0', 'Metafont tracing Type1',
'mftrace')
test_program (optional, 'perl', '4.0',
'Perl practical efficient readonly language', 'perl')
defines = {
'DIRSEP' : "'%s'" % os.sep,
'PATHSEP' : "'%s'" % os.pathsep,
- 'TOPLEVEL_VERSION' : '"' + version + '"',
- 'PACKAGE': '"' + package.name + '"',
- 'DATADIR' : '"' + sharedir + '"',
- 'LILYPOND_DATADIR' : '"' + sharedir_package + '"',
- 'LOCAL_LILYPOND_DATADIR' : '"' + sharedir_package_version + '"',
- 'LOCALEDIR' : '"' + localedir + '"',
+ 'PACKAGE': '"%s"' % package.name,
+ 'DATADIR' : '"%s"' % sharedir,
+ 'PACKAGE_DATADIR' : '"%s"' % sharedir_package,
+ 'LOCALEDIR' : '"%s"' %localedir,
}
conf.env.Append (DEFINES = defines)
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')
+ headers = ('sys/stat.h', 'assert.h', 'kpathsea/kpathsea.h', 'libio.h',
+ 'Python.h')
for i in headers:
if conf.CheckCHeader (i):
key = re.sub ('[./]', '_', 'HAVE_' + string.upper (i))
key = re.sub ('[./]', '_', 'HAVE_' + string.upper (i))
conf.env['DEFINES'][key] = 1
- functions = ('gettext', 'isinf', 'memmem', 'snprintf', 'vsnprintf')
+ functions = ('fopencookie', 'funopen',
+ 'gettext', 'isinf', 'memmem', 'snprintf', 'vsnprintf')
for i in functions:
if 0 or conf.CheckFunc (i):
key = re.sub ('[./]', '_', 'HAVE_' + string.upper (i))
if conf.CheckLib ('kpathsea', 'kpse_find_tfm'):
conf.env['DEFINES']['HAVE_KPSE_FIND_TFM'] = '1'
+ # FIXME fc3 - move to kpath-guile/SConscript?
+ conf.env['DEFINES']['HAVE_LIBKPATHSEA_SO'] = '1'
+
+ 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')
+ if test_lib (required, 'freetype2', '0.0',
+ 'Development files for FreeType 2 font engine'):
+ conf.env['DEFINES']['HAVE_FREETYPE2'] = '1'
+
+ if test_lib (required, 'pangoft2', '1.6.0',
+ 'Development files for pango, with fontconfig2'):
+ conf.env['DEFINES']['HAVE_PANGO_FT2'] = '1'
+ conf.env['DEFINES']['HAVE_PANGO16'] = '1'
+
+ if test_lib (optional, 'fontconfig', '2.2.0',
+ 'Development files for fontconfig'):
+ conf.env['DEFINES']['HAVE_FONTCONFIG'] = '1'
+
#this could happen only for compiling pango-*
if env['gui']:
- env.ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
- env.ParseConfig ('pkg-config --cflags --libs pango')
+ test_lib (required, 'gtk+-2.0', '2.4.0',
+ 'Development files for GTK+')
+ if test_lib (required, 'pango', '1.6.0',
+ 'Development files for pango'):
+ conf.env['DEFINES']['HAVE_PANGO16'] = '1'
+
if conf.CheckCHeader ('pango/pangofc-fontmap.h'):
conf.env['DEFINES']['HAVE_PANGO_PANGOFC_FONTMAP_H'] = '1'
-
if conf.CheckLib ('pango-1.0',
'pango_fc_font_map_add_decoder_find_func'):
- conf.env['DEFINES']['HAVE_PANGO_CVS'] = '1'
+ conf.env['DEFINES']['HAVE_PANGO16'] = '1'
conf.env['DEFINES']['HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC'] = '1'
+ if env['fast']:
+ # Using CCFLAGS = -I<system-dir> rather than CPPPATH = [
+ # <system-dir>] speeds up SCons
+ env['CCFLAGS'] += map (lambda x: '-I' + x,
+ env['CPPPATH'][len (cpppath):])
+ env['CPPPATH'] = cpppath
+
if required:
print
print '********************************'
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)
run_prefix = run_prefix,
LILYPONDPREFIX = os.path.join (run_prefix, 'share/lilypond'),
- LIBPATH = [os.path.join (absbuild, 'flower', env['out']),],
- ##CPPPATH = [outdir, '#',], # do not read auto*'s header
+ # FIXME: move to lily/SConscript?
+ LIBPATH = [os.path.join (absbuild, 'flower', env['out']),
+ os.path.join (absbuild, 'kpath-guile', env['out']),
+ os.path.join (absbuild, 'ttftool', env['out']),],
CPPPATH = [outdir, ],
LILYPOND_PATH = ['.', '$srcdir/input',
'$srcdir/input/regression',
os.symlink (frm, os.path.basename (dst))
shutil.rmtree (run_prefix)
prefix = os.path.join (env['out'], 'usr')
- map (lambda x: symlink (x[0], os.path.join (prefix, x[1])),
+ map (lambda x: symlink (x[0], os.path.join (prefix,
+ x[1] % {'ver' : version})),
# ^# := source dir
# @ := out
# /$ := add dst file_name
(('python', 'lib/lilypond/python'),
- ('lily/', 'bin/lilypond-bin'),
- ('scripts/', 'bin/lilypond'),
+ ('lily/', 'bin/lilypond'),
+ ('scripts/', 'bin/convert-ly'),
('scripts/', 'bin/lilypond-book'),
- ('mf', 'share/lilypond/dvips'),
- ('#ps', 'share/lilypond/tex/music-drawing-routines.ps'),
- ('mf', 'share/lilypond/afm'),
- ('mf', 'share/lilypond/tfm'),
- ('#mf', 'share/lilypond/fonts/mf'),
- ('mf', 'share/lilypond/fonts/afm'),
- ('mf', 'share/lilypond/fonts/tfm'),
- ('mf', 'share/lilypond/fonts/type1'),
- ('#tex', 'share/lilypond/tex/source'),
- ('mf', 'share/lilypond/tex/generate'),
- ('#ly', 'share/lilypond/ly'),
- ('#scm', 'share/lilypond/scm'),
- ('#ps', 'share/lilypond/ps'),
+ ('scripts/', 'bin/ps2png'),
+ ('mf', 'share/lilypond/%(ver)s/dvips/mf-out'),
+ ('#ps', 'share/lilypond/%(ver)s/dvips/ps'),
+ ('#ps', 'share/lilypond/%(ver)s/tex/music-drawing-routines.ps'),
+ ('mf', 'share/lilypond/%(ver)s/otf'),
+ ('mf', 'share/lilypond/%(ver)s/tfm'),
+ ('tex', 'share/lilypond/%(ver)s/tex/enc'),
+ ('#mf', 'share/lilypond/%(ver)s/fonts/mf'),
+ ('mf', 'share/lilypond/%(ver)s/fonts/map'),
+ ('mf', 'share/lilypond/%(ver)s/fonts/otf'),
+ ('mf', 'share/lilypond/%(ver)s/fonts/tfm'),
+ ('mf', 'share/lilypond/%(ver)s/fonts/type1'),
+ ('#tex', 'share/lilypond/%(ver)s/tex/source'),
+ ('tex', 'share/lilypond/%(ver)s/tex/tex-out'),
+ ('mf', 'share/lilypond/%(ver)s/tex/mf-out'),
+ ('#ly', 'share/lilypond/%(ver)s/ly'),
+ ('#scm', 'share/lilypond/%(ver)s/scm'),
+ ('#scripts', 'share/lilypond/%(ver)s/scripts'),
+ ('#ps', 'share/lilypond/%(ver)s/ps'),
('po/@/nl.mo', 'share/locale/nl/LC_MESSAGES/lilypond.mo'),
- ('elisp', 'share/lilypond/elisp')))
+ ('elisp', 'share/lilypond/%(ver)s/elisp')))
os.chdir (srcdir)
if env['debugging']:
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',
+ 'kpath-guile',
+ 'ttftool',
+ '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 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
projects / lilypond.git / blobdiff