From 8a34815c3e51d8bb51b562cab3b29a8ee4fd9d20 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 11 Jul 2004 15:28:05 +0000
Subject: [PATCH] * SConstruct: * buildscripts/builder.py: *
 Documentation/user/SConscript: SCons fixes.

---
 Documentation/user/SConscript |  9 ++++++++-
 SConstruct                    | 22 +++++++++++++++-------
 buildscripts/builder.py       |  2 +-
 input/SConscript              |  4 +---
 mf/SConscript                 |  3 +++
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Documentation/user/SConscript b/Documentation/user/SConscript
index 8db0723640..794c27c675 100644
--- a/Documentation/user/SConscript
+++ b/Documentation/user/SConscript
@@ -31,11 +31,18 @@ LILYPONDPREFIX = env['LILYPONDPREFIX']
 mfbuild = os.path.join (env['absbuild'], 'mf', env['out'])
 lilybuild = os.path.join (env['absbuild'], 'lily', env['out'])
 userbuild = os.path.join (env['absbuild'], 'Documentation/user', env['out'])
+
+# more of these? -- howto?
 e.Depends ('lilypond.texi', os.path.join (mfbuild, 'feta16list.ly'))
 e.Depends ('lilypond.texi', os.path.join (mfbuild, 'parmesan16list.ly'))
+# or these
+e.Depends ('doc', os.path.join (mfbuild, 'feta20.enc'))
+e.Depends ('doc', os.path.join (mfbuild, 'feta20.enc'))
+
 e.Depends ('lilypond.texi', LILYPOND_BIN)
 e.Depends ('lilypond.texi', 'lilypond-internals.texi')
-#e.Depends ('lilypond.texi', os.path.join (lilybuild, 'lilypond-bin'))
+
+e.Depends ('lilypond.texi', 'fonts')
 
 png_stems = map (lambda x: os.path.splitext (x)[0], pngs)
 epss = map (e.Png2eps, png_stems)
diff --git a/SConstruct b/SConstruct
index 89d6a59da4..c73c4f05c0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,12 +4,16 @@
 Experimental scons (www.scons.org) building:
 
 Usage:
+    scons
     scons lily            # build lily
+
     LILYPONDPREFIX=out-scons/usr/share/lilypond lily/out-scons/lilypond-bin
     scons doc             # build web doc
 
-    scons                 # without args builds all targets below ./
-                          # maybe catch this one and only build lily?
+    scons fonts           # build all font stuff (split this? )
+
+XXX    scons                 # without args builds all targets below ./
+XXX                          # maybe catch this one and only build lily?
     scons /               # builds all possible targets
 
     scons install
@@ -36,12 +40,8 @@ prefix=os.path.join (os.environ['HOME'], 'usr', 'pkg', 'lilypond')
 #   * separate environments?
 #     - compile environment checks headers and libraries
 #     - doc environment checks doc stuff
-#
-#   * running from build-dir, without installing?
-#     - scons will not install, if PREFIX lives outside of CWD
+#   * - help for targets?
 #     - build symlink tree
-#       + mimicking regular installation setup?
-#       + use tweaked scons 'install' target?
 #   * commandline targets:
 #      - clean => -c
 #      - dist, tar => env.Tar
@@ -59,6 +59,14 @@ import string
 
 env = Environment ()
 
+# Without target arguments, build lily only
+if not COMMAND_LINE_TARGETS:
+	env.Default ('lily')
+
+# Target 'all' builds everything
+if 'all' in COMMAND_LINE_TARGETS:
+	env.Default ('lily', 'fonts', 'doc')
+
 # put your favourite stuff in custom.py
 opts = Options ('custom.py', ARGUMENTS)
 #opts = Options (['config.cache', 'custom.py'], ARGUMENTS)
diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index c815f59d63..ce84e087f8 100644
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -147,7 +147,7 @@ a = ('%(PYTHON)s %(MF_TO_TABLE_PY)s%(verbose)s'\
      + ' --outdir=${TARGET.dir}'\
      + ' --afm=${TARGET.base}.afm' \
      + ' --enc=${TARGET.base}.enc' \
-     + ' --tex=${TARGET.base}' \
+     + ' --tex=${TARGET.base}.tex' \
      + ' --ly=${TARGET.base}list.ly'\
      + ' ${TARGET.base}.log') % vars ()
 afm = Builder (action = a, suffix = '.afm', src_suffix = '.log',
diff --git a/input/SConscript b/input/SConscript
index f184f96a2c..4e5df4bf7a 100644
--- a/input/SConscript
+++ b/input/SConscript
@@ -26,11 +26,9 @@ pdfs = pdfs + map (e.LilyPond, lys)
 LILYPOND_BIN = env['LILYPOND_BIN']
 
 mfbuild = os.path.join (env['absbuild'], 'mf', env['out'])
-e.Depends ('doc', mfbuild)
+e.Depends ('doc', 'fonts')
 e.Depends ('doc', LILYPOND_BIN)
-
 e.Alias ('doc', pdfs)
-#e.Alias ('doc', 'example-1.pdf')
 
 #testing
 all_sources = ['SConscript',] + sources + abc_sources
diff --git a/mf/SConscript b/mf/SConscript
index 572e64d66a..60305b1064 100644
--- a/mf/SConscript
+++ b/mf/SConscript
@@ -43,6 +43,9 @@ env.Alias ('install', tfmdir)
 env.Alias ('install', afmdir)
 env.Alias ('install', pfadir)
 
+map (lambda x: env.Alias ('fonts', x), t + a + p)
+map (lambda x: env.Alias ('mf', x), t + a + p)
+
 #testing
 all_sources = ['SConscript',] + sources
 x = env.Tar (env['tarball'], all_sources)
-- 
2.39.5