X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=6d67479f467ad8d5e05e5a7be16de4003cbc5bba;hb=dbf67da71caccc4f772ed9d22262d0419a9d12fc;hp=ce0c1244398409a2593a1ee41d57587de8f7aa3a;hpb=f122caaad45fafe7e76e65c04ec073be873b4cb0;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index ce0c124439..6d67479f46 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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
 
 '''
       
@@ -135,6 +129,8 @@ 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),
 	)
 
@@ -178,11 +174,20 @@ 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'])
@@ -194,6 +199,10 @@ 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'))
 
@@ -316,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:
@@ -351,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')
 
@@ -366,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 '********************************'
@@ -467,10 +490,11 @@ env.PrependENVPath ('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] + '}' })
-
-
+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}'
@@ -536,6 +560,13 @@ if 'clean' in COMMAND_LINE_TARGETS:
 		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)
@@ -576,7 +607,6 @@ env.Append (
 	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_PATH = ['.', '$srcdir/input',
 			 '$srcdir/input/regression',
@@ -693,7 +723,15 @@ 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 ('.'), [])
 readme_files = ['AUTHORS', 'README', 'INSTALL', 'NEWS']
 foo = map (lambda x: env.TXT (x + '.txt',
 			      os.path.join ('Documentation/topdocs', x)),
@@ -741,26 +779,33 @@ env.Command (web_list,
 	     '#/VERSION',
 	     ['$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 \
 	      > $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''',
-	      # UGHR?  all .html cruft in cwd goes into the web ball?
 	      'cd $absbuild && ls *.html >> $TARGET',])
 env.Command (web_ball, web_list,
 	     ['cat $SOURCE | tar -C $absbuild -czf $TARGET -T -',])
-env.Alias ('web', web_ball)
-env.Alias ('roll-web', web_ball)
+#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