* mf/SConscript: Update multiple target rules.

* SConstruct (assert_version): Add.

diff --git a/ChangeLog b/ChangeLog
index 90d724fc651b0f1b701703382424295e5798794b..e095b51bf8292b4b9a2eefe36acf63d7dbaa1034 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-08  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * mf/SConscript: Update multiple target rules.
+
+       * SConstruct (assert_version): Add.
+
 2004-07-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * SConstruct (key): add HAVE_FLEXLEXER_YY_CURRENT_BUFFER check.

diff --git a/SConstruct b/SConstruct
index f68d1a7d6b7273e1edda491768f4e257363e8d49..15ccaec77ca97fa485853207e84da9bce1731368 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -180,9 +180,41 @@ else:
        env.Append (LIBPATH = ['#/flower/' + out,],
                    CPPPATH = [outdir, '#',])
 
-#subdirs = ('mf',)
+def get_version (program):
+       command = '(%(program)s --version || %(program)s -V) 2>&1' % vars ()
+       output = os.popen (command).readline ()[:-1]
+       v = re.sub ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$', '\\1', output)
+       return string.split (v, '.')
+
+def assert_version (program, minimal, description, package):
+       global required
+       sys.stdout.write ('Checking %s version... ' % program)
+       actual = get_version (program)
+       sys.stdout.write (string.join (actual, '.'))
+       sys.stdout.write ('\n')
+       if actual < string.split (minimal, '.'):
+               required.append ((description, package,
+                                 string.join (minimal, '.'),
+                                 program,
+                                 string.join (actual, '.')))
+
+required = []
+assert_version ('gcc', '3.0.5', 'GNU C compiler', 'gcc')
+assert_version ('makeinfo', '4.7, 'Makeinfo tool', 'texinfo')
+
+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)
+       
+
+subdirs = ('mf',)
 #subdirs = ('flower', 'lily', 'parser', 'gui', 'main',)
-subdirs = ('flower', 'lily', 'mf')
+#subdirs = ('flower', 'lily', 'mf')
 for d in subdirs:
        b = os.path.join (build, d, out)
        # Support clean sourctree build (srcdir build)

diff --git a/mf/SConscript b/mf/SConscript
index 812b35a19573fbc6dbf926284a0a75242a321281..10a3ce535ce9764d2044af6bf7cb4b8279fa6bd6 100644 (file)
--- a/mf/SConscript
+++ b/mf/SConscript
@@ -20,7 +20,14 @@ os.chdir (here)
 
 Import ('env')
 MFMODE = env['MFMODE']
-#ugh
+def tfm_log_enc_ly_tex (target, source, env):
+       base = os.path.splitext (str (target[0]))[0]
+       et = (map (lambda x: base + x, ['.log', '.enc', '.ly', '.tex']))
+       #es = (map (lambda x: base + '.mf', et))
+       #print `et`
+       #return (target + et, source + es)
+       return (target + et, source)
+
 outdir = os.path.join (env['build'], reldir, env['out'])
 tfm = Builder (action = ('(cd ' + outdir + ' && ' \
                         + 'MFINPUTS=.:' + str (Dir ('#/mf')) \
@@ -28,43 +35,8 @@ tfm = Builder (action = ('(cd ' + outdir + ' && ' \
                         + ' input $$(basename $SOURCE);" ' \
                         + ' | grep -v "@\|>>")') % vars (),
               suffix = '.tfm',
-              src_suffix = '.mf')
-
-# How do do multiple targets?
-log = Builder (action = ('(cd ' + outdir + ' && ' \
-                        + 'MFINPUTS=.:' + str (Dir ('#/mf')) \
-                        + ' mf "\\mode:=%(MFMODE)s; nonstopmode; ' \
-                        + ' input $$(basename $SOURCE);" ' \
-                        + ' | grep -v "@\|>>")') % vars (),
-              suffix = '.log',
-              src_suffix = '.mf')
-
-# How do do multiple targets?
-enc = Builder (action = ('(cd ' + outdir + ' && ' \
-                        + 'MFINPUTS=.:' + str (Dir ('#/mf')) \
-                        + ' mf "\\mode:=%(MFMODE)s; nonstopmode; ' \
-                        + ' input $$(basename $SOURCE);" ' \
-                        + ' | grep -v "@\|>>")') % vars (),
-              suffix = '.enc',
-              src_suffix = '.mf')
-
-# How do do multiple targets?
-ly = Builder (action = ('(cd ' + outdir + ' && ' \
-                        + 'MFINPUTS=.:' + str (Dir ('#/mf')) \
-                        + ' mf "\\mode:=%(MFMODE)s; nonstopmode; ' \
-                        + ' input $$(basename $SOURCE);" ' \
-                        + ' | grep -v "@\|>>")') % vars (),
-              suffix = '.ly',
-              src_suffix = '.mf')
-
-# How do do multiple targets?
-tex = Builder (action = ('(cd ' + outdir + ' && ' \
-                        + 'MFINPUTS=.:' + str (Dir ('#/mf')) \
-                        + ' mf "\\mode:=%(MFMODE)s; nonstopmode; ' \
-                        + ' input $$(basename $SOURCE);" ' \
-                        + ' | grep -v "@\|>>")') % vars (),
-              suffix = '.tex',
-              src_suffix = '.mf')
+              src_suffix = '.mf',
+              emitter = tfm_log_enc_ly_tex)
 
 afm = Builder (action = (sys.executable
                         + ' buildscripts/mf-to-table.py ' \
@@ -78,21 +50,17 @@ afm = Builder (action = (sys.executable
               src_suffix = '.log')
 
 # UGH, should fix --output option for mftrace
-pfa = Builder (action = ('mftrace -I%(outdir)s --pfa --simplify --keep-trying'\
+pfa = Builder (action = ('MFINPUTS=.:' + str (Dir ('#/mf')) \
+                        + ' mftrace -I %(outdir)s --pfa' \
+                        + ' --simplify --keep-trying' \
                         + ' $$(basename $SOURCE .mf) ' \
                         + ' && mv $$(basename $TARGET) $TARGET') % vars (),
               suffix = '.pfa',
               src_suffix = '.mf')
 
 
-xpfa = Builder (action = ('mftrace -I%(outdir)s --pfa --simplify --keep-trying'\
-                        + ' $$(basename $SOURCE .log) ' \
-                        + ' && mv $$(basename $TARGET) $TARGET') % vars (),
-              suffix = '.pfa',
-              src_suffix = '.log')
-
 e = env.Copy (BUILDERS = {'Tfm' : tfm,
-                         'Log' : log, 'Enc' : enc, 'Ly' : ly, 'Tex' : tex,
+                         #'Log' : log, 'Enc' : enc, 'Ly' : ly, 'Tex' : tex,
                          'Afm' : afm, 'Pfa' : pfa},
              MFINPUTS = '#/mf')
 
@@ -103,22 +71,14 @@ t = map (e.Tfm, sources)
 a = map (e.Afm, sources)
 p = map (e.Pfa, sources)
 
-#ugh?
-w = map (e.Log, sources)
-x = map (e.Enc, sources)
-y = map (e.Ly, sources)
-z = map (e.Tex, sources)
-
-#map (lambda x: e.Depends (x + '.log', x + '.mf'), sources)
-#map (lambda x: e.Depends (x + '.afm', x + '.log'), sources)
-#map (lambda x: e.Depends (x + '.pfa', x + '.log'), sources)
+map (lambda x: e.Depends (x + '.pfa', x + '.log'), sources)
 
 tfmdir = os.path.join (env['lilypondprefix'], 'fonts/tfm')
 afmdir = os.path.join (env['lilypondprefix'], 'afm')
 pfadir = os.path.join (env['lilypondprefix'], 'fonts/type1')
-ti = env.Install (tfmdir, t)
-ai = env.Install (afmdir, a)
-pi = env.Install (pfadir, p)
+ti = map (lambda x: env.Install (tfmdir, x), t)
+ai = map (lambda x: env.Install (afmdir, x), a)
+pi = map (lambda x: env.Install (pfadir, x), p)
 env.Alias ('install', tfmdir)
 env.Alias ('install', afmdir)
 env.Alias ('install', pfadir)