Re: cygwin: lilypond and tetex-3.0

[Jan Nieuwenhuizen]

Bertalan Fodor writes:

> Building 2.4.4 gave the same failure.  I suppose we want current
> stable lilypond to work with tetex-3.0, don't we?

That is not important, we can assume that people who upgrade tetex
also upgrade lilypond.  I will not be uploading tetex-3.0 before
a new lilypond package is available that works.

> So should I put these changes to 2.4.4 source files?

No, they are already in 2.4-CVS (or you may try the pathes below).  Do
something like:

    cvs -d :ext:address@hidden:/cvsroot/lilypond co -rlilypond_2_4 -d 
lilypond-2.4 lilypond

I'm not sure if/when 2.4.4 will happen, CVS is still at 2.4.3.  With
teTeX-3.0 released yesterday, I think we already waited too long.  We
can expect to see tetex-3.0 related problems any day now.

Jan.



2005-01-09  Jan Nieuwenhuizen  <address@hidden>

        * config.make.in (METAFONT): Append -progname=mf, fixes use with
        mf-nowin for teTeX-3.0.  Backportme.

2005-01-03  Jan Nieuwenhuizen  <address@hidden>

        Backport teTeX-3.0 compatibility.
        
        * SConstruct: 
        * ps/GNUmakefile (INSTALLATION_FILES): teTeX-3.0
        compatibility (backportme).

        * GNUmakefile.in: teTeX-3.0 compatibility (backportme).


Index: GNUmakefile.in
===================================================================
RCS file: /cvsroot/lilypond/lilypond/GNUmakefile.in,v
retrieving revision 1.126.2.2
retrieving revision 1.126.2.3
diff -p -u -p -u -r1.126.2.2 -r1.126.2.3
--- GNUmakefile.in      8 Nov 2004 19:57:55 -0000       1.126.2.2
+++ GNUmakefile.in      7 Jan 2005 14:24:05 -0000       1.126.2.3
@@ -101,6 +101,7 @@ $(builddir)/share/lilypond-force:
        cd $(builddir) && rm -rf lib share
        mkdir -p $(builddir)/lib/$(package)
        mkdir -p $(builddir)/share/$(package)
+       mkdir -p $(builddir)/share/$(package)/dvips
        mkdir -p $(builddir)/share/$(package)/elisp
        mkdir -p $(builddir)/share/$(package)/fonts
        mkdir -p $(builddir)/share/$(package)/tex
@@ -108,13 +109,15 @@ $(builddir)/share/lilypond-force:
                ln -s  ../../python/$(outconfbase) python
        cd $(builddir)/share/$(package) && \
                ln -s $(abs-srcdir)/ly ly && \
-               ln -s ../../mf/$(outconfbase) dvips && \
                ln -s ../../mf/$(outconfbase) afm && \
                ln -s ../../mf/$(outconfbase) tfm && \
                ln -s $(abs-srcdir)/mf && \
                ln -s $(abs-srcdir)/ps && \
                ln -s ../../python/$(outconfbase) python && \
                ln -s $(abs-srcdir)/scm
+       cd $(builddir)/share/$(package)/dvips && \
+               ln -s ./../mf/$(outconfbase) mf-out && \
+               ln -s $(abs-srcdir)/ps
        cd $(builddir)/share/$(package)/tex && \
                ln -s $(abs-srcdir)/tex source && \
                ln -s ../../../tex/$(outconfbase) tex-out && \

Index: config.make.in
===================================================================
RCS file: /cvsroot/lilypond/lilypond/config.make.in,v
retrieving revision 1.63
retrieving revision 1.63.4.1
diff -p -u -p -u -r1.63 -r1.63.4.1
--- config.make.in      17 Jun 2004 00:17:57 -0000      1.63
+++ config.make.in      9 Jan 2005 17:23:22 -0000       1.63.4.1
@@ -92,7 +92,7 @@ GUILE_LDFLAGS = @GUILE_LDFLAGS@
 INIMETAFONT = @INIMETAFONT@
 LN = @LN@
 LN_S = @LN_S@
-METAFONT = @METAFONT@
+METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
 MSGFMT = @MSGFMT@
 ROOTSEP = @ROOTSEP@

Index: ps/GNUmakefile
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ps/GNUmakefile,v
retrieving revision 1.4
retrieving revision 1.4.14.1
diff -p -u -p -u -r1.4 -r1.4.14.1
--- ps/GNUmakefile      24 Jul 2002 13:45:39 -0000      1.4
+++ ps/GNUmakefile      7 Jan 2005 14:24:05 -0000       1.4.14.1
@@ -8,4 +8,13 @@ EXTRA_DIST_FILES = $(PS_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)/ps/
 INSTALLATION_FILES=$(PS_FILES)
 
+# teTeX-3.0 compatibility.
+local-install:
+       -$(INSTALL) -d $(local_lilypond_datadir)/dvips
+       (cd $(local_lilypond_datadir)/dvips && ln -sf ../ps .)
+
+local-uninstall:
+       -rm -f $(local_lilypond_datadir)/dvips/ps
+       -rmdir $(local_lilypond_datadir)/dvips
+
 include $(depth)/make/stepmake.make


-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org