X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=5adfcb3058df19280ddf37615907e6120a6253ad;hb=5398c1592834132478e75ec17c2806e36b7a98fb;hp=c516e90c4a537a0b4ef59a599d6e8f9882e45c2e;hpb=d0049e0d0bfecef46ad3f1ca4a7d68dab13321fd;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index c516e90c4a..5adfcb3058 100644
--- a/SConstruct
+++ b/SConstruct
@@ -38,7 +38,7 @@ Other targets
     scons /                    # build *everything* (including installation)
 
 Options  (see scons -h)
-    scons build=DIR            # clean scrdir build, output below DIR
+    scons build=DIR            # clean srcdir build, output below DIR
     scons out=DIR              # write output for alterative config to DIR
 
 Debugging
@@ -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
 
 '''
       
@@ -118,6 +112,7 @@ opts = Options ([config_cache, 'custom.py'], ARGUMENTS)
 opts.Add ('prefix', 'Install prefix', '/usr/')
 opts.Add ('out', 'Output directory', 'out-scons')
 opts.Add ('build', 'Build directory', '.')
+opts.Add ('DESTDIR', 'DESTDIR prepended to prefix', '')
 opts.AddOptions (
 	BoolOption ('warnings', 'compile with -Wall and similiar',
 		   1),
@@ -134,11 +129,12 @@ 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),
 	)
 
 srcdir = Dir ('.').srcnode ().abspath
-
 #ugh
 sys.path.append (os.path.join (srcdir, 'stepmake', 'bin'))
 import packagepython
@@ -152,18 +148,13 @@ for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH']:
 
 env = Environment (
 	ENV = ENV,
-	
+
 	BASH = '/bin/bash',
 	PERL = '/usr/bin/perl',
 	PYTHON = '/usr/bin/python',
 	SH = '/bin/sh',
 
 	MAKEINFO = 'LANG= makeinfo',
-	ABC2LY_PY = srcdir + '/scripts/abc2ly.py',
-	LILYPOND_BOOK = srcdir + '/scripts/lilypond-book.py',
-	LILYPOND_BOOK_FLAGS = '',
-	LILYPOND_BOOK_FORMAT = 'texi-html',
-	LILYPOND_PY = srcdir + '/scripts/lilypond.py',
 	MF_TO_TABLE_PY = srcdir + '/buildscripts/mf-to-table.py',
 	
 	PKG_CONFIG_PATH = [os.path.join (os.environ['HOME'],
@@ -172,7 +163,6 @@ env = Environment (
 					 'usr/pkg/pango/lib')],
 	GZIP='-9v',
 	MFMODE = 'ljfour',
-	TEXINFO_PAPERSIZE_OPTION = '-t @afourpaper',
 	TOPLEVEL_VERSION = version,
 	)
 
@@ -184,116 +174,65 @@ 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")
+	# 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'])
 run_prefix = os.path.join (absbuild, os.path.join (env['out'], 'usr'))
 
+
+config_hh = os.path.join (outdir, 'config.hh')
+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'))
 
-if env['debugging']:
-	# No need to set $LILYPONDPREFIX to run lily, but cannot install...
+# No need to set $LILYPONDPREFIX to run lily, but cannot install...
+if env['debugging'] and not 'install' in COMMAND_LINE_TARGETS:
 	env['prefix'] = run_prefix
-	
+
 prefix = env['prefix']
 bindir = os.path.join (prefix, 'bin')
 sharedir = os.path.join (prefix, 'share')
 libdir = os.path.join (prefix, 'lib')
 localedir = os.path.join (sharedir, 'locale')
+sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
 sharedir_package = os.path.join (sharedir, package.name)
 sharedir_package_version = os.path.join (sharedir_package, version)
 lilypondprefix = sharedir_package_version
 
-# post-option environment-update
+# junkme
 env.Append (
+	absbuild = absbuild,
 	srcdir = srcdir,
-	
-	bindir = bindir,
-	sharedir = sharedir,
-	lilypond_datadir = sharedir_package,
-	localedir = localedir,
-	local_lilypond_datadir = sharedir_package_version,
-	lilypondprefix = lilypondprefix,
-	sharedir_package = sharedir_package,
-	sharedir_package_version = sharedir_package_version,
 	)
 
-if env['debugging']:
-	env.Append (CCFLAGS = ['-g', '-pipe'])
-if env['optimising']:
-	env.Append (CCFLAGS = '-O2')
-	env.Append (CXXFLAGS = ['-DSTRING_UTILS_INLINED'])
-if env['warnings']:
-	env.Append (CCFLAGS = ['-W', '-Wall'])
-	env.Append (CXXFLAGS = ['-Wconversion'])
-
-# ugr,huh?
-env.Append (LINKFLAGS = ['-Wl,--export-dynamic'])
-
-if env['verbose']:
-	env['__verbose'] = ' --verbose'
-	env['set__x'] = 'set -x;'
-
-config_hh = os.path.join (outdir, 'config.hh')
-version_hh = os.path.join (outdir, 'version.hh')
-
-env.Alias ('config', config_cache)
-
-
-## Explicit target and dependencies
-
-if 'clean' in COMMAND_LINE_TARGETS:
-	# ugh: prevent reconfigure instead of clean
-	os.system ('touch %s' % config_cache)
-	
-	command = sys.argv[0] + ' -c .'
-	sys.stdout.write ('Running %s ... ' % command)
-	sys.stdout.write ('\n')
-	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)
-	sys.stdout.write ('\n')
-	s = os.system (command)
-	if os.path.exists (config_cache):
-		os.unlink (config_cache)
-	Exit (s)
-
-# Declare SConscript phonies 
-env.Alias ('minimal', config_cache)
-env.Alias ('mf-essential', config_cache)
-
-env.Alias ('minimal', ['lily', 'mf-essential'])
-env.Alias ('all', ['minimal', 'mf', '.'])
-# Do we want the doc/web separation?
-env.Alias ('doc',
-	   ['Documentation',
-	    'Documentation/user',
-	    'Documentation/topdocs',
-	    'Documentation/bibliography',
-	    'input'])
-
-# Without target arguments, do minimal build
-if not COMMAND_LINE_TARGETS:
-	env.Default (['minimal'])
-
-# GNU Make rerouting compat:
-env.Alias ('web', 'doc')
 
 def list_sort (lst):
 	sorted = lst
 	sorted.sort ()
 	return sorted
 
+
 def configure (target, source, env):
 	vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$', re.DOTALL)
 	def get_version (program):
@@ -386,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:
@@ -421,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')
 
@@ -436,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<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 '********************************'
@@ -528,38 +481,148 @@ elif env['checksums']:
 	# just save everything
 	save_config_cache (env)
 
+#urg how does #/ subst work?
+Export ('env')
+SConscript ('buildscripts/builder.py')
+
+env.PrependENVPath ('PATH',
+		    os.path.join (env['absbuild'], env['out'], 'usr/bin'))
+
+if os.environ.has_key ('TEXMF'):
+	env.Append (ENV = {'TEXMF' : os.environ['TEXMF']})
+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}'
+BUILD_LILYPOND_BIN = '$absbuild/$out/lilypond-bin ${__verbose}'
+BUILD_LILYPOND_BOOK = '$PYTHON $srcdir/scripts/lilypond-book.py --verbose'
+
+
+# post-option environment-update
+env.Append (
+	bindir = bindir,
+	sharedir = sharedir,
+	lilypond_datadir = sharedir_package,
+	localedir = localedir,
+	local_lilypond_datadir = sharedir_package_version,
+	lilypondprefix = lilypondprefix,
+	sharedir_package = sharedir_package,
+	sharedir_doc_package = sharedir_doc_package,
+	sharedir_package_version = sharedir_package_version,
+
+	LILYPOND = BUILD_LILYPOND,
+	ABC2LY = BUILD_ABC2LY,
+	LILYPOND_BOOK = BUILD_LILYPOND_BOOK,
+	LILYPOND_BOOK_FORMAT = 'texi-html',
+	MAKEINFO_FLAGS = '--css-include=$srcdir/Documentation/texinfo.css',
+
+	TEXI2DVI_PAPERSIZE = '@afourpaper',
+	TEXI2DVI_FLAGS = [ '-t $TEXI2DVI_PAPERSIZE'],
+	DVIPS_PAPERSIZE = 'a4',
+	DVIPS_FLAGS = ['-t $DVIPS_PAPERSIZE',
+		       '-u+lilypond.map',
+		       '-u+ec-mftrace.map'],
+	PSPDF_FLAGS = ['-sPAPERSIZE=$DVIPS_PAPERSIZE'],
+	)
+
+if env['debugging']:
+	env.Append (CCFLAGS = ['-g', '-pipe'])
+if env['optimising']:
+	env.Append (CCFLAGS = '-O2')
+	env.Append (CXXFLAGS = ['-DSTRING_UTILS_INLINED'])
+if env['warnings']:
+	env.Append (CCFLAGS = ['-W', '-Wall'])
+	env.Append (CXXFLAGS = ['-Wconversion'])
+
+# ugr,huh?
+env.Append (LINKFLAGS = ['-Wl,--export-dynamic'])
+
+if env['verbose']:
+	env['__verbose'] = ' --verbose'
+	env['set__x'] = 'set -x;'
+
+
+## Explicit target and dependencies
+
+if 'clean' in COMMAND_LINE_TARGETS:
+	# ugh: prevent reconfigure instead of clean
+	os.system ('touch %s' % config_cache)
+	
+	command = sys.argv[0] + ' -c .'
+	sys.stdout.write ('Running %s ... ' % command)
+	sys.stdout.write ('\n')
+	s = os.system (command)
+	if os.path.exists (config_cache):
+		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)
+	sys.stdout.write ('\n')
+	s = os.system (command)
+	if os.path.exists (config_cache):
+		os.unlink (config_cache)
+	Exit (s)
+
+# Declare SConscript phonies 
+env.Alias ('minimal', config_cache)
+env.Alias ('mf-essential', config_cache)
+
+env.Alias ('minimal', ['lily', 'mf-essential'])
+env.Alias ('all', ['minimal', 'mf', '.'])
+# Do we want the doc/web separation?
+env.Alias ('doc',
+	   ['Documentation',
+	    'Documentation/user',
+	    'Documentation/topdocs',
+	    'Documentation/bibliography',
+	    'input'])
+
+# Without target arguments, do minimal build
+if not COMMAND_LINE_TARGETS:
+	env.Default (['minimal'])
+
+# GNU Make rerouting compat:
+env.Alias ('web', 'doc')
+
+
 env.Command (version_hh, '#/VERSION',
 	     '$PYTHON ./stepmake/bin/make-version.py VERSION > $TARGET')
 
 # post-config environment update
 env.Append (
-	absbuild = absbuild,
 	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
 	CPPPATH = [outdir, ],
-	LILYPOND_BIN = os.path.join (absbuild, 'lily', env['out'],
-				     'lilypond-bin'),
-	LILYPOND_BOOK_PATH = ['.', '#/input', '#/input/regression',
-			      '#/input/test', '#/input/tutorial',
-			      os.path.join (absbuild, 'mf', env['out']),
-			      '#/Documentation/user',
-			      os.path.join (absbuild, 'Documentation',
-					    env['out']),
-			      os.path.join (absbuild, 'Documentation/user',
-					    env['out']),
-			      ],
-	MAKEINFO_PATH = ['.', '#/Documentation/user',
-			 os.path.join (absbuild, 'Documentation/user',
-				       env['out'])],
+	LILYPOND_PATH = ['.', '$srcdir/input',
+			 '$srcdir/input/regression',
+			 '$srcdir/input/test',
+			 '$srcdir/input/tutorial',
+			 '$srcdir/Documentation/user',
+			 '$absbuild/mf/$out',
+#			 os.path.join (absbuild, 'Documentation',
+#				       env['out']),
+#			 os.path.join (absbuild, 'Documentation/user',
+#				       env['out']),
+			 ],
+	MAKEINFO_PATH = ['.', '$srcdir/Documentation/user',
+			 '$absbuild/Documentation/user/$out'],
 	)
 
-Export ('env')
-SConscript ('buildscripts/builder.py')
-
-
 def symlink_tree (target, source, env):
 	def mkdirs (dir):
 		def mkdir (dir):
@@ -660,70 +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 = os.path.join (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
-
-# compatible make heritits
-# fixme: generate in $outdir is cwd/builddir
-env.Command (web_ball, 'doc',
-	     ['$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 \
-	      > $out/weblist',
-	      '''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''',
-	      # UGHR?  all .html cruft in cwd goes into the web ball?
-	      'cd $absbuild && ls *.html >> $out/weblist',
-	      'cat $out/weblist | (cd $absbuild; \
-	      GZIP=-9v tar -czf ${TARGET.file}  -T -)',])
-env.Alias ('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 '<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