Re: Fix the links to music samples in web-big-page (issue 1663). (issue 5276054)

[julien . rioux]

Reviewers: J_lowe,

Message:
On 2011/10/18 05:48:08, J_lowe wrote:
> Graham,

> This fails at the basic make stage

> ../configure ; make -j7

> I also re-ran make multiple times to see if it was 'one of those
things' but it
> fails the same.

> --snip--

> make[2]: Leaving directory
> `/home/jlowe/lilypond-git/build/Documentation/included'
> make: Entering an unknown directory
> make: *** ly-examples: No such file or directory.  Stop.
> make: Leaving an unknown directory
> make[1]: *** [all] Error 2
> make[1]: Leaving directory
`/home/jlowe/lilypond-git/build/Documentation'
> make: *** [all] Error 2
> address@hidden:~/lilypond-git/build$

> --snip--

I'm trying to investigate but I cannot reproduce your problem. Did the
patch apply properly? If it did it would have created the
Documentation/ly-examples directory. Did configure proceed completely?
It should have created the build/Documentation/ly-examples directory.
Otherwise I don't see how you would get this error. And you also get
this with just `make' instead of `make -j7', rigth?

Thanks,
Regards,
Julien

Description:
Fix the links to music samples in web-big-page (issue 1663).

We move all of Documentation/web/ly-examples to
Documentation/ly-examples
and rework the links for the split manuals. This puts the ly-examples
subdir
on par with the pictures subdir as a top-level subdir.

Please review this at http://codereview.appspot.com/5276054/

Affected files:
  M Documentation/GNUmakefile
  A + Documentation/ly-examples/GNUmakefile
  A + Documentation/ly-examples/ancient-headword.ly
  A + Documentation/ly-examples/aucun-snippet.ly
  A + Documentation/ly-examples/bach-bwv610.ly
  A + Documentation/ly-examples/bach-schenker.ly
  A + Documentation/ly-examples/cary-layout.ily
  A + Documentation/ly-examples/cary.ly
  A + Documentation/ly-examples/chart.ly
  A + Documentation/ly-examples/example-header.ily
  A + Documentation/ly-examples/granados.ly
  A + Documentation/ly-examples/orchestra.ly
  A + Documentation/ly-examples/sesto-full.ly
  A + Documentation/ly-examples/sesto-piano.ly
  A + Documentation/ly-examples/sesto-violin.ly
  A + Documentation/ly-examples/sesto.ily
  A + Documentation/ly-examples/tab-example.ly
  A + Documentation/ly-examples/theory.ly
  M Documentation/web/GNUmakefile
  M make/website.make
  M python/auxiliar/postprocess_html.py


Index: Documentation/GNUmakefile
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index  
8f5006ef80a97c288aaa99908e426dc50c019840..eed10536acb89db85001b35ba77c24c4c01593dc  
100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -12,7 +12,7 @@ LANGS = $(shell $(PYTHON)  
$(top-src-dir)/python/langdefs.py)
 MANUALS_SUBDIRS = usage contributor essay \
   web learning notation extending
 SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \
-  included $(LANGS)
+  included ly-examples $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
 LOCALSTEPMAKE_TEMPLATES = lilypond ly

@@ -228,8 +228,8 @@ $(outdir)/pictures:
 $(outdir)/web.texi: $(outdir)/ly-examples

 $(outdir)/ly-examples:
-       $(MAKE) -C web/ly-examples
-       ln -sf ../web/ly-examples/$(outdir) $@
+       $(MAKE) -C ly-examples
+       ln -sf ../ly-examples/$(outdir) $@
 endif


Index: Documentation/ly-examples/GNUmakefile
diff --git a/Documentation/web/ly-examples/GNUmakefile  
b/Documentation/ly-examples/GNUmakefile
similarity index 97%
rename from Documentation/web/ly-examples/GNUmakefile
rename to Documentation/ly-examples/GNUmakefile
index  
473d16b96764b4aef9644635eda5c6988bedb421..f47ad063523d966aa604fabd596f33d8413933c9  
100644
--- a/Documentation/web/ly-examples/GNUmakefile
+++ b/Documentation/ly-examples/GNUmakefile
@@ -1,4 +1,4 @@
-depth=../../..
+depth=../..
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 include $(depth)/make/stepmake.make

Index: Documentation/ly-examples/ancient-headword.ly
diff --git a/Documentation/web/ly-examples/ancient-headword.ly  
b/Documentation/ly-examples/ancient-headword.ly
similarity index 100%
rename from Documentation/web/ly-examples/ancient-headword.ly
rename to Documentation/ly-examples/ancient-headword.ly
Index: Documentation/ly-examples/aucun-snippet.ly
diff --git a/Documentation/web/ly-examples/aucun-snippet.ly  
b/Documentation/ly-examples/aucun-snippet.ly
similarity index 100%
rename from Documentation/web/ly-examples/aucun-snippet.ly
rename to Documentation/ly-examples/aucun-snippet.ly
Index: Documentation/ly-examples/bach-bwv610.ly
diff --git a/Documentation/web/ly-examples/bach-bwv610.ly  
b/Documentation/ly-examples/bach-bwv610.ly
similarity index 100%
rename from Documentation/web/ly-examples/bach-bwv610.ly
rename to Documentation/ly-examples/bach-bwv610.ly
Index: Documentation/ly-examples/bach-schenker.ly
diff --git a/Documentation/web/ly-examples/bach-schenker.ly  
b/Documentation/ly-examples/bach-schenker.ly
similarity index 100%
rename from Documentation/web/ly-examples/bach-schenker.ly
rename to Documentation/ly-examples/bach-schenker.ly
Index: Documentation/ly-examples/cary-layout.ily
diff --git a/Documentation/web/ly-examples/cary-layout.ily  
b/Documentation/ly-examples/cary-layout.ily
similarity index 100%
rename from Documentation/web/ly-examples/cary-layout.ily
rename to Documentation/ly-examples/cary-layout.ily
Index: Documentation/ly-examples/cary.ly
diff --git a/Documentation/web/ly-examples/cary.ly  
b/Documentation/ly-examples/cary.ly
similarity index 100%
rename from Documentation/web/ly-examples/cary.ly
rename to Documentation/ly-examples/cary.ly
Index: Documentation/ly-examples/chart.ly
diff --git a/Documentation/web/ly-examples/chart.ly  
b/Documentation/ly-examples/chart.ly
similarity index 100%
rename from Documentation/web/ly-examples/chart.ly
rename to Documentation/ly-examples/chart.ly
Index: Documentation/ly-examples/example-header.ily
diff --git a/Documentation/web/ly-examples/example-header.ily  
b/Documentation/ly-examples/example-header.ily
similarity index 100%
rename from Documentation/web/ly-examples/example-header.ily
rename to Documentation/ly-examples/example-header.ily
Index: Documentation/ly-examples/granados.ly
diff --git a/Documentation/web/ly-examples/granados.ly  
b/Documentation/ly-examples/granados.ly
similarity index 100%
rename from Documentation/web/ly-examples/granados.ly
rename to Documentation/ly-examples/granados.ly
Index: Documentation/ly-examples/orchestra.ly
diff --git a/Documentation/web/ly-examples/orchestra.ly  
b/Documentation/ly-examples/orchestra.ly
similarity index 100%
rename from Documentation/web/ly-examples/orchestra.ly
rename to Documentation/ly-examples/orchestra.ly
Index: Documentation/ly-examples/sesto-full.ly
diff --git a/Documentation/web/ly-examples/sesto-full.ly  
b/Documentation/ly-examples/sesto-full.ly
similarity index 100%
rename from Documentation/web/ly-examples/sesto-full.ly
rename to Documentation/ly-examples/sesto-full.ly
Index: Documentation/ly-examples/sesto-piano.ly
diff --git a/Documentation/web/ly-examples/sesto-piano.ly  
b/Documentation/ly-examples/sesto-piano.ly
similarity index 100%
rename from Documentation/web/ly-examples/sesto-piano.ly
rename to Documentation/ly-examples/sesto-piano.ly
Index: Documentation/ly-examples/sesto-violin.ly
diff --git a/Documentation/web/ly-examples/sesto-violin.ly  
b/Documentation/ly-examples/sesto-violin.ly
similarity index 100%
rename from Documentation/web/ly-examples/sesto-violin.ly
rename to Documentation/ly-examples/sesto-violin.ly
Index: Documentation/ly-examples/sesto.ily
diff --git a/Documentation/web/ly-examples/sesto.ily  
b/Documentation/ly-examples/sesto.ily
similarity index 100%
rename from Documentation/web/ly-examples/sesto.ily
rename to Documentation/ly-examples/sesto.ily
Index: Documentation/ly-examples/tab-example.ly
diff --git a/Documentation/web/ly-examples/tab-example.ly  
b/Documentation/ly-examples/tab-example.ly
similarity index 100%
rename from Documentation/web/ly-examples/tab-example.ly
rename to Documentation/ly-examples/tab-example.ly
Index: Documentation/ly-examples/theory.ly
diff --git a/Documentation/web/ly-examples/theory.ly  
b/Documentation/ly-examples/theory.ly
similarity index 100%
rename from Documentation/web/ly-examples/theory.ly
rename to Documentation/ly-examples/theory.ly
Index: Documentation/web/GNUmakefile
diff --git a/Documentation/web/GNUmakefile b/Documentation/web/GNUmakefile
index  
0435d9170299dacafee7d6e87c87d79ca81d588c..278256fb91b4a97bcffc7ee8473002fa8d4fa9c2  
100644
--- a/Documentation/web/GNUmakefile
+++ b/Documentation/web/GNUmakefile
@@ -2,7 +2,7 @@ depth = ../..

 LOCALSTEPMAKE_TEMPLATES = ly

-SUBDIRS = ly-examples server
+SUBDIRS = server
 include $(depth)/make/stepmake.make

 #OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
Index: make/website.make
diff --git a/make/website.make b/make/website.make
index  
0b164e44a81c95a68038926475794abf8b92c415..f7eaf65f2be973dfe0974d4230919a5fb812bacc  
100644
--- a/make/website.make
+++ b/make/website.make
@@ -29,7 +29,7 @@ else
   dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess
   include $(config_make)
   # I assume this is run from top-build-dir
-  EXAMPLES=Documentation/web/ly-examples/out-www
+  EXAMPLES=Documentation/ly-examples/out-www
   PICTURES=Documentation/pictures/out-www
 endif

Index: python/auxiliar/postprocess_html.py
diff --git a/python/auxiliar/postprocess_html.py  
b/python/auxiliar/postprocess_html.py
index  
de3848537cb2f466fd8816414bc6519147c30ea9..ea5b93c1d3dc3817711091056a2ead2e4fb16d04  
100644
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -103,6 +103,7 @@ def source_links_replace (m, source_val):

 # More hardcoding, yay!
 split_docs_re = re.compile('(Documentation/out-www/(automated-engraving| 
essay|notation|changes|extending|music-glossary|usage|web|learning|snippets| 
contributor))/')
+lily_examples_re = re.compile ('(href|src)="(ly-examples/.*?)"')
 lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"')
 pictures_re = re.compile ('src="(pictures/.*?)"')

@@ -114,7 +115,9 @@ manuals_page_link_re = re.compile  
(r'href="((?:\.\./)+)Documentation/web/manuals
 # Get rid of symlinks in GNUmakefile.in (local-WWW-post)
 # this also fixes missing PNGs only present in translated docs
 def hack_urls (s, prefix, target, is_development_branch):
+    # fix image links
     if split_docs_re.match (prefix):
+        s = lily_examples_re.sub ('\\1="../\\2"', s)
         s = lily_snippets_re.sub ('\\1="../\\2"', s)
         s = pictures_re.sub ('src="../\\1"', s)