From: Jan Nieuwenhuizen Date: Mon, 14 Sep 1998 15:04:35 +0000 (+0200) Subject: patch::: 1.0.7.jcn1: Hoi X-Git-Tag: release/1.0.8~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b046ce3acb25f54c78a9ccd767ece722a60a7ef6;p=lilypond.git patch::: 1.0.7.jcn1: Hoi pl 7.jcn1 - minor stepmake/yodl fixes --- diff --git a/NEWS b/NEWS index ccd6913fa8..ebf46685f9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 7.jcn1 + - minor stepmake/yodl fixes + pl 7 - refman updates by Adriano Moriano. diff --git a/VERSION b/VERSION index 027e590313..d67991c8a0 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=7 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 9947522568..3f1287644c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -439,6 +439,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) + AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) else @@ -446,9 +447,10 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_SUBST(YODL2HTML) AC_SUBST(YODL2LATEX) AC_SUBST(YODL2MAN) + AC_SUBST(YODL2MSLESS) AC_SUBST(YODL2TEXINFO) AC_SUBST(YODL2TXT) - export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT + export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT fi if test "x$YODL" = "-echo no yodl"; then AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) diff --git a/config.make.in b/config.make.in index e15719086f..5ab98dd83a 100644 --- a/config.make.in +++ b/config.make.in @@ -4,6 +4,7 @@ package-depth = @package_depth@ +USER_CFLAGS = @CFLAGS@ USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ USER_LDFLAGS = @@ -55,6 +56,7 @@ YODL= @YODL@ YODL2HTML= @YODL2HTML@ YODL2LATEX= @YODL2LATEX@ YODL2MAN= @YODL2MAN@ +YODL2MSLESS= @YODL2MSLESS@ YODL2TEXINFO= @YODL2TEXINFO@ YODL2TXT= @YODL2TXT@ ZIP = @ZIP@ diff --git a/lily/VERSION b/lily/VERSION index 027e590313..d67991c8a0 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=7 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index c042666d02..ac00f8bd4b 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -72,3 +72,4 @@ 1.0.6 1.0.6.uu1 1.0.7 +1.0.7.jcn1 diff --git a/stepmake/NEWS b/stepmake/NEWS index 9eaeacf1c8..cc68cff921 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,10 @@ +pl 49 + - use yodl2ms and striproff for txt conversion + - bf: chmod fail + +pl 48 + - bumped version for yodl after various (lily pl7) changes + pl 47 - bf: patch in website after 'make release' - windows ln -> cp diff --git a/stepmake/VERSION b/stepmake/VERSION index 0aaf2231f7..eb46477624 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=47 +PATCH_LEVEL=49 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 06abbe832a..89c324e3d0 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -437,6 +437,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) + AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) else @@ -444,9 +445,10 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_SUBST(YODL2HTML) AC_SUBST(YODL2LATEX) AC_SUBST(YODL2MAN) + AC_SUBST(YODL2MSLESS) AC_SUBST(YODL2TEXINFO) AC_SUBST(YODL2TXT) - export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT + export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT fi if test "x$YODL" = "-echo no yodl"; then AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) diff --git a/stepmake/config.make.in b/stepmake/config.make.in index e15719086f..5ab98dd83a 100644 --- a/stepmake/config.make.in +++ b/stepmake/config.make.in @@ -4,6 +4,7 @@ package-depth = @package_depth@ +USER_CFLAGS = @CFLAGS@ USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ USER_LDFLAGS = @@ -55,6 +56,7 @@ YODL= @YODL@ YODL2HTML= @YODL2HTML@ YODL2LATEX= @YODL2LATEX@ YODL2MAN= @YODL2MAN@ +YODL2MSLESS= @YODL2MSLESS@ YODL2TEXINFO= @YODL2TEXINFO@ YODL2TXT= @YODL2TXT@ ZIP = @ZIP@ diff --git a/stepmake/stepmake/automatically-generated.sub.make b/stepmake/stepmake/automatically-generated.sub.make index 5697a8c765..1bfa90c339 100644 --- a/stepmake/stepmake/automatically-generated.sub.make +++ b/stepmake/stepmake/automatically-generated.sub.make @@ -2,7 +2,7 @@ LINECOMMENT=\# default: - chmod +w $(OUTFILE) + -chmod +w $(OUTFILE) echo "$(LINECOMMENT) WARNING WARNING WARNING WARNING" > $(OUTFILE) echo "$(LINECOMMENT) do not edit! this is $(OUTFILE), generated from $(INFILE)" >> $(OUTFILE) cat $(INFILE) >> $(OUTFILE) diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make index 1f6d77316e..e7ac746247 100644 --- a/stepmake/stepmake/documentation-rules.make +++ b/stepmake/stepmake/documentation-rules.make @@ -8,6 +8,7 @@ $(outdir)/%.gif: %.xpm xpmtoppm $< | ppmtogif > $@ +# use striproff? $(outdir)/%.txt: $(outdir)/%.1 troff -man -Tascii $< | grotty -b -u -o > $@ diff --git a/stepmake/stepmake/yodl-rules.make b/stepmake/stepmake/yodl-rules.make index 34542d3f2b..7daf7974c2 100644 --- a/stepmake/stepmake/yodl-rules.make +++ b/stepmake/stepmake/yodl-rules.make @@ -22,5 +22,7 @@ $(outdir)/%.texinfo: %.yo $(YODL2TEXINFO) -doutdir=$(outdir) --live-data=3 -o $@ $< $(outdir)/%.txt: %.yo - $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $< +# $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $< + $(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< | striproff > $@ + rm -f $(basename $<).ms