From 9038cb2bf26288fc3759c840a2cb284ec7a0f05a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 15 Jul 2004 15:11:28 +0000
Subject: [PATCH] * SConstruct (symlink): Add dvips and
music-drawing-routines.ps.
* SConstruct (config_vars): Add CPPDEFINES.
(env): Set checksums type to "content".
(save_config_cache): Do not exit after configuring when using
checksums (the default) instead of timestamps.
---
ChangeLog | 2 ++
SConstruct | 11 ++++++++---
buildscripts/builder.py | 9 ++++++++-
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e938d6a8d5..e542f09d04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2004-07-15 Jan Nieuwenhuizen <janneke@gnu.org>
+ * SConstruct (symlink): Add dvips and music-drawing-routines.ps.
+
* lily/slur.cc: Add quant-score to interface. Fixes web build.
* python/SConscript:
diff --git a/SConstruct b/SConstruct
index 2a74c24dfe..8d47e8c873 100644
--- a/SConstruct
+++ b/SConstruct
@@ -587,8 +587,8 @@ def symlink_tree (target, source, env):
else:
frm = os.path.join ('../' * depth, src,
env['out'])
- if src[-1] == '/':
- frm = os.path.join (frm, os.path.basename (dst))
+ if src[-1] == '/':
+ frm = os.path.join (frm, os.path.basename (dst))
if env['verbose']:
print 'ln -s %s -> %s' % (frm, os.path.basename (dst))
os.symlink (frm, os.path.basename (dst))
@@ -602,6 +602,10 @@ def symlink_tree (target, source, env):
('lily/', 'bin/lilypond-bin'),
('scripts/', 'bin/lilypond'),
('scripts/', 'bin/lilypond-book'),
+ ('mf', 'share/lilypond/dvips'),
+ ('#ps', 'share/lilypond/tex/music-drawing-routines.ps'),
+ ('mf', 'share/lilypond/afm'),
+ ('mf', 'share/lilypond/tfm'),
('#mf', 'share/lilypond/fonts/mf'),
('mf', 'share/lilypond/fonts/afm'),
('mf', 'share/lilypond/fonts/tfm'),
@@ -674,7 +678,8 @@ 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,
- 'tar czf $TARGET -C $TARGET.dir %s' % tar_base)
+ ['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)
diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index 229ed1c344..3811bc7969 100644
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -46,6 +46,12 @@ if os.environ.has_key ('TEXMF'):
env.Append (ENV = {'TEXMF' : '{$LILYPONDPREFIX,' \
+ os.popen ('kpsexpand \$TEXMF').read ()[:-1] + '}' })
+#if os.environ.has_key ('GS_LIB'):
+# env.Append (ENV = {'GS_LIB' : os.environ['GS_LIB'] })
+#
+#env.PrependENVPath ('GS_LIB', ['$run_prefix/share/lilyond/ps',
+# '$run_prefix/share/lilypond/fonts/type1/'])
+
if os.environ.has_key ('LD_LIBRARY_PATH'):
env.Append (ENV = {'LD_LIBRARY_PATH' : os.environ['LD_LIBRARY_PATH']})
if os.environ.has_key ('GUILE_LOAD_PATH'):
@@ -142,10 +148,11 @@ def add_enc_src (target, source, env):
return (target, source + [base + '.enc'])
# UGH, should fix --output option for mftrace
+# mftrace --verbose is too verbose
a = 'cd ${TARGET.dir} && \
if test -e ${SOURCE.filebase}.enc; then encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
MFINPUTS=$srcdir/mf:.: \
-mftrace --pfa --simplify --keep-trying $$encoding $__verbose \
+mftrace --pfa --simplify --keep-trying $$encoding $TOO__verbose \
--include=${TARGET.dir} \
${SOURCE.file}'
--
2.39.5