From: Graham Percival <graham@percival-music.ca>
Date: Sat, 19 Dec 2009 00:07:00 +0000 (+0000)
Subject: Web build: version-specific links implemented for Devel.
X-Git-Tag: release/2.13.10-1~153
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3b844c5f07ef3c9f8b53a3e2f53901192fdc3dce;p=lilypond.git

Web build: version-specific links implemented for Devel.
---

diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index 717b1d9202..5ba7eefd87 100644
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -596,53 +596,57 @@ the latest binary:
 
 @subheading Manuals
 
-@help {these need the automatic symlinks or something.  Maybe even
-a hard-coded url to lilypond.org/docs/2.13 or something??}
-
-Commented out pending a real fix
-@ignore
-
 Learning:
-@uref{lm-html, html}
-@uref{lm-big-html, big html}
-@uref{lm-pdf, pdf}
+@manualDevelLearningSplit
+@manualDevelLearningBig
+@manualDevelLearningPdf
 
 Glossary:
-@uref{mg-html, html}
-@uref{mg-big-html, big html}
-@uref{mg-pdf, pdf}
+@manualDevelGlossarySplit
+@manualDevelGlossaryBig
+@manualDevelGlossaryPdf
 
 Essay:
-@uref{essay-html, html}
-@uref{essay-big-html, big html}
-@uref{essay-pdf, pdf}
+@manualDevelEssaySplit
+@manualDevelEssayBig
+@manualDevelEssayPdf
+
 
 Notation:
-@uref{notation-html, html}
-@uref{notation-big-html, big html}
-@uref{notation-pdf, pdf}
+@manualDevelNotationSplit
+@manualDevelNotationBig
+@manualDevelNotationPdf
 
 Usage:
-@uref{usage-html, html}
-@uref{usage-big-html, big html}
-@uref{usage-pdf, pdf}
+@manualDevelUsageSplit
+@manualDevelUsageBig
+@manualDevelUsagePdf
 
 Snippets:
-@uref{snippets-html, html}
-@uref{snippets-big-html, big html}
-@uref{snippets-pdf, pdf}
+@manualDevelSnippetsSplit
+@manualDevelSnippetsBig
+@manualDevelSnippetsPdf
+
+
+Web:
+@manualDevelWebSplit
+@manualDevelWebBig
+@manualDevelWebPdf
 
 Changes:
-@uref{changes-html, html}
-@uref{changes-big-html, big html}
-@uref{changes-pdf, pdf}
+@manualDevelChangesSplit
+@manualDevelChangesBig
+@manualDevelChangesPdf
 
-Internals:
-@uref{internals-html, html}
-@uref{internals-big-html, big html}
-@uref{internals-pdf, pdf}
+Extend:
+@manualDevelExtendingSplit
+@manualDevelExtendingBig
+@manualDevelExtendingPdf
 
-@end ignore
+Internals:
+@manualDevelInternalsSplit
+@manualDevelInternalsBig
+@manualDevelInternalsPdf
 
 @divEnd
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3c4e412a94..2538c22cba 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -124,6 +124,7 @@ WWW-post:
 	find $(outdir) -name '*-root' | xargs rm -rf
 	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
 	find $(outdir)/offline-root -type l -delete
+	cd $(outdir)/offline-root/Documentation && ln -sf ./ v$(MAJOR_VERSION).$(MINOR_VERSION)
 endif # ifeq ($(out),www)
 
 # For those who cannot for the life in them remember to type
diff --git a/scripts/build/create-version-itexi.py b/scripts/build/create-version-itexi.py
index 3cfbd5d5e0..60eb107c27 100644
--- a/scripts/build/create-version-itexi.py
+++ b/scripts/build/create-version-itexi.py
@@ -19,7 +19,7 @@ topDir = os.path.abspath( topDir )
 manuals = map(lambda x: os.path.splitext(x)[0],
               map(os.path.basename,
                   glob.glob(os.path.join(topDir,'Documentation', '*.te??'))))
-manuals = map(lambda x: 'glossary' if x=='music-glossary' else x, manuals)
+#manuals = map(lambda x: 'glossary' if x=='music-glossary' else x, manuals)
 manuals.append('internals')
 
 
@@ -83,9 +83,9 @@ def make_ver_link(macroname, version, url, linktext):
 	string = "@uref{"
 	# TODO: generalize this
 	if (version[:4] == '2.13'):
-		string += '../../v2.13/'
+		string += '../v2.13/'
 	if (version[:4] == '2.12'):
-		string += '../../v2.12/'
+		string += '../v2.12/'
 	string += url
 	string += ","
 	string += linktext
@@ -93,13 +93,16 @@ def make_ver_link(macroname, version, url, linktext):
 	make_macro(macroname, string)
 
 def make_manual_links(name, version):
-	for manual in manuals:
-		make_ver_link("manual"+name+manual.capitalize()+'Pdf', version,
+	for m in manuals:
+		# FIXME: this is disgusting
+		manual = m
+		mshort = 'glossary' if m=='music-glossary' else m
+		make_ver_link("manual"+name+mshort.capitalize()+'Pdf', version,
 		          manual + '.pdf', manual+'.pdf')
-		make_ver_link("manual"+name+manual.capitalize()+'Split', version,
-		          manual + ' (split HTML)', manual+'/')
-		make_ver_link("manual"+name+manual.capitalize()+'Big', version,
-		          manual + ' (big HTML)', manual+'-one-big-page.html')
+		make_ver_link("manual"+name+mshort.capitalize()+'Split', version,
+		          manual+'/index.html', manual+' (split HTML)')
+		make_ver_link("manual"+name+mshort.capitalize()+'Big', version,
+		          manual+'-big-page.html', manual + ' (big HTML)')
 
 
 print "@c ************************ Version numbers ************"