Doc build: add macros for stable/unstable version numbers.

This is ugly, but it works.  We'll add a graceful way to do this
once people have the waf stuff working.

diff --git a/Documentation/general.texi b/Documentation/general.texi
index a06f035a026f7f560911519a035b2086d253a7d6..e727fcbed10fcdd730770ac977c70ecb299e4a52 100644 (file)
--- a/Documentation/general.texi
+++ b/Documentation/general.texi
@@ -120,15 +120,15 @@ RSS.
 
 @subsubheading Stable
 
-@ref{Download, Download 2.12.3}
+@ref{Download, Download @versionStable}
 
-@ref{Manuals, Manuals 2.12.3}
+@ref{Manuals, Manuals @versionStable}
 
 @subsubheading Unstable
 
-@ref{Development, Download 2.13.2}
+@ref{Development, Download @versionDevel}
 
-@ref{Development, Manuals 2.13.2}
+@ref{Development, Manuals @versionDevel}
 
 @divEnd
 

diff --git a/Documentation/general/download.itexi b/Documentation/general/download.itexi
index 2cb00eaa6b4ca4985e431c063538e31a489d5232..99a70267b8a6c7a742f97a08d0e56a8530e90696 100644 (file)
--- a/Documentation/general/download.itexi
+++ b/Documentation/general/download.itexi
@@ -10,7 +10,7 @@
 @unnumbered Download
 
 @divClass{heading-center}
-@heading Downloads for LilyPond 2.12.2
+@heading Downloads for LilyPond @versionStable
 
 @divEnd
 
@@ -66,8 +66,8 @@ latest unstable version
 
 @subheading Software License
 
-LilyPond is published under the @ref{GPL, GNU General Public
-License}.
+LilyPond is published under the
+@ref{GPL, GNU General Public License}.
 @divEnd
 
 
@@ -138,28 +138,28 @@ package manager.
 
 @item
 @sourceimage{logo-linux,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/linux-x86/lilypond-2.12.2-1.linux-x86.sh,
-Linux x86: LilyPond 2.12.2} (if in doubt, use this)
+@uref{http://download.linuxaudio.org/lilypond/binaries/linux-x86/lilypond-@versionStable{}-1.linux-x86.sh,
+Linux x86: LilyPond @versionStable{}} (if in doubt, use this)
 
 @item
 @sourceimage{logo-linux,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/linux-64/lilypond-2.12.2-1.linux-64.sh,
-Linux 64-bit: LilyPond 2.12.2}
+@uref{http://download.linuxaudio.org/lilypond/binaries/linux-64/lilypond-@versionStable{}-1.linux-64.sh,
+Linux 64-bit: LilyPond @versionStable{}}
 
 @item
 @sourceimage{logo-linux,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/linux-ppc/lilypond-2.12.2-1.linux-ppc.sh,
-Linux PPC: LilyPond 2.12.2}
+@uref{http://download.linuxaudio.org/lilypond/binaries/linux-ppc/lilypond-@versionStable{}-1.linux-ppc.sh,
+Linux PPC: LilyPond @versionStable{}}
 
 @item
 @sourceimage{logo-freebsd,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-x86/lilypond-2.12.2-1.freebsd-x86.sh,
-FreeBSD i386: LilyPond 2.12.2}
+@uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-x86/lilypond-@versionStable{}-1.freebsd-x86.sh,
+FreeBSD i386: LilyPond @versionStable{}}
 
 @item
 @sourceimage{logo-freebsd,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-64/lilypond-2.12.2-1.freebsd-64.sh,
-FreeBSD amd64: LilyPond 2.12.2}
+@uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-64/lilypond-@versionStable{}-1.freebsd-64.sh,
+FreeBSD amd64: LilyPond @versionStable{}}
 
 @end itemize
 
@@ -170,7 +170,7 @@ In the shell, type:
 
 @example
 cd PATH-TO-DOWNLOAD-DIRECTORY
-sh lilypond-X.Y.Z-EXAMPLE.sh
+sh lilypond-@versionStable{}-OS-TYPE.sh
 @end example
 
 @subsubheading Uninstall
@@ -250,15 +250,15 @@ acknowledged.
 @item
 @sourceimage{logo-macosx,,,}
 @uref{
-http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-2.12.2-1.darwin-x86.tar.bz2,
-lilypond-2.12.2-1.darwin-x86.tar.bz2}
+http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-@versionStable{}-1.darwin-x86.tar.bz2,
+lilypond-@versionStable{}.darwin-x86.tar.bz2}
 For Intel chips (if in doubt, use this).
 
 @item
 @sourceimage{logo-macosx,,,}
 @uref{
-http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-2.12.2-1.darwin-ppc.tar.bz2,
-lilypond-2.12.2-1.darwin-ppc.tar.bz2}
+http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-@versionStable{}-1.darwin-ppc.tar.bz2,
+lilypond-@versionStable{}.darwin-ppc.tar.bz2}
 For G3 and G4 CPUs (old Apple computers).
 
 @end itemize
@@ -390,8 +390,8 @@ acknowledged.
 @item
 @sourceimage{logo-windows,,,}
 @uref{
-http://download.linuxaudio.org/lilypond/binaries/mingw/lilypond-2.12.2-1.mingw.exe,
-lilypond-2.12.2-1.mingw-exe}
+http://download.linuxaudio.org/lilypond/binaries/mingw/lilypond-@versionStable{}-1.mingw.exe,
+lilypond-@versionStable{}.mingw-exe}
 For Windows ME, NT, 2000, XP, and Vista.
 
 @end itemize
@@ -483,8 +483,8 @@ pre-built version.}
 @divClass{column-left-bottom}
 @subheading Source tarball
 
-@uref{http://download.linuxaudio.org/lilypond/sources/v2.12/lilypond-2.12.2.tar.gz,
-lilypond-2.12.2-source.tar.bz2}
+FIXME link @uref{http://download.linuxaudio.org/lilypond/sources/v2.12/lilypond-@versionStable{}.tar.gz,
+lilypond-@versionStable{}-source.tar.bz2}
 
 For an extensive listing of all versions (old and new), see our
 @uref{http://download.linuxaudio.org/lilypond/binaries/, download

diff --git a/Documentation/general/manuals.itexi b/Documentation/general/manuals.itexi
index d1b8be02f5838a62a0c0ab72bc2361a602d8bba3..fea6a680243a5b34b72a65eb5766e4573fdf4793 100644 (file)
--- a/Documentation/general/manuals.itexi
+++ b/Documentation/general/manuals.itexi
@@ -10,7 +10,7 @@
 @unnumbered Manuals
 
 @divClass{heading-center}
-@heading Documentation for LilyPond 2.12.2
+@heading Documentation for LilyPond @version
 
 @divEnd
 

diff --git a/VERSION b/VERSION
index 2c53ad635836bdea9c41db1ee15c90fafe39aab0..9e60b952d474da9ae4913c3c16598920eb58745a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,4 +3,5 @@ MAJOR_VERSION=2
 MINOR_VERSION=13
 PATCH_LEVEL=4
 MY_PATCH_LEVEL=
-
+VERSION_STABLE=2.12.2
+VERSION_DEVEL=2.13.3

diff --git a/make/toplevel-version.make b/make/toplevel-version.make
index 176ad185d143d4863cce2c815f0bf640a2d152a9..e23347d3fdd5e3fc7fbca9f3f13483b8bbe909e9 100644 (file)
--- a/make/toplevel-version.make
+++ b/make/toplevel-version.make
@@ -11,3 +11,7 @@ TOPLEVEL_MINOR_VERSION=$(MINOR_VERSION)
 TOPLEVEL_PATCH_LEVEL=$(PATCH_LEVEL)
 # use to send patches, always empty for released version:
 TOPLEVEL_MY_PATCH_LEVEL=$(MY_PATCH_LEVEL)
+
+# TODO: used for the website; John says that he'll rewrite this
+TOPLEVEL_VERSION_STABLE=$(VERSION_STABLE)
+TOPLEVEL_VERSION_DEVEL=$(VERSION_DEVEL)

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index c0ae34e40394c8e3daedf86ce93bbf8238ba59c0..e3c602a6f7c653976073dd8406d09299ed754f95 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -62,6 +62,14 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
        echo '@macro version'> $@
        echo $(TOPLEVEL_VERSION)>> $@
        echo '@end macro'>> $@
+       echo ''>> $@
+       echo '@macro versionStable'>> $@
+       echo $(TOPLEVEL_VERSION_STABLE)>> $@
+       echo '@end macro'>> $@
+       echo ''>> $@
+       echo '@macro versionDevel'>> $@
+       echo $(TOPLEVEL_VERSION_DEVEL)>> $@
+       echo '@end macro'>> $@
 
 .SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi \
   $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep \