From 859d050f0220c0b45c52a37b9825482eec0fea8c Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Fri, 9 Jan 2009 20:32:27 +0100 Subject: [PATCH] Add Contributors' Guide stub and clean up makefiles * add Contributors' Guide stub in new directory Documentation/devel/; * move Documentation/devel.html.in to Documentation/devel/index.html.in to avoid clashing directory and file names on lilypond.org; * cleanup topdocs and Texinfo makefiles; * fix links accordingly; * fix 'make dist'. --- Documentation/GNUmakefile | 4 +-- Documentation/de/index.html.in | 2 +- Documentation/devel/GNUmakefile | 21 ++++++++++++++++ Documentation/devel/contrib-guide.texi | 16 ++++++++++++ .../{devel.html.in => devel/index.html.in} | 25 ++++++++++++++----- Documentation/es/index.html.in | 2 +- Documentation/fr/index.html.in | 2 +- Documentation/index.html.in | 2 +- Documentation/topdocs/GNUmakefile | 4 --- GNUmakefile.in | 3 ++- scripts/build/www_post.py | 14 ++++++++--- stepmake/stepmake/texinfo-rules.make | 12 +++++---- stepmake/stepmake/texinfo-targets.make | 2 +- stepmake/stepmake/texinfo-vars.make | 4 ++- stepmake/stepmake/topdocs-vars.make | 1 + tex/GNUmakefile | 2 +- 16 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 Documentation/devel/GNUmakefile create mode 100644 Documentation/devel/contrib-guide.texi rename Documentation/{devel.html.in => devel/index.html.in} (78%) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 790b046047..747a8e304e 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -2,7 +2,7 @@ depth = .. NAME = documentation LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py) -SUBDIRS=user bibliography pictures topdocs misc po $(LANGS) +SUBDIRS=devel user bibliography pictures topdocs misc po $(LANGS) STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' @@ -11,7 +11,7 @@ EXTRA_DIST_FILES= TRANSLATION include $(depth)/make/stepmake.make -HTML_PAGE_NAMES= index devel translations +HTML_PAGE_NAMES= index translations OUT_HTML_FILES= $(HTML_PAGE_NAMES:%=$(outdir)/%.html) OUT_CSS_FILES= $(CSS_FILES:%.css=$(outdir)/%.css) diff --git a/Documentation/de/index.html.in b/Documentation/de/index.html.in index ee95ddede8..5d9bae5359 100644 --- a/Documentation/de/index.html.in +++ b/Documentation/de/index.html.in @@ -100,7 +100,7 @@ als PDF) diff --git a/Documentation/devel/GNUmakefile b/Documentation/devel/GNUmakefile new file mode 100644 index 0000000000..5c10ebef9c --- /dev/null +++ b/Documentation/devel/GNUmakefile @@ -0,0 +1,21 @@ +depth = ../.. + +STEPMAKE_TEMPLATES = documentation tex texinfo topdocs +LOCALSTEPMAKE_TEMPLATES = ly + +include $(depth)/make/stepmake.make + +HTML_PAGE_NAMES = index +OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html) + + +MASTER_TEXI_FILES = contrib-guide.texi +PDF_FILES = $(MASTER_TEXI_FILES:%.texi=$(outdir)/%.pdf) +HTML_FILES = $(MASTER_TEXI_FILES:%.texi=$(outdir)/%/index.html) \ + $(MASTER_TEXI_FILES:%.texi=$(outdir)/%-big-page.html) + +default: local-doc + +local-WWW-1: $(PDF_FILES) + +local-WWW-2: $(HTML_FILES) $(OUT_HTML_FILES) diff --git a/Documentation/devel/contrib-guide.texi b/Documentation/devel/contrib-guide.texi new file mode 100644 index 0000000000..6e8ec88788 --- /dev/null +++ b/Documentation/devel/contrib-guide.texi @@ -0,0 +1,16 @@ +\input texinfo @c -*- coding: utf-8; mode: texinfo; -*- +@setfilename contrib-guide.info +@settitle LilyPond Contributors' Guide + +@include macros.itexi + +@documentencoding utf-8 +@documentlanguage en + +@finalout + +@node Top +@top LilyPond Contributors' Guide + + +@bye diff --git a/Documentation/devel.html.in b/Documentation/devel/index.html.in similarity index 78% rename from Documentation/devel.html.in rename to Documentation/devel/index.html.in index 703a3d776f..3cc188d826 100644 --- a/Documentation/devel.html.in +++ b/Documentation/devel/index.html.in @@ -28,27 +28,40 @@

+ + + + +
+
+ Contributors' + Guide + (in one + big page, in PDF) +
(how to participate in development) +
+ @@ -78,7 +91,7 @@ and Go back to the Documentation index.

+

Go back to the Documentation index.

diff --git a/Documentation/es/index.html.in b/Documentation/es/index.html.in index d5721ba5f4..5c987014e9 100644 --- a/Documentation/es/index.html.in +++ b/Documentation/es/index.html.in @@ -93,7 +93,7 @@ diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in index f01889be69..da2d55073c 100644 --- a/Documentation/fr/index.html.in +++ b/Documentation/fr/index.html.in @@ -91,7 +91,7 @@ au format PDF)