X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=4e5640dff2df81bc1c9112459e74cdcbc1643a22;hb=5b988950c19151b875628a5b3e0016fd442c61f2;hp=6c6a032964879f6580d425d7dd04477bce70c8de;hpb=8c8aa84f618801e2d5b0b4e39fc55528c3e6b805;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index 6c6a032964..4e5640dff2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -367,6 +367,8 @@ def configure (target, source, env):
 		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')
 
@@ -385,13 +387,12 @@ def configure (target, source, env):
 	if env['fast']:
 		# Using CCFLAGS = -I<system-dir> rather than CPPPATH = [
 		# <system-dir>] speeds up SCons
-		print 'cpp', env['CPPPATH']
 		env['CCFLAGS'] += map (lambda x: '-I' + x,
 				       env['CPPPATH'][len (cpppath):])
 		env['CPPPATH'] = cpppath
 
 	if required:
-F		print
+		print
 		print '********************************'
 		print 'Please install required packages'
 		for i in required:
@@ -666,16 +667,18 @@ def symlink_tree (target, source, env):
 	      ('lily/',      'bin/lilypond-bin'),
 	      ('scripts/',   'bin/lilypond'),
 	      ('scripts/',   'bin/lilypond-book'),
-	      ('mf',         'share/lilypond/dvips'),
+	      ('mf',         'share/lilypond/dvips/mf-out'),
+	      ('#ps',        'share/lilypond/dvips/ps'),
 	      ('#ps',        'share/lilypond/tex/music-drawing-routines.ps'),
-	      ('mf',         'share/lilypond/afm'),
+	      ('mf',         'share/lilypond/otf'),
 	      ('mf',         'share/lilypond/tfm'),
 	      ('#mf',        'share/lilypond/fonts/mf'),
-	      ('mf',         'share/lilypond/fonts/afm'),
+	      ('mf',         'share/lilypond/fonts/otf'),
 	      ('mf',         'share/lilypond/fonts/tfm'),
 	      ('mf',         'share/lilypond/fonts/type1'),
 	      ('#tex',       'share/lilypond/tex/source'),
-	      ('mf',         'share/lilypond/tex/generate'),
+	      ('tex',        'share/lilypond/tex/tex-out'),
+	      ('mf',         'share/lilypond/tex/mf-out'),
 	      ('#ly',        'share/lilypond/ly'),
 	      ('#scm',       'share/lilypond/scm'),
 	      ('#ps',        'share/lilypond/ps'),
@@ -733,71 +736,80 @@ if env['fast']\
 	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 = 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)
+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 (