diff options
| -rw-r--r-- | Documentation/topdocs/index.yo | 6 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lily/VERSION | 2 | ||||
| -rw-r--r-- | make/STATE-VECTOR | 1 | ||||
| -rw-r--r-- | stepmake/stepmake/Documentation_targets.make | 14 | ||||
| -rw-r--r-- | stepmake/stepmake/Toplevel.make | 3 |
7 files changed, 22 insertions, 11 deletions
diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo index 74c001b6d5..28f5ea8ee3 100644 --- a/Documentation/topdocs/index.yo +++ b/Documentation/topdocs/index.yo @@ -24,6 +24,7 @@ LilyPond. perhaps lily/VERSION, i.e. without my-patch-level would be best... )url(Download)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz) LilyPond. +Or get the latest url(patch)(DOEXPAND(depth)/DOEXPAND(outdir)/lilypond-@TOPLEVEL_VERSION@.diff.gz). nsubsect(Introduction) @@ -41,7 +42,7 @@ nsect(Sites) description( dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site. -dit(lurl(http://www.digicash.com/~jan/lilypond/))Jan's site. +dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site. ) nsubsubsect(Mirrors) @@ -66,8 +67,7 @@ verb( top_of_NEWS ) - -Go get it at lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/) +Go get it at lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/) nsubsect(Documentation) @@ -1,3 +1,8 @@ +pl 3.jcn1 + - bf: website: empty toplevel readme's + - bf: xs4all (again?) + - can't administer ftp site now: put patch into website + pl 2.uu1 - solaris 2.6 compile/make website fixes. - rm'd WWW.make @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=3 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/lily/VERSION b/lily/VERSION index 7453b04628..d019117582 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=3 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index 2f60c33f24..6e2775ab20 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -64,3 +64,4 @@ 1.0.2 1.0.2.hwn1 1.0.3 +1.0.3.jcn1 diff --git a/stepmake/stepmake/Documentation_targets.make b/stepmake/stepmake/Documentation_targets.make index cdf708b10e..6c2ec85f2e 100644 --- a/stepmake/stepmake/Documentation_targets.make +++ b/stepmake/stepmake/Documentation_targets.make @@ -5,16 +5,20 @@ do-doc: $(OUTTXT_FILES) # ugh. FIXME ifeq ($(strip $(README_TOP_FILES)),) readme-top_FILES-html: +readme-top_FILES-txt: else +readme-top_FILES-txt: + $(foreach i, $(README_TOP_FILES), \ + cp $(depth)/$(i) $(outdir)/$(i).txt && ) true + readme-top_FILES-html: - for i in $(README_TOP_FILES); do \ - $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$$i.txt $(outdir)/$$i.html; \ - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$$i.html; \ - done + $(foreach i, $(README_TOP_FILES), \ + $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$(i).txt $(outdir)/$(i).html && \ + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$(i).html && ) true endif -local-WWW: readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) +local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) echo $^ > $(depth)/wwwlist doc: do-doc diff --git a/stepmake/stepmake/Toplevel.make b/stepmake/stepmake/Toplevel.make index 57049f02d6..450eaf5571 100644 --- a/stepmake/stepmake/Toplevel.make +++ b/stepmake/stepmake/Toplevel.make @@ -27,9 +27,10 @@ htmldoc: $(MAKE) CONFIGSUFFIX='www' local-WWW $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW rm -f `find . -name \*.html~ -print` + -ln -f $(depth)/$(distname).diff.gz out-www 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 - tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` $(shell ls *.gif $(ERRORLOG)) + tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` $(shell ls *.gif (ERRORLOG)) `ls out-www/$(distname).diff.gz $(ERRORLOG)` |