From 9890eb21050e3577bc63f6c665fc5b46ee3eee9d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Oct 2005 19:26:01 +0000 Subject: [PATCH] * mf/SConscript: Updates. * SConstruct (CheckYYCurrentBuffer): Use TryCompile (there is no main). * SConstruct: Resurrect. --- ChangeLog | 2 ++ SConstruct | 13 +++++++------ buildscripts/builder.py | 5 +++-- mf/SConscript | 21 ++++++++++++++------- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4371afa74..66f4a0a4fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-10-19 Jan Nieuwenhuizen + * mf/SConscript: Updates. + * lily/GNUmakefile (OUT_DIST_FILES): Bugfix. * stepmake/stepmake/*: diff --git a/SConstruct b/SConstruct index 20bb9a49d9..c12ee970be 100644 --- a/SConstruct +++ b/SConstruct @@ -858,11 +858,11 @@ def symlink_tree (target, source, env): % vars ()) os.chdir (srcdir) -if env['debugging']: +if 1: #env['debugging']: stamp = os.path.join (run_prefix, 'stamp') - env.command (stamp, ['#/SConstruct', '#/VERSION'], + env.Command (stamp, ['#/SConstruct', '#/VERSION'], [symlink_tree, 'touch $TARGET']) - env.depends ('lily', stamp) + env.Depends ('lily', stamp) #### dist, tar def plus (a, b): @@ -915,11 +915,12 @@ if env['fast']\ 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', + and 'clean' not in COMMAND_LINE_TARGETS: + subdirs = ['lily', + 'flower', 'kpath-guile', 'mf', + 'python', ] if os.path.isdir ('%(srcdir)s/CVS' % vars ()): diff --git a/buildscripts/builder.py b/buildscripts/builder.py index b26a4e5fc9..e9ccd4f6d3 100644 --- a/buildscripts/builder.py +++ b/buildscripts/builder.py @@ -231,12 +231,13 @@ pfa = Builder (action = a, env.Append (BUILDERS = {'PFA': pfa}) a = ['(cd ${TARGET.dir} && $FONTFORGE -script ${SOURCE.file})', - '$PYTHON $srcdir/buildscripts/ps-embed-cff.py ${SOURCE.base}.cff $$(cat ${SOURCE.base}.fontname) ${SOURCE.base}.cff.ps', +# '$PYTHON $srcdir/buildscripts/ps-embed-cff.py ${SOURCE.base}.cff $$(cat ${SOURCE.base}.fontname) ${SOURCE.base}.cff.ps', 'rm -f ${TARGET.dir}/*.scale.pfa'] otf = Builder (action = a, suffix = '.otf', src_suffix = '.pe', - emitter = add_cff_cffps_svg) +# emitter = add_cff_cffps_svg + ) env.Append (BUILDERS = {'OTF': otf}) diff --git a/mf/SConscript b/mf/SConscript index c1bf328928..0bfbe5d5fd 100644 --- a/mf/SConscript +++ b/mf/SConscript @@ -32,7 +32,7 @@ g = map (env.GTABLE, fonts) #p = map (env.PFA, fonts + map (lambda x: 'PFA' + x, otfs)) p = map (env.PFA, fonts) #e = map (env.ENC, fonts) -c = map (lambda x: x + '.cff', fonts) +#c = map (lambda x: x + '.cff', fonts) cp = map (lambda x: x + '.cff.ps', fonts) e = map (lambda x: x + '.enc', fonts) s = map (lambda x: x + '.svg', fonts) @@ -48,6 +48,7 @@ otf_table = Builder (action = a, suffix = '.otf-table', src_suffix = '.lisp') env.Append (BUILDERS = {'OTF_TABLE': otf_table}) f = map (env.OTF_TABLE, feta) +g = map (env.OTF_TABLE, feta_braces) map (lambda x: env.Depends ('emmentaler-' + x + '.otf', 'feta' + x + '.otf-table'), @@ -79,20 +80,26 @@ env.Command ('aybabtu.otf-gtable', map (lambda x: x + '.otf-gtable', feta_braces), 'echo "(design_size . 20)" > $TARGET') +#env.Depends ('aybabtu.otf-table', +# map (lambda x: x + '.otf-table', feta_braces)) + env.Depends ('aybabtu.otf', 'aybabtu.subfonts') env.Depends ('aybabtu.otf', 'aybabtu.fontname') env.Depends ('aybabtu.otf', 'aybabtu.otf-table') env.Depends ('aybabtu.otf', 'aybabtu.otf-gtable') +# Hmm? +env.Depends ('aybabtu.pfa', 'aybabtu.subfonts') +env.Depends ('aybabtu.pfa', 'aybabtu.fontname') +env.Depends ('aybabtu.pfa', 'aybabtu.otf-table') +env.Depends ('aybabtu.pfa', 'aybabtu.otf-gtable') + ## FIXME mf_essential = ['feta16', 'feta20', 'parmesan16', ] pfa_essential = map (env.PFA, mf_essential) env.Alias ('mf-essential', pfa_essential) -env.Command ('cmr.enc', 'cmr.enc.in', 'cp $SOURCE $TARGET') -env.Alias ('mf', 'cmr.enc') - env['fonts'] = string.join (fonts) env['feta_sizes'] = string.join (feta_sizes) env['sauter'] = string.join (sauter) @@ -105,7 +112,7 @@ env.Command ('lilypond.map', p, 'echo "Aybabtu-Regular Aybabtu-Regular > $TARGET', 'echo "PFAAybabtu-Regular PFAAybabtu-Regular > $TARGET', 'for i in $sauter; do echo "$$i $$i <$$i.pfa"; done >> $TARGET']) -env.Alias ('mf', 'lilypond.map') +#env.Alias ('mf', 'lilypond.map') env.Command ('fonts.scale', p, 'cd ${TARGET.dir} && echo *.pfa *.pfb | $PYTHON $srcdir/buildscripts/make-font-dir.py > $TARGET.file') @@ -130,7 +137,7 @@ env.Command ('Fontmap.lily', p + ['Fontmap'], '''echo "/Aybabtu (aybabtu.cff.ps);" >> $TARGET''', '''echo "/PFAAybabtu (PFAaybabtu.pfa);" >> $TARGET''', '''for i in $sauter; do echo "$$i ($$i.pfa);"; done >> $TARGET''']) -env.Alias ('mf', 'Fontmap.lily') +#env.Alias ('mf', 'Fontmap.lily') # build essential stuff first, that's friendlier env.Alias ('mf', pfa_essential + p + map (lambda x: x[0], o)) @@ -140,6 +147,6 @@ install (p, env['sharedir_package_version'] + '/fonts/type1') install (o, env['sharedir_package_version'] + '/fonts/otf') install (e, env['sharedir_package_version'] + '/ps') install (s, env['sharedir_package_version'] + '/fonts/svg') -install (c, env['sharedir_package_version'] + '/fonts/cff') +#install (c, env['sharedir_package_version'] + '/fonts/cff') install (cp, env['sharedir_package_version'] + '/ps') -- 2.39.2