X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Fbuilder.py;h=3caea45830dd49d1cf25dbc31cc472d7b806c6b3;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=d9107fc364e35498c29e66e12226712bc42168f4;hpb=4d45518a9e5e39d06ba02ecee67ce19e19528463;p=lilypond.git

diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index d9107fc364..3caea45830 100644
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -1,196 +1,393 @@
 # -*-python-*-
 
+import glob
 import os
 import string
 
 Import ('env')
 
-def verbose_opt (env, opt):
-	if env['verbose']:
-		return opt
-	return ''
+# utility
 
-srcdir = env['srcdir']
-build = env['build']
+def add_suffixes (target, source, env, target_suffixes, src_suffixes):
+    base = os.path.splitext (str (target[0]))[0]
+    return (target + map (lambda x: base + x, target_suffixes),
+        source + map (lambda x: base + x, src_suffixes))
+
+# junkme; see _concat
 def join_path (path, infix=os.pathsep, prefix = ''):
-	def dir (x):
-		if x and x[0] == '#':
-			return srcdir + x[1:]
-		return x
-	return string.join (map (lambda x: prefix + dir (x), path), infix)
-
-verbose = verbose_opt (env, ' --verbose')
-MAKEINFO_INCLUDES = join_path (env['MAKEINFO_PATH'], '', ' -I')
-MAKEINFO = env['MAKEINFO']
-a = ('%(MAKEINFO)s %(verbose)s %(MAKEINFO_INCLUDES)s'\
-     ' --no-split --no-headers --output=$TARGET $SOURCE') % vars ()
-texi2txt = Builder (action = a, suffix = '.txt', src_suffix = '.texi')
-env.Append (BUILDERS = {'Texi2txt': texi2txt})
-
-
-PYTHON = env['PYTHON']
-ABC2LY_PY = env['ABC2LY_PY']
-LILYPOND_PY = env['LILYPOND_PY']
-LILYPOND_BIN = env['LILYPOND_BIN']
-LILYPOND_BOOK = env['LILYPOND_BOOK']
-LILYPOND_BOOK_FLAGS = env['LILYPOND_BOOK_FLAGS']
-LILYPOND_BOOK_FORMAT = env['LILYPOND_BOOK_FORMAT']
-LILYPOND_BOOK_INCLUDES = join_path (env['LILYPOND_BOOK_PATH'], '',
-				    ' --include=')
-LILYPONDPREFIX = env['LILYPONDPREFIX']
-
-env.Append (ENV = {'PATH' : os.environ['PATH']})
-if os.environ.has_key ('LD_LIBRARY_PATH'):
-	env.Append (ENV = {'LD_LIBRARY_PATH' : os.environ['LD_LIBRARY_PATH']})
-if os.environ.has_key ('GUILE_LOAD_PATH'):
-	env.Append (ENV = {'GUILE_LOAD_PATH' : os.environ['GUILE_LOAD_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] + '}' })
-
-verbose = verbose_opt (env, ' --verbose')
-a = (r'''rm -f $$(grep -LF '\lilypondend' $$(dirname $TARGET)/lily-*.tex 2>/dev/null); ''' \
-     + 'LILYPONDPREFIX=%(LILYPONDPREFIX)s '\
-     + '%(PYTHON)s %(LILYPOND_BOOK)s%(verbose)s'\
-     + ' --include=$$(dirname $TARGET) %(LILYPOND_BOOK_INCLUDES)s'\
-     + r""" --process='%(LILYPOND_BIN)s %(LILYPOND_BOOK_INCLUDES)s'"""\
-     + ' --output=$$(dirname $TARGET) --format=%(LILYPOND_BOOK_FORMAT)s\
-     %(LILYPOND_BOOK_FLAGS)s\
-     $SOURCE') % vars ()
-tely2texi = Builder (action = a, suffix = '.texi', src_suffix = '.tely')
-env.Append (BUILDERS = {'Tely2texi': tely2texi})
-
-TEXINFO_PAPERSIZE_OPTION = env['TEXINFO_PAPERSIZE_OPTION']
-a = '(cd $$(dirname $TARGET) &&\
- texi2dvi --batch %(TEXINFO_PAPERSIZE_OPTION)s $$(basename $SOURCE))' % vars ()
-texi2dvi = Builder (action = a, suffix = '.dvi', src_suffix = '.texi')
-env.Append (BUILDERS = {'Texi2dvi': texi2dvi})
-
-env.Append (DVIPSFLAGS = '-Ppdf -u+lilypond.map -u+ec-mftrace.map')
-
-DVIPS_PAPERSIZE = 'a4'
-DVIPSFLAGS = env['DVIPSFLAGS']
-a = ('set -x; dvips %(DVIPSFLAGS)s' \
-     + ' -o ${TARGET}.pdfps'\
-     + ' -t %(DVIPS_PAPERSIZE)s $SOURCE &&'\
-     + ' ps2pdf -sPAPERSIZE=%(DVIPS_PAPERSIZE)s ${TARGET}.pdfps $TARGET') \
-     % vars ()
-dvi2pdf = Builder (action = a, suffix = '.pdf', src_suffix = '.dvi')
-env.Append (BUILDERS = {'Dvi2pdf': dvi2pdf})
-
-a = 'convert $SOURCE $TARGET'
-png2eps = Builder (action = a, suffix = '.eps', src_suffix = '.png')
-env.Append (BUILDERS = {'Png2eps': png2eps})
+    def dir (x):
+        if x and x[0] == '#':
+            return env['srcdir'] + x[1:]
+        return x
+    return string.join (map (lambda x: prefix + dir (x), path), infix)
+
+
+def src_glob (s):
+    here = os.getcwd ()
+    os.chdir (env.Dir ('.').srcnode ().abspath)
+    result = glob.glob (s)
+    os.chdir (here)
+    return result
+
+Export ('src_glob')
+
+def base_glob (s):
+    return map (lambda x: os.path.splitext (x)[0], src_glob (s))
+
+Export ('base_glob')
+
+def install (target, dir):
+    dest = env['DESTDIR'] + dir
+    if type (target) == type ([]):
+        map (lambda x: env.Install (dir, x), target)
+    else:
+        env.Install (dir, target)
+    env.Alias ('install', dir)
+
+Export ('install')
+
+def _fixme (s):
+    x = string.replace (s, '#', env['srcdir'])
+    x = string.replace (x, '@', env['absbuild'])
+    return x
+
+# Clean separation between generic action + flags and actual
+# configuration and flags in environment for this build.
+
+# Generic builders could/should be part of SCons.
+
+
+HH = Builder (action = 'bison -d -o ${TARGET.base}.cc $SOURCE',
+       suffix = '.hh', src_suffix = '.yy')
+env.Append (BUILDERS = {'HH' : HH})
+
+
+# Setup LilyPond environment.  For the LilyPond build, we override
+# some of these commands in the ENVironment.
+
+env.Append (
+    _fixme = _fixme,
+    ##ABC2LY = 'abc2ly',
+    ##LILYPOND = 'lilypond',
+    LILYOND_BOOK = 'lilypond-book',
+
+    #ugr
+    #LILYPOND_BOOK_FORMAT = 'texi',
+    LILYPOND_BOOK_FORMAT = '',
+    #LILYPOND_BOOK_FLAGS = ['--format=$LILYPOND_BOOK_FORMAT'],
+    LILYPOND_BOOK_FLAGS = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond --backend=eps --formats=ps,png --header=texidoc -I$srcdir/input/test -e '(ly:set-option (quote internal-type-checking) #t)'" ''',
+
+    LILYPOND_PATH = [],
+    # The SCons way around FOO_PATH:
+    ##LILYPOND_INCFLAGS = '$( ${_concat(INCPREFIX, LILYPOND_PATH, INCSUFFIX, __env__, RDirs)} $)',
+    LILYPOND_INCFLAGS = '$( ${_concat(INCPREFIX, LILYPOND_PATH, INCSUFFIX, __env__)} $)',
+
+    MAKEINFO_PATH = [],
+    MAKEINFO_FLAGS = [],
+    MAKEINFO_INCFLAGS = '$( ${_concat(INCPREFIX, MAKEINFO_PATH, INCSUFFIX, __env__, RDirs)} $)',
+    # should not be necessary
+    # PYTHONPATH = ['$absbuild/python/$out'],
+    TEXI2DVI_FLAGS = [],
+    _TEXI2DVI_FLAGS = '$( ${_concat(" ", TEXI2DVI_FLAGS,)} $)',
+    )
+
+TXT =\
+  Builder (action = '$MAKEINFO --output=$TARGET $MAKEINFO_INCFLAGS\
+  --no-split --no-headers $SOURCE',
+       suffix = '.txt', src_suffix = '.texi')
+env.Append (BUILDERS = {'TXT': TXT})
+
+INFO =\
+  Builder (action = '$MAKEINFO --output=$TARGET $MAKEINFO_INCFLAGS $SOURCE',
+       suffix = '.info', src_suffix = '.texi')
+env.Append (BUILDERS = {'INFO': INFO})
+
+HTML =\
+  Builder (action = '$MAKEINFO --output=$TARGET $MAKEINFO_INCLUDES\
+  --html --no-split --no-headers $MAKEINFO_FLAGS $SOURCE',
+suffix = '.html', src_suffix = '.texi')
+env.Append (BUILDERS = {'HTML': HTML})
+
+TEXI =\
+  Builder (action =
+       '$LILYPOND_BOOK --output=${TARGET.dir} \
+       --include=${TARGET.dir} $LILYPOND_INCFLAGS \
+       --process="$LILYPOND $LILYPOND_INCFLAGS" \
+       $LILYPOND_BOOK_FLAGS \
+       $SOURCE',
+       suffix = '.texi', src_suffix = '.tely')
+env.Append (BUILDERS = {'TEXI': TEXI})
+
+TEXIDVI =\
+    Builder (action = 'cd ${TARGET.dir} && \
+    texi2dvi --batch $_TEXI2DVI_FLAGS ${SOURCE.file}',
+        suffix = '.dvi', src_suffix = '.texi')
+env.Append (BUILDERS = {'TEXIDVI': TEXIDVI})
+
+DVIPS =\
+   Builder (action = 'TEXINPUTS=${TARGET.dir}:$$TEXINPUTS $DVIPS -o $TARGET $DVIPS_FLAGS $SOURCE',
+       suffix = '.ps', src_suffix = '.dvi')
+env.Append (BUILDERS = {'DVIPS': DVIPS})
+
+DVIPDF =\
+   Builder (action = 'TEXINPUTS=${TARGET.dir}:$$TEXINPUTS $DVIPS -o $TARGET -Ppdf $DVIPS_FLAGS $SOURCE',
+       suffix = '.pdfps', src_suffix = '.dvi')
+env.Append (BUILDERS = {'DVIPDF': DVIPDF})
+
+PSPDF =\
+   Builder (action = 'ps2pdf $PSPDF_FLAGS $SOURCE $TARGET',
+       suffix = '.pdf', src_suffix = '.pdfps')
+env.Append (BUILDERS = {'PSPDF': PSPDF})
+
+PNG2EPS =\
+    Builder (action = 'convert $SOURCE $TARGET',
+        suffix = '.eps', src_suffix = '.png')
+env.Append (BUILDERS = {'PNG2EPS': PNG2EPS})
+
+
+
+# FIXME: cleanup, see above
+
+
+env.Append (
+
+    #urg
+    BSTINPUTS = '${SOURCE.dir}:${TARGET.dir}:',
+    BIB2HTML = '$PYTHON $srcdir/buildscripts/bib2html.py',
+)
+
 
 def add_ps_target (target, source, env):
-	base = os.path.splitext (str (target[0]))[0]
-	return (target + [base + '.ps'], source)
-
-a = ('LILYPONDPREFIX=%(LILYPONDPREFIX)s '\
-     + PYTHON + ' ' + LILYPOND_PY + verbose_opt (env, ' --verbose')\
-     + ' --include=$$(dirname $TARGET)'\
-     + ' --output=$$(dirname $TARGET)'\
-     + ' $SOURCE') % vars ()
-lilypond = Builder (action = a, suffix = '.pdf', src_suffix = '.ly')
-##		    emitter = add_ps_target)
-env.Append (BUILDERS = {'LilyPond': lilypond})
+    base = os.path.splitext (str (target[0]))[0]
+    return (target + [base + '.ps'], source)
 
-verbose = verbose_opt (env, ' --verbose')
-a = ('LILYPONDPREFIX=%(LILYPONDPREFIX)s '\
-     + '%(PYTHON)s %(ABC2LY_PY)s%(verbose)s'\
-     + ' --include=$$(dirname $TARGET)'\
-     + ' --output=$$(dirname $TARGET)'\
-     + ' $SOURCE') % vars ()
-abc2ly = Builder (action = a, suffix = '.ly', src_suffix = '.abc')
-env.Append (BUILDERS = {'Abc2ly': abc2ly})
+lilypond =\
+    Builder (action = '$LILYPOND --output=${TARGET.base} --include=${TARGET.dir} $SOURCE',
+         suffix = '.pdf', src_suffix = '.ly')
+##                    emitter = add_ps_target)
+env.Append (BUILDERS = {'LilyPond': lilypond})
 
+ABC = Builder (action = '$ABC2LY --output=${TARGET} --strict $SOURCE',
+       suffix = '.ly', src_suffix = '.abc')
+env.Append (BUILDERS = {'ABC': ABC})
 
-MFMODE = env['MFMODE']
 def add_log_target (target, source, env):
-	base = os.path.splitext (str (target[0]))[0]
-	return (target + [base + '.log'], source)
+    base = os.path.splitext (str (target[0]))[0]
+    return (target + [base + '.log'], source)
 
-def add_enc_ly_tex_target (target, source, env):
-	base = os.path.splitext (str (target[0]))[0]
-	return (target + [base + '.enc', base + '.tex', base + 'list.ly'],
-		source)
+def add_tfm_target (target, source, env):
+    base = os.path.splitext (str (target[0]))[0]
+    return (target + [base + '.tfm'], source)
 
-def add_suffixes (target, source, env, target_suffixes, src_suffixes):
-	base = os.path.splitext (str (target[0]))[0]
-	return (target + map (lambda x: base + x, target_suffixes),
-		source + map (lambda x: base + x, src_suffixes))
-
-#outdir = os.path.join (env['build'], reldir, env['out'])
-outdir = '$$(dirname $TARGET)'
-scrdir = env['srcdir']
-#MFINPUTS = '.:' + str (Dir ('#/mf'))
-#MFINPUTS = '.:$$(dirname $SOURCE)'
-a = ('(cd $$(dirname $TARGET) &&'\
-#     + ' MFINPUTS=.:$$(dirname $SOURCE)'\
-     + ' MFINPUTS=.:$$(dirname $SOURCE):%(srcdir)s/$$(dirname $SOURCE)'\
-     + ' mf "\\mode:=%(MFMODE)s; nonstopmode;'\
-     + ' input $$(basename $SOURCE);" ' \
-     + ' | grep -v "@\|>>")') % vars ()
+def add_lisp_enc_tex_ly_target (target, source, env):
+    base = os.path.splitext (str (target[0]))[0]
+    return (target + [base + '.lisp', base + '.enc', base + '.tex',
+             base + 'list.ly'],
+        source)
+
+def add_cff_cffps_svg (target, source, env):
+    base = os.path.splitext (str (target[0]))[0]
+    return (target + [base + '.cff', base + '.cff.ps', base + '.svg'],
+        source)
+
+a = 'cd ${TARGET.dir} \
+&& MFINPUTS=.:${SOURCE.dir}:$srcdir/${SOURCE.dir}: \
+$MF "\\mode:=$MFMODE; nonstopmode; input ${SOURCE.filebase};" \
+| grep -v "@\|>>\|w:\|h:";'
 tfm = Builder (action = a, suffix = '.tfm', src_suffix = '.mf',
-#	       emitter = lambda t, s, e: add_suffixes (t, s, e, ['.log'], []))
-	       emitter = add_log_target)
+#               emitter = lambda t, s, e: add_suffixes (t, s, e, ['.log'], []))
+       emitter = add_log_target)
 env.Append (BUILDERS = {'TFM': tfm})
 
-MF_TO_TABLE_PY = env['MF_TO_TABLE_PY']
-verbose = verbose_opt (env, ' --verbose')
-a = ('%(PYTHON)s %(MF_TO_TABLE_PY)s%(verbose)s'\
-     + ' --outdir=$$(dirname $TARGET)'\
-     + ' --afm=%(outdir)s/$$(basename $TARGET .afm).afm' \
-     + ' --enc=%(outdir)s/$$(basename $TARGET .afm).enc' \
-     + ' --tex=%(outdir)s/$$(basename $TARGET .afm).tex' \
-     + ' --ly=%(outdir)s/$$(basename $TARGET .afm)list.ly'\
-     + ' $$(dirname $TARGET)/$$(basename $SOURCE)') % vars ()
-afm = Builder (action = a, suffix = '.afm', src_suffix = '.log',
-	       emitter = add_enc_ly_tex_target)
-env.Append (BUILDERS = {'AFM': afm})
+a = '$PYTHON $MF_TO_TABLE_PY \
+--outdir=${TARGET.dir} \
+--global-lisp=${TARGET.base}.otf-gtable \
+--lisp=${TARGET.base}.lisp \
+--enc=${TARGET.base}.enc \
+--tex=${TARGET.base}.tex \
+${TARGET.base}.log'
+#--ly=${TARGET.base}list.ly \
+gtable = Builder (action = a, suffix = '.otf-gtable', src_suffix = '.log',
+         emitter = add_lisp_enc_tex_ly_target)
+env.Append (BUILDERS = {'GTABLE': gtable})
 
 def add_enc_src (target, source, env):
-	base = os.path.splitext (str (target[0]))[0]
-	return (target, source + [base + '.enc'])
-
-def encoding_opt (target):
-	base = os.path.splitext (os.path.basename (str (target[0])))[0]
-	enc = base + '.enc'
-	if os.path.exists (os.path.join (outdir, enc)):
-		return ' --encoding=' + enc
-	return ''
-
-# UGH, should fix --output option for mftrace
-xpfa = Builder (action = ('MFINPUTS=.:' + str (Dir ('#/mf')) \
-			 + ' mftrace -I %(outdir)s --pfa' \
-			 + ' --simplify --keep-trying' \
-			 + ' $$(basename $SOURCE .mf) ' \
-			 + ' && mv $$(basename $TARGET) $TARGET') % vars (),
-	       suffix = '.pfa',
-	       src_suffix = '.mf',
-	       emitter = add_enc_src)
-
-verbose = verbose_opt (env, ' --verbose')
-def run_mftrace (target, source, env):
-	TARGET = target[0]
-	SOURCE = source[0]
-	mf = os.path.basename (str (source[0]))
-	base = os.path.splitext (os.path.basename (str (target[0])))[0]
-	enc = base + '.enc'
-	mfdir = os.path.join (here, reldir)
-	outdir = os.path.join (env['build'], reldir, env['out'])
-	encoding = encoding_opt (target)
-	command = ('(cd $$(dirname $TARGET) && '
-		   + ' MFINPUTS=.:$$(dirname $TARGET):' + mfdir\
-		   + ' mftrace --pfa --simplify --keep-trying %(verbose)s' \
-		   + ' --include=$$(dirname $TARGET)'\
-		   + ' %(encoding)s %(mf)s)') % vars ()
-	return os.system (command)
-
-pfa = Builder (action = run_mftrace, suffix = '.pfa', src_suffix = '.mf',
-	       emitter = add_enc_src)
+    base = os.path.splitext (str (target[0]))[0]
+    return (target, source + [base + '.enc'])
+
+# FIXME UGH, should fix --output option for mftrace
+a = 'cd ${TARGET.dir} && \
+if test -e ${SOURCE.filebase}.enc; then encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
+MFINPUTS=$srcdir/mf:.: \
+$MFTRACE --formats=pfa --simplify --keep-trying --no-afm \
+$$encoding $__verbose \
+--include=${TARGET.dir} \
+${SOURCE.file}'
+
+pfa = Builder (action = a,
+       suffix = '.pfa',
+       src_suffix = '.mf',
+       emitter = add_enc_src)
 env.Append (BUILDERS = {'PFA': pfa})
 
+a = ['(cd ${TARGET.dir} && $FONTFORGE -script ${SOURCE.file})',
+#     '$PYTHON $srcdir/buildscripts/ps-embed-cff.py ${SOURCE.base}.cff $$(cat ${SOURCE.base}.fontname) ${SOURCE.base}.cff.ps',
+  'rm -f ${TARGET.dir}/*.scale.pfa']
+otf = Builder (action = a,
+       suffix = '.otf',
+       src_suffix = '.pe',
+#               emitter = add_cff_cffps_svg
+       )
+env.Append (BUILDERS = {'OTF': otf})
+
+
+# Specific builders
+
+env['DIFF_PY'] = '$srcdir/stepmake/bin/package-diff.py'
+a = '$PYTHON $DIFF_PY $NO__verbose --outdir=${TARGET.dir}'
+patch = Builder (action = a, suffix = '.diff', src_suffix = '.tar.gz')
+env.Append (BUILDERS = {'PATCH': patch})
+
+atvars = [
+'BASH',
+'DATE',
+'sharedstatedir',
+'GUILE',
+'bindir',
+'date',
+'datadir',
+'lilypond_datadir',
+'lilypond_libdir',
+'local_lilypond_datadir',
+'local_lilypond_libdir',
+'localedir',
+'PACKAGE',
+'package',
+'PATHSEP',
+'PERL',
+'prefix',
+'program_prefix',
+'program_suffix',
+'PYTHON',
+'SHELL',
+'TOPLEVEL_VERSION',
+'step-bindir',
+]
+
+# naming
+def at_copy (target, source, env):
+  n = str (source[0])
+  s = open (n).read ()
+  for i in atvars:
+      if env.has_key (i):
+          s = string.replace (s, '@%s@'% i, env[i])
+  t = str (target[0])
+  open (t, 'w').write (s)
+  # wugh
+  if os.path.basename (os.path.dirname (str (target[0]))) == 'bin':
+      os.chmod (t, 0755)
+
+AT_COPY = Builder (action = at_copy, src_suffix = ['.in', '.py', '.sh',])
+env.Append (BUILDERS = {'AT_COPY': AT_COPY})
+
+# naming
+def at_copy_ext (target, source, env):
+  n = str (source[0])
+  s = open (n).read ()
+  for i in atvars:
+      if env.has_key (i):
+          s = string.replace (s, '@%s@'% i, env[i])
+  # whugh
+  e = os.path.splitext (n)[1]
+  t = str (target[0]) + e
+  open (t, 'w').write (s)
+
+AT_COPY_EXT = Builder (action = at_copy_ext, src_suffix = ['.py', '.sh',])
+env.Append (BUILDERS = {'AT_COPY_EXT': AT_COPY_EXT})
+
+
+MO = Builder (action = 'msgfmt -o $TARGET $SOURCE',
+       suffix = '.mo', src_suffix = '.po')
+env.Append (BUILDERS = {'MO': MO})
+
+# ' '; ?
+ugh =  'ln -f po/lilypond.pot ${TARGET.dir}/lilypond.po ; '
+a = ugh + 'xgettext --default-domain=lilypond --join \
+--output-dir=${TARGET.dir} --add-comments \
+--keyword=_ --keyword=_f --keyword=_i $SOURCES'
+PO = Builder (action = a, suffix = '.pot',
+       src_suffix = ['.cc', '.hh', '.py'], multi = 1)
+env['potarget'] = os.path.join (env['absbuild'], 'po', env['out'],
+                'lilypond.pot')
+env['pocommand'] = a
+
+ugh = '; mv ${TARGET} ${SOURCE}'
+a = 'msgmerge ${SOURCE} ${SOURCE.dir}/lilypond.pot -o ${TARGET}' + ugh
+POMERGE = Builder (action = a, suffix = '.pom', src_suffix = '.po')
+env.Append (BUILDERS = {'POMERGE': POMERGE})
+
+#UGRr
+a = 'BSTINPUTS=$BSTINPUTS $BIB2HTML -o $TARGET $SOURCE'
+BIB2HTML = Builder (action = a, suffix = '.html', src_suffix = '.bib')
+env.Append (BUILDERS = {'BIB2HTML': BIB2HTML})
+
+a = '$PYTHON $srcdir/buildscripts/lys-to-tely.py \
+--name=${TARGET.base} --title="$TITLE" $SOURCES'
+LYS2TELY = Builder (action = a, suffix = '.tely', src_suffix = '.ly')
+env.Append (BUILDERS = {'LYS2TELY': LYS2TELY})
+
+
+def mutopia (ly = None, abc = None):
+
+    # FIXME: ugr, huh?  The values from ../SConstruct get appended
+    # to the predefined values from this builder context:
+
+    # abc2ly/usr/bin/python ..../abc2.py
+
+    # Override them again to fix web build...
+
+    
+    #BUILD_ABC2LY = '${set__x}$PYTHON $srcdir/scripts/abc2ly.py'
+    #BUILD_LILYPOND = '$absbuild/$out/lilypond ${__verbose}'
+    e = env.Copy (
+        #LILYPOND = BUILD_LILYPOND,
+        #ABC2LY = BUILD_ABC2LY,
+    )
+    
+    if not abc:
+        abc = base_glob ('*.abc')
+    if not ly:
+        ly = base_glob ('*.ly') + map (e.ABC, abc)
+    pdf = map (e.LilyPond, ly)
+    
+    # We need lily and mf to build these.
+    env.Depends (pdf, ['#/lily', '#/mf'])
+    env.Alias ('doc', pdf)
+
+Export ('mutopia')
+
+
+def collate (title = 'collated files'):
+    ly = base_glob ('*.ly')
+    
+    e = env.Copy (
+        TITLE = title,
+        LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I$srcdir/input/test -e '(ly:set-option (quote internal-type-checking) #t)'" ''',
+                                                                   __verbose = ' --verbose',
+                                                                   )
+    #
+    tely = e.LYS2TELY ('collated-files', ly)
+    texi = e.TEXI (tely)
+    # We need lily and mf to build these.
+    env.Depends (texi, ['#/lily', '#/mf'])
+    dvi = e.TEXIDVI (texi)
+    pspdf = e.DVIPDF (dvi)
+    pdf = e.PSPDF (pspdf)
+    html = e.HTML (texi)
+
+    env.Alias ('doc', pdf)
+    env.Alias ('doc', html)
+
+Export ('collate')
 
+Export ('env')