CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/19 19:26:02
Modified files:
mf : SConscript
buildscripts : builder.py
. : SConstruct ChangeLog
Log message:
* mf/SConscript: Updates.
* SConstruct (CheckYYCurrentBuffer): Use TryCompile (there is no
main).
* SConstruct: Resurrect.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/SConscript.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/builder.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4197&tr2=1.4198&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4197 lilypond/ChangeLog:1.4198
--- lilypond/ChangeLog:1.4197 Wed Oct 19 17:15:06 2005
+++ lilypond/ChangeLog Wed Oct 19 19:26:01 2005
@@ -1,5 +1,7 @@
2005-10-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * mf/SConscript: Updates.
+
* lily/GNUmakefile (OUT_DIST_FILES): Bugfix.
* stepmake/stepmake/*:
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.83 lilypond/SConstruct:1.84
--- lilypond/SConstruct:1.83 Wed Oct 19 17:15:06 2005
+++ lilypond/SConstruct Wed Oct 19 19:26:01 2005
@@ -858,11 +858,11 @@
% 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 @@
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 ()):
Index: lilypond/buildscripts/builder.py
diff -u lilypond/buildscripts/builder.py:1.32
lilypond/buildscripts/builder.py:1.33
--- lilypond/buildscripts/builder.py:1.32 Mon Apr 18 21:31:24 2005
+++ lilypond/buildscripts/builder.py Wed Oct 19 19:26:01 2005
@@ -231,12 +231,13 @@
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})
Index: lilypond/mf/SConscript
diff -u lilypond/mf/SConscript:1.20 lilypond/mf/SConscript:1.21
--- lilypond/mf/SConscript:1.20 Mon Apr 18 18:22:35 2005
+++ lilypond/mf/SConscript Wed Oct 19 19:26:00 2005
@@ -32,7 +32,7 @@
#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 @@
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 @@
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 @@
'echo "Aybabtu-Regular Aybabtu-Regular <aybabtu.cff.ps" >>
$TARGET',
'echo "PFAAybabtu-Regular PFAAybabtu-Regular <aybabtu.cff.ps" >>
$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 @@
'''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 (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')
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
