X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=6246d5268ef9cdb61336fdb5db4ff3c14d808d64;hb=dbf55d6ee960e31cd339e25d7d75439279be503f;hp=539a03cf7dfc81fc9e22be0c9c30c26f24364a49;hpb=1a16035eb63fca3df67718042a446e6546507ce9;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index 539a03cf7d..6246d5268e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,32 +1,52 @@
 # -*-python-*-
 
 '''
-Experimental scons (www.scons.org) building:
+Experimental scons (www.scons.org) building.
 
-scons TARGET builds from source directory ./TARGET (not recursive)
+Usage
 
+    scons TARGET
 
-Usage:
-    scons
-    scons lily            # build lily
+build from source directory ./TARGET (not recursive)
 
-    LILYPONDPREFIX=out-scons/usr/share/lilypond lily/out-scons/lilypond-bin
-    scons doc             # build web doc
+Configure, build
 
-?    scons fonts           # build all font stuff (split this? )
+    scons [config]             # configure
+    scons                      # build all
 
-    scons config          # reconfigure
+Run from build tree
 
-    scons /               # builds all possible targets
+    run=$(pwd)/out-scons/usr
+    export LOCALE=$run/share/locale
+    export TEXMF='{'$run/share/lilypond,$(kpsexpand '$TEXMF')'}'
+    PATH=$run/bin:$PATH
 
-    scons install
-    scons -c              # clean
-    scons -h              # help
+    #optionally, if you do not use custom.py below
+    #export LILYPONDPREFIX=$run/share/lilypond
 
-    scons build=DIR       # scrdir build, write to new tree =build
-    scons out=DIR         # write output to deeper dir DIR
+    lilypond-bin input/simple
 
-Optionally, make a custom.py.  I have
+Other targets
+    scons mf-essential         # build minimal mf stuff
+
+    scons doc                  # build web doc
+    scons config               # reconfigure
+    scons install              # install
+    scons -c                   # clean
+    scons -h                   # help
+
+    scons /                    # build *everything* (including installation)
+
+Options  (see scons -h)
+    scons build=DIR            # clean srcdir build, output below DIR
+    scons out=DIR              # write output for alterative config to DIR
+
+Debugging
+    scons --debug=dtree
+    scons --debug=explain
+    scons verbose=1
+
+Optional custom.py
 
 import os
 out='out-scons'
@@ -40,18 +60,16 @@ prefix=os.path.join (os.environ['HOME'], 'usr', 'pkg', 'lilypond')
 
 
 # TODO:
-#   * add missing dirs
-#   * cleanup
+#  * usability
+
+#  * more program configure tests (mfont, ...?)
 
-#   * separate environments?
-#     - compile environment checks headers and libraries
-#     - doc environment checks doc stuff
+#  * install doc
+
+#  * split doc target: doc input examples mutopia?
+
+#  * grep FIXME $(find . -name 'S*t')
 
-#   * commandline targets:
-#      - clean => -c ?
-#   * more fine-grained config.h -- move lilypondprefix to version.hh?
-#     - config.h:   changes after system upgrades, affects all files
-#     - version.hh:  prefix, version etc?  affects few
 
 import re
 import glob
@@ -61,48 +79,40 @@ import sys
 import stat
 import shutil
 
-# faster but scary: when changing #includes, do scons --implicit-deps-changed
-# SetOption ('implicit_cache', 1)
-
-# SConscripts are only needed in directories where something needs
-# to be done, building or installing
-# TODO: Documentation/*, input/*/*, vim, po
-# rename Documentation/* to ./doc?
-
-# somethin's broken wrt config.h checksums?
-FOOSUMS = 1
-
-subdirs = ['flower', 'lily', 'mf', 'scm', 'ly', 'Documentation',
-	   'Documentation/user', 'Documentation/topdocs',
-	   'input', 'scripts', 'elisp',
-	   'buildscripts', 'cygwin', 'debian']
+# duh, we need 0.95.1
+EnsureSConsVersion (0, 95)
 
 usage = r'''Usage:
-scons [KEY=VALUE].. [TARGET]..
+scons [KEY=VALUE].. [TARGET|DIR]..
+
+TARGETS: clean, config, doc, dist, install, mf-essential, po-update,
+         realclean, release, sconsclean, tar, TAGS
 
-where TARGET is config|lily|all|fonts|doc|tar|dist|release
 '''
       
 
-config_cache = 'config.cache'
+config_cache = 'scons.cache'
 
-config_vars = (
+config_vars = [
 	'BASH',
-	'CFLAGS',
+	'CCFLAGS',
 	'CPPPATH',
+	'CPPDEFINES',
 	'CXXFLAGS',
 	'DEFINES',
 	'LIBS',
+	'LINKFLAGS',
 	'METAFONT',
 	'PERL',
 	'PYTHON',
-	)
+	]
 
 # Put your favourite stuff in custom.py
 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),
@@ -119,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
@@ -132,126 +143,97 @@ version = packagepython.version_tuple_to_str (package.version)
 
 ENV = { 'PATH' : os.environ['PATH'] }
 for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH']:
-    	if os.environ.has_key(key):
+    	if os.environ.has_key (key):
         	ENV[key] = os.environ[key]
 
 env = Environment (
 	ENV = ENV,
 
 	BASH = '/bin/bash',
-	MAKEINFO = 'LANG= makeinfo',
+	CPPDEFINES = '-DHAVE_CONFIG_H',
 	PERL = '/usr/bin/perl',
 	PYTHON = '/usr/bin/python',
 	SH = '/bin/sh',
-	
-	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',
+
+	MAKEINFO = 'LANG= makeinfo',
 	MF_TO_TABLE_PY = srcdir + '/buildscripts/mf-to-table.py',
 	
 	PKG_CONFIG_PATH = [os.path.join (os.environ['HOME'],
 					 'usr/pkg/gnome/lib'),
 			   os.path.join (os.environ['HOME'],
 					 'usr/pkg/pango/lib')],
+	GZIP='-9v',
 	MFMODE = 'ljfour',
-	TEXINFO_PAPERSIZE_OPTION = '-t @afourpaper',
 	TOPLEVEL_VERSION = version,
 	)
 
+# 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)
+
 Help (usage + opts.GenerateHelpText (env))
 
-map (lambda x: opts.AddOptions ((x,)), config_vars)
 opts.Update (env)
 
-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)
+	# 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 (cachedir)
+
+# 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,
-	local_lilypond_datadir = sharedir_package_version,
-	lilypondprefix = lilypondprefix,
-	sharedir_package = sharedir_package,
-	sharedir_package_version = sharedir_package_version,
 	)
 
-env.CacheDir (os.path.join (env['build'], '=build-cache'))
-
-if env['debugging']:
-	env.Append (CFLAGS = '-g')
-	env.Append (CXXFLAGS = '-g')
-if env['optimising']:
-	env.Append (CFLAGS = '-O2')
-	env.Append (CXXFLAGS = '-O2')
-	env.Append (CXXFLAGS = '-DSTRING_UTILS_INLINED')
-if env['warnings']:
-	env.Append (CFLAGS = '-W ')
-	env.Append (CFLAGS = '-Wall')
-	# what about = ['-W', '-Wall', ...]?
-	env.Append (CXXFLAGS = '-W')
-	env.Append (CXXFLAGS = '-Wall')
-	env.Append (CXXFLAGS = '-Wconversion')
-if env['verbose']:
-	env['__verbose'] = '--verbose'
-
-# Hmm
-#env.Append (ENV = {'PKG_CONFIG_PATH' : string.join (env['PKG_CONFIG_PATH'],
-#						    os.pathsep),
-#		   'LD_LIBRARY_PATH' : string.join (env['LD_LIBRARY_PATH'],
-#						    os.pathsep),
-#		   'GUILE_LOAD_PATH' : string.join (env['GUILE_LOAD_PATH'],
-#						    os.pathsep), })
-
-outdir = os.path.join (Dir (env['build']).abspath, env['out'])
-
-# This is interesting, version.hh is generated automagically, just in
-# time.  Is this a .h /.hh issue?  It seems to be, using config.hh (in
-# flower/file-name.cc) works.  Bug report to SCons or rename to
-# config.hh or both?
-# config_h = os.path.join (outdir, 'config.hh')
-config_h = os.path.join (outdir, 'config.h')
-version_h = os.path.join (outdir, 'version.hh')
-
-env.Alias ('config', config_cache)
-
-
-## Explicit dependencies
-
-# Without target arguments, build lily only
-if not COMMAND_LINE_TARGETS:
-	env.Default ('lily')
-env.Alias ('all', '.')
-env.Alias ('doc',
-	   ['Documentation',
-	    'Documentation/user',
-	    'Documentation/topdocs'])
-
-env.Depends (['lily', 'flower', 'all', '.'], config_h)
-env.Depends ('doc', ['lily', 'mf'])
-env.Depends ('input', ['lily', 'mf'])
-env.Depends ('doc', ['lily', 'mf'])
-
 
 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):
@@ -277,6 +259,19 @@ def configure (target, source, env):
 			lst.append ((description, package, minimal, program,
 				     string.join (actual, '.')))
 
+	for i in ['bash', 'perl', 'python', 'sh']:
+		sys.stdout.write ('Checking for %s... ' % i)
+		c = WhereIs (i)
+		key = string.upper (i)
+		if c:
+			env[key] = c
+			sys.stdout.write (c)
+		else:
+			sys.stdout.write ('not found: %s (using: %s)' \
+					  % (c, env[key]))
+			# Hmm? abort?
+		sys.stdout.write ('\n')
+
 	required = []
 	test_program (required, 'gcc', '2.8', 'GNU C compiler', 'gcc')
 	test_program (required, 'g++', '3.0.5', 'GNU C++ compiler', 'g++')
@@ -318,8 +313,8 @@ def configure (target, source, env):
 						: CheckYYCurrentBuffer })
 
 	defines = {
-	   'DIRSEP' : "'/'",
-	   'PATHSEP' : "':'",
+	   'DIRSEP' : "'%s'" % os.sep,
+	   'PATHSEP' : "'%s'" % os.pathsep,
 	   'TOPLEVEL_VERSION' : '"' + version + '"',
 	   'PACKAGE': '"' + package.name + '"',
 	   'DATADIR' : '"' + sharedir + '"',
@@ -331,9 +326,13 @@ 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')
+	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))
@@ -345,7 +344,8 @@ def configure (target, source, env):
 			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))
@@ -366,9 +366,29 @@ def configure (target, source, env):
 	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')
 
+	## FIXME: pkg-test to required/optional
+	if os.system ('pkg-config --atleast-version=1.6.0 pango'):
+		barf
+	env.ParseConfig ('pkg-config --cflags --libs pango')
+	conf.env['DEFINES']['HAVE_PANGO16'] = '1'
+	
+	if os.system ('pkg-config --atleast-version=1.6.0 pangoft2'):
+		barf
+	env.ParseConfig ('pkg-config --cflags --libs pangoft2')
+	conf.env['DEFINES']['HAVE_PANGO_FT2'] = '1'
+	
 	#this could happen only for compiling pango-*
 	if env['gui']:
 		env.ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
@@ -381,13 +401,20 @@ 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 '********************************'
 		print 'Please install required packages'
 		for i in required:
 			print '%s:	%s-%s or newer (found: %s %s)' % i
-		sys.exit (1)
+		Exit (1)
 
 	if optional:
 		print
@@ -403,26 +430,7 @@ def config_header (target, source, env):
 	for i in list_sort (env['DEFINES'].keys ()):
 		config.write ('#define %s %s\n' % (i, env['DEFINES'][i]))
 	config.close ()
-
-if os.path.exists (config_cache) and 'config' in COMMAND_LINE_TARGETS:
-	os.unlink (config_cache)
-# WTF?
-# scons: *** Calling Configure from Builders is not supported.
-# env.Command (config_cache, None, configure)
-if not os.path.exists (config_cache) \
-   or (os.stat ('SConstruct')[stat.ST_MTIME]
-       > os.stat (config_cache)[stat.ST_MTIME]):
-	env = configure (None, None, env)
-
-	# We 'should' save opts each time, but that makes config.h
-	# always out of date, and that triggers recompiles, even when
-	# using checksums?
-	if FOOSUMS: #not env['checksums']:
-		## FIXME: Is this smart, using option cache for saving
-		## config.cache?  I cannot seem to find the official method.
-		map (lambda x: opts.AddOptions ((x,)), config_vars)
-		opts.Save (config_cache, env)
-		env.Command (config_h, config_cache, config_header)
+env.Command (config_hh, config_cache, config_header)
 
 # hmm?
 def xuniquify (lst):
@@ -446,52 +454,197 @@ def uniquify (lst):
 			n -= 1
 	return lst
 
-for i in config_vars:
-	if env.has_key (i) and type (env[i]) == type ([]):
-		env[i] = uniquify (env[i])
+def uniquify_config_vars (env):
+	for i in config_vars:
+		if env.has_key (i) and type (env[i]) == type ([]):
+			env[i] = uniquify (env[i])
 
-if not FOOSUMS: #env['checksums']:
+def save_config_cache (env):
 	## FIXME: Is this smart, using option cache for saving
 	## config.cache?  I cannot seem to find the official method.
-	map (lambda x: opts.AddOptions ((x,)), config_vars)
-	
+	uniquify_config_vars (env)
 	opts.Save (config_cache, env)
-	env.Command (config_h, config_cache, config_header)
 
-env.Command (version_h, '#/VERSION',
-	     '$PYTHON ./stepmake/bin/make-version.py VERSION > $TARGET')
+	if 'config' in COMMAND_LINE_TARGETS:
+		sys.stdout.write ('\n')
+		sys.stdout.write ('LilyPond configured')
+		sys.stdout.write ('\n')
+		sys.stdout.write ('now run')
+		sys.stdout.write ('\n')
+		sys.stdout.write ('    scons [TARGET|DIR]...')
+		sys.stdout.write ('\n')
+		Exit (0)
+	elif not env['checksums']:
+		# When using timestams, config.hh is NEW.  The next
+		# build triggers recompilation of everything.  Exiting
+		# here makes SCons use the actual timestamp for config.hh
+		# and prevents recompiling everything the next run.
+		command = sys.argv[0] + ' ' + string.join (COMMAND_LINE_TARGETS)
+		sys.stdout.write ('Running %s ... ' % command)
+		sys.stdout.write ('\n')
+		s = os.system (command)
+		Exit (s)
 
-absbuild = Dir (env['build']).abspath
-run_prefix = os.path.join (absbuild, os.path.join (env['out'], 'usr'))
+
+if os.path.exists (config_cache) and 'config' in COMMAND_LINE_TARGETS:
+	os.unlink (config_cache)
+# WTF?
+# scons: *** Calling Configure from Builders is not supported.
+# env.Command (config_cache, None, configure)
+if not os.path.exists (config_cache) \
+   or (os.stat ('SConstruct')[stat.ST_MTIME]
+       > os.stat (config_cache)[stat.ST_MTIME]):
+	env = configure (None, None, env)
+	save_config_cache (env)
+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, '#',],
-	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'])],
+	# 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',
+			 '$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):
@@ -512,31 +665,57 @@ def symlink_tree (target, source, env):
 			frm = os.path.join (srcdir, src[1:])
 		else:
 			depth = len (string.split (dir, '/'))
-			frm = os.path.join ('../' * depth, src, env['out'])
+			if src.find ('@') > -1:
+				frm = os.path.join ('../' * depth,
+						    string.replace (src, '@',
+								    env['out']))
+			else:
+				frm = os.path.join ('../' * depth, src,
+						    env['out'])
+		if src[-1] == '/':
+			frm = os.path.join (frm, os.path.basename (dst))
+		if env['verbose']:
+			print 'ln -s %s -> %s' % (frm, os.path.basename (dst))
 		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])),
-	     (('python', 'lib/lilypond/python'),
-	      # UGHR, lilypond.py uses lilypond-bin from PATH
-	      ('lily',   'bin'),
-	      ('#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'),
-	      ('elisp',  'share/lilypond/elisp')))
+	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'),
+	      ('scripts/',   'bin/convert-ly'),
+	      ('scripts/',   'bin/lilypond-book'),
+	      ('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/%(ver)s/elisp')))
 	os.chdir (srcdir)
 
 if env['debugging']:
 	stamp = os.path.join (run_prefix, 'stamp')
 	env.Command (stamp, 'SConstruct', [symlink_tree, 'touch $TARGET'])
 	env.Depends ('lily', stamp)
-
+	
 #### dist, tar
 def plus (a, b):
 	a + b
@@ -564,39 +743,115 @@ def cvs_files (dir):
 	files = map (lambda x: x[1:x[1:].index ('/')+1], file_entries)
 	return map (lambda x: os.path.join (dir, x), files)
 
-#subdirs = reduce (lambda x, y: x + y, cvs_dirs ('.'))
-#print `subdirs`
+def flatten (tree, lst):
+	if type (tree) == type ([]):
+		for i in tree:
+			if type (i) == type ([]):
+				flatten (i, lst)
+			else:
+				lst.append (i)
+	return lst
+
+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,
-		   '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
+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/'""")
+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
 for d in subdirs:
 	if os.path.exists (os.path.join (d, 'SConscript')):
 		b = os.path.join (env['build'], d, env['out'])
@@ -605,3 +860,4 @@ for d in subdirs:
 		if os.path.abspath (b) != os.path.abspath (d):
 			env.BuildDir (b, d, duplicate = 0)
        		SConscript (os.path.join (b, 'SConscript'))
+