From b66b5013d3800245b2f185e2d86aa55a743cd8b5 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 17 Sep 1998 13:34:50 +0200 Subject: [PATCH] patch::: 1.0.8.jcn3: png pl 8.jcn3 - gif -> png * ps-to-pngs.sh * stepmake * website * yodl-1.31.4 (to be released) - target 'texinfo' -> 'info' --- Documentation/GNUmakefile | 2 +- Documentation/pictures/GNUmakefile | 5 +++- NEWS | 8 +++++++ VERSION | 2 +- aclocal.m4 | 5 ++-- buildscripts/ps-to-gifs.sh | 24 ++++++++++++------- buildscripts/ps-to-pngs.sh | 4 ++++ config.make.in | 2 +- lily/VERSION | 2 +- make/STATE-VECTOR | 1 + make/lilypond.spec.in | 2 +- make/mutopia-rules.make | 5 ++++ make/mutopia-targets.make | 2 +- make/mutopia-vars.make | 1 + make/substitute.make | 1 + stepmake/NEWS | 4 ++++ stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 5 ++-- stepmake/bin/package-zip.sh | 1 + stepmake/bin/package-zip32.sh | 3 +++ stepmake/config.make.in | 1 + stepmake/stepmake/documentation-rules.make | 5 +++- stepmake/stepmake/yolily-topdoc-targets.make | 2 +- .../stepmake/yolily-toplevel-targets.make | 2 +- 24 files changed, 68 insertions(+), 23 deletions(-) create mode 100644 buildscripts/ps-to-pngs.sh diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 22da57bfe0..76f54de971 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -16,5 +16,5 @@ include $(depth)/make/stepmake.make default: do-doc -texinfo: $(outdir)/$(package).info +info: $(outdir)/$(package).info diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile index a4fceddda3..488c762d9b 100644 --- a/Documentation/pictures/GNUmakefile +++ b/Documentation/pictures/GNUmakefile @@ -3,14 +3,17 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation XPM_FILES=$(wildcard *.xpm) OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif)) +OUTPNG_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.png)) EXTRA_DIST_FILES= $(XPM_FILES) include $(depth)/make/stepmake.make gifs: $(OUTGIF_FILES) +pngs: $(OUTPNG_FILES) -local-WWW: $(OUTGIF_FILES) +# local-WWW: $(OUTGIF_FILES) +local-WWW: $(OUTPNG_FILES) icon: $(outdir)/lelie_icon.gif cp $< $(depth)/$(outdir)/$(package)-icon.gif diff --git a/NEWS b/NEWS index 1f7ae3d063..b3d7bc26f3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +pl 8.jcn3 + - gif -> png + * ps-to-pngs.sh + * stepmake + * website + * yodl-1.31.4 (to be released) + - target 'texinfo' -> 'info' + pl 8.jcn2 - more doco in texinfo (with yodl pl3) - bf's: package-diff diff --git a/VERSION b/VERSION index bac268857a..e11ea79acb 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=8 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # 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 3f1287644c..03df5805ab 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -264,8 +264,9 @@ dnl fi AC_SUBST(LN) AC_SUBST(LN_S) AC_SUBST(INSTALL) - AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') - AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') + AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') + AC_SUBST(PATHSEP) + AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') AC_STEPMAKE_DATADIR diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh index 675d40e91f..12ea577339 100755 --- a/buildscripts/ps-to-gifs.sh +++ b/buildscripts/ps-to-gifs.sh @@ -1,14 +1,16 @@ #!/bin/sh -# ps-to-gifs, convert PS to multiple gifs - +# ps-to-gifs, convert PS to multiple gifs or other bitmaps + usage() { cat < $OUTFILE +# cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE PPMS=`ls $BASE*ppm` for i in $PPMS; do - o=`dirname $i`/`basename $i .ppm`.gif - cat $i | pnmscale 0.5 | $CROP | ppmtogif $color > $o + o=`dirname $i`/`basename $i .ppm`.$GIF + cat $i | pnmscale 0.5 | $CROP | $PNMTOGIF $color > $o rm $i done if [ "x$OUTFILE" != "x" ]; then - mv $BASE-page1.gif $BASE.gif + mv $BASE-page1.$GIF $BASE.$GIF fi diff --git a/buildscripts/ps-to-pngs.sh b/buildscripts/ps-to-pngs.sh new file mode 100644 index 0000000000..2a3f3636b5 --- /dev/null +++ b/buildscripts/ps-to-pngs.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# ps-to-pngs, convert PS to multiple pngs + +ps-to-gifs --png $* diff --git a/config.make.in b/config.make.in index b0f83348dd..1cc983d7c5 100644 --- a/config.make.in +++ b/config.make.in @@ -48,6 +48,7 @@ FLEX = @FLEX@ LN = @LN@ LN_S = @LN_S@ MSGFMT = @MSGFMT@ +PATHSEP = @PATHSEP@ PERL = @PERL@ PYTHON = @PYTHON@ TAR= @TAR@ @@ -60,5 +61,4 @@ YODL2MSLESS= @YODL2MSLESS@ YODL2TEXINFO= @YODL2TEXINFO@ YODL2TXT= @YODL2TXT@ ZIP = @ZIP@ -PATHSEP = @PATHSEP@ diff --git a/lily/VERSION b/lily/VERSION index bac268857a..e11ea79acb 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=8 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # 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 cc14282125..fa757cbc1e 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -79,3 +79,4 @@ 1.0.8 1.0.8.jcn1 1.0.8.jcn2 +1.0.8.jcn3 diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index 4f47dcb672..1864cc4b32 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -19,7 +19,7 @@ Prereq: tetex %build ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/' make all -make -C Documentation texinfo || true +make -C Documentation info || true make htmldoc %install diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index 0b16e7e68a..23887b901c 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -5,6 +5,11 @@ $(outdir)/%.gif: $(outdir)/%.ps -mv $(name-stem)-page*.gif $(outdir)/ touch $@ +$(outdir)/%.png: $(outdir)/%.ps + sh $(buildscripts)/ps-to-pngs.sh $< + -mv $(name-stem)-page*.png $(outdir)/ + touch $@ + $(outdir)/%.ly.txt: %.ly ln -f $< $@ diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 541d10b016..11b4a35299 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -3,7 +3,7 @@ all: $(OUT_FILES) -local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(gif_examples) +local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples) (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples)) $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html echo $^ > $(depth)/wwwlist diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make index 92ef7c0e5a..d140f286cf 100644 --- a/make/mutopia-vars.make +++ b/make/mutopia-vars.make @@ -17,6 +17,7 @@ all_examples=$(flexamples) $(examples) ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples))) gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples))) +png_examples=$(addprefix $(outdir)/, $(addsuffix .png, $(all_examples))) html_subdirs=$(addprefix --subdirs ,$(SUBDIRS)) diff --git a/make/substitute.make b/make/substitute.make index 92df5d2cef..0a11afa384 100644 --- a/make/substitute.make +++ b/make/substitute.make @@ -11,6 +11,7 @@ ATVARIABLES = \ DIR_DATADIR\ PACKAGE\ package\ + PATHSEP\ PERL\ PYTHON\ SHELL\ diff --git a/stepmake/NEWS b/stepmake/NEWS index cc68cff921..ac662d058d 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,7 @@ +pl 50 + - bf's: PATHSEP + - png + pl 49 - use yodl2ms and striproff for txt conversion - bf: chmod fail diff --git a/stepmake/VERSION b/stepmake/VERSION index eb46477624..a044234f74 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=49 +PATCH_LEVEL=50 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 89c324e3d0..fc6b9f387c 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -262,8 +262,9 @@ dnl fi AC_SUBST(LN) AC_SUBST(LN_S) AC_SUBST(INSTALL) - AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') - AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') + AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') + AC_SUBST(PATHSEP) + AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') AC_STEPMAKE_DATADIR diff --git a/stepmake/bin/package-zip.sh b/stepmake/bin/package-zip.sh index f8c800118a..e325688fdd 100644 --- a/stepmake/bin/package-zip.sh +++ b/stepmake/bin/package-zip.sh @@ -44,6 +44,7 @@ export PATH=/usr/doos/bin:$PATH ./configure --host=i386-pc-linux --target=i386-pc-cygwin32 --prefix=/usr --enable-debugging --enable-printing --enable-checking make +make -C Documentation info || true rm -rf $builddir make prefix="$builddir/usr" DOTEXE=.exe install make prefix="$builddir/usr" installextradoc diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh index 0c2556ca51..60174c018c 100644 --- a/stepmake/bin/package-zip32.sh +++ b/stepmake/bin/package-zip32.sh @@ -50,6 +50,9 @@ if ! make ; then exit 1 fi +# failure allowed +make -C Documentation info + if ! make install ; then echo "make install failed" exit 1 diff --git a/stepmake/config.make.in b/stepmake/config.make.in index 5ab98dd83a..1cc983d7c5 100644 --- a/stepmake/config.make.in +++ b/stepmake/config.make.in @@ -48,6 +48,7 @@ FLEX = @FLEX@ LN = @LN@ LN_S = @LN_S@ MSGFMT = @MSGFMT@ +PATHSEP = @PATHSEP@ PERL = @PERL@ PYTHON = @PYTHON@ TAR= @TAR@ diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make index e7ac746247..2cb0849430 100644 --- a/stepmake/stepmake/documentation-rules.make +++ b/stepmake/stepmake/documentation-rules.make @@ -3,11 +3,14 @@ # special rules for the documentation section. # There are too many to add to the general rules -.SUFFIXES: .1 .data .html .gif .xpm .tex .txt +.SUFFIXES: .1 .data .html .gif .png .tex .txt .xpm $(outdir)/%.gif: %.xpm xpmtoppm $< | ppmtogif > $@ +$(outdir)/%.png: %.xpm + xpmtoppm $< | pnmtopng > $@ + # use striproff? $(outdir)/%.txt: $(outdir)/%.1 troff -man -Tascii $< | grotty -b -u -o > $@ diff --git a/stepmake/stepmake/yolily-topdoc-targets.make b/stepmake/stepmake/yolily-topdoc-targets.make index 447b7e4316..19fcff909b 100644 --- a/stepmake/stepmake/yolily-topdoc-targets.make +++ b/stepmake/stepmake/yolily-topdoc-targets.make @@ -10,7 +10,7 @@ $(outdir)/%.html: %.yo $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --news=$(depth)/NEWS $@ local-WWW: - -cp $(outdir)/*gif $(outdir)/index.html $(depth) # don't fail if not making website + -cp $(outdir)/*png $(outdir)/index.html $(depth) # don't fail if not making website copy-to-top: diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make index c41b64867c..a11f4896c1 100644 --- a/stepmake/stepmake/yolily-toplevel-targets.make +++ b/stepmake/stepmake/yolily-toplevel-targets.make @@ -19,7 +19,7 @@ htmldoc: find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist -ln -f $(patch-dir)/$(distname).diff.gz out-www -ln -f $(depth)/$(distname).diff.gz out-www - tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.gif out-www/$(distname).diff.gz $(ERRORLOG)` index.html + tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.png out-www/$(distname).diff.gz $(ERRORLOG)` index.html # if you fix this, please fix yodl too! -- 2.39.2