CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/18 21:31:24
Modified files:
stepmake : aclocal.m4
buildscripts : builder.py
Documentation/topdocs: SConscript
. : SConstruct ChangeLog
Log message:
SCons updates
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.137&tr2=1.138&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/builder.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/SConscript.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3468&tr2=1.3469&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3468 lilypond/ChangeLog:1.3469
--- lilypond/ChangeLog:1.3468 Mon Apr 18 21:20:10 2005
+++ lilypond/ChangeLog Mon Apr 18 21:31:24 2005
@@ -5,6 +5,8 @@
2005-04-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * aclocal.m4: Massage package names.
+
* SCons updates.
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: lilypond/Documentation/topdocs/SConscript
diff -u lilypond/Documentation/topdocs/SConscript:1.5
lilypond/Documentation/topdocs/SConscript:1.6
--- lilypond/Documentation/topdocs/SConscript:1.5 Fri Jul 16 16:13:21 2004
+++ lilypond/Documentation/topdocs/SConscript Mon Apr 18 21:31:24 2005
@@ -3,7 +3,7 @@
Import ('env', 'src_glob', 'install')
tely = src_glob ('*.tely')
-texi = src_glob ('*.texi')
+texi = src_glob ('*.texi') + map (env.TEXI, tely)
txt = map (env.TXT, texi)
html = map (env.HTML, texi)
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.76 lilypond/SConstruct:1.77
--- lilypond/SConstruct:1.76 Mon Apr 18 18:36:08 2005
+++ lilypond/SConstruct Mon Apr 18 21:31:24 2005
@@ -884,7 +884,7 @@
lst.append (i)
return lst
-if os.path.isdir ('$srcdir/CVS'):
+if os.path.isdir ('%(srcdir)s/CVS' % vars ()):
subdirs = flatten (cvs_dirs ('.'), [])
else:
# ugh
@@ -905,7 +905,7 @@
'mf',
]
-if os.path.isdir ('$srcdir/CVS'):
+if os.path.isdir ('%(srcdir)s/CVS' % vars ()):
src_files = reduce (lambda x, y: x + y, map (cvs_files, subdirs))
else:
src_files = ['foobar']
Index: lilypond/buildscripts/builder.py
diff -u lilypond/buildscripts/builder.py:1.31
lilypond/buildscripts/builder.py:1.32
--- lilypond/buildscripts/builder.py:1.31 Mon Apr 18 18:22:35 2005
+++ lilypond/buildscripts/builder.py Mon Apr 18 21:31:24 2005
@@ -243,7 +243,7 @@
# Specific builders
env['DIFF_PY'] = '$srcdir/stepmake/bin/package-diff.py'
-a = '$PYTHON $DIFF_PY $__verbose --outdir=${TARGET.dir}'
+a = '$PYTHON $DIFF_PY $NO__verbose --outdir=${TARGET.dir}'
patch = Builder (action = a, suffix = '.diff', src_suffix = '.tar.gz')
env.Append (BUILDERS = {'PATCH': patch})
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.137 lilypond/stepmake/aclocal.m4:1.138
--- lilypond/stepmake/aclocal.m4:1.137 Mon Apr 18 14:57:41 2005
+++ lilypond/stepmake/aclocal.m4 Mon Apr 18 21:31:24 2005
@@ -994,12 +994,36 @@
])
-
AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
+ AC_ARG_ENABLE(tfm-path,
+ [ --enable-tfm-path=PATH set path of tex directories where tfm files
live,
+ esp.: cmr10.tfm. Default: use kpsewhich],
+ [tfm_path=$enableval],
+ [tfm_path=auto] )
# ugh
STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
-
+ AC_MSG_CHECKING(for tfm path)
+
+ TFM_FONTS="cmr msam"
+
+ if test "x$tfm_path" = xauto ; then
+ if test "x$KPSEWHICH" != "xno" ; then
+ for i in $TFM_FONTS; do
+ dir=`$KPSEWHICH tfm ${i}10.tfm`
+ TFM_PATH="$TFM_PATH `dirname $dir`"
+ done
+ else
+ STEPMAKE_WARN(Please specify where cmr10.tfm lives:
+ ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts)
+ fi
+ else
+ TFM_PATH=$tfm_path
+ fi
+
+ TFM_PATH=`echo $TFM_PATH | tr ':' ' '`
+ AC_MSG_RESULT($TFM_PATH)
+ AC_SUBST(TFM_PATH)
])
@@ -1101,7 +1125,9 @@
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
else
- r="lib$1-dev or $1-devel"
+ # UGR
+ # r="lib$1-dev or $1-devel"
+ r="libgtk+2.0-dev or gtk2-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
@@ -1123,7 +1149,9 @@
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
else
- r="lib$1-dev or $1-devel"
+ # UGR
+ #r="lib$1-dev or $1-devel"
+ r="libpango1.0-dev or pango1.0-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
@@ -1148,7 +1176,9 @@
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
else
- r="lib$1-dev or $1-devel"
+ # UGR
+ #r="lib$1-dev or $1-devel"
+ r="libpango1.0-dev or pango1.0-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
