Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / website.make

diff --git a/website.make b/website.make
index 3170bc6f6a68afe8dfdf0b78db5d6b52f0e0b05e..b03012d15113382050afb9f5fa76f22c3e3b6e4d 100644 (file)
--- a/website.make
+++ b/website.make
@@ -11,6 +11,8 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   trusted-dir=$(HOME)/lilypond/trusted-scripts
   script-dir=$(trusted-dir)
   texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
+  top-htaccess=$(trusted-dir)/lilypond.org.htaccess
+  dir-htaccess=$(trusted-dir)/website-dir.htaccess
   TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
   EXAMPLES=$(HOME)/media/ly-examples/
   PICTURES=$(HOME)/media/pictures
@@ -18,6 +20,8 @@ else
   ### for normal git
   script-dir=$(top-src-dir)/scripts/build/
   texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+  top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess
+  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/
@@ -27,7 +31,7 @@ endif
 
 ################################################################
 OUT=out-website
-WEB_LANGS=es fr
+WEB_LANGS=es
 
 
 TEXI2HTML=ONLY_WEB=1 TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
@@ -36,6 +40,7 @@ EXTRACT_TEXI_FILENAMES=python $(script-dir)/extract_texi_filenames.py
 CREATE_VERSION=python $(script-dir)/create-version-itexi.py
 CREATE_WEBLINKS=python $(script-dir)/create-weblinks-itexi.py
 MASS_LINK=python $(script-dir)/mass-link.py
+WEB_POST=python $(script-dir)/website_post.py
 
 SERVER_FILES=$(top-src-dir)/Documentation/web/server/
 
@@ -55,18 +60,38 @@ website-xrefs: website-version
        $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
                -I $(OUT) -o $(OUT) --split=node \
                $(top-src-dir)/Documentation/web.texi
-       $(foreach manual, $(MANUALS), \
-               $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
-               -I $(OUT) -o $(OUT) $(manual) && ) :
+       # normal manuals
+       for m in $(MANUALS); do \
+               b=`basename "$$m" .texi`; \
+               d=`basename "$$b" .tely`; \
+               $(EXTRACT_TEXI_FILENAMES) \
+                       -I $(top-src-dir)/Documentation/ \
+                       -I $(top-src-dir)/Documentation/"$$d"/ \
+                       -I $(OUT) -o $(OUT) "$$m" ; \
+       done
        # translations
        for l in $(WEB_LANGS); do \
                $(EXTRACT_TEXI_FILENAMES) \
+                       -I $(top-src-dir)/Documentation/ \
                        -I $(top-src-dir)/Documentation/"$$l" \
                        -I $(OUT) -o $(OUT) --split=node \
                        $(top-src-dir)/Documentation/"$$l"/web.texi ;\
+               for m in $(MANUALS); do \
+                       n=`echo "$$m" | sed 's/Documentation/Documentation\/'$$l'/'` ; \
+                       b=`basename "$$n" .texi`; \
+                       d=`basename "$$b" .tely`; \
+                       if [ -e "$$n" ] ; then \
+                               $(EXTRACT_TEXI_FILENAMES) \
+                               -I $(top-src-dir)/Documentation/ \
+                               -I $(top-src-dir)/Documentation/"$$l" \
+                               -I $(top-src-dir)/Documentation/"$$l"/"$$d"/ \
+                               -I $(OUT) -o $(OUT) "$$n" ; \
+                       fi ; \
+               done; \
        done;
 
 
+
 website-texinfo: website-version website-xrefs
        $(TEXI2HTML) --prefix=index \
                --split=section \
@@ -104,8 +129,13 @@ website-examples:
        mkdir -p $(OUT)/website/ly-examples
        cp $(EXAMPLES)/* $(OUT)/website/ly-examples
 
-website: website-texinfo website-css website-pictures website-examples
+web-post:
+       $(WEB_POST) $(OUT)/website/
+
+website: website-texinfo website-css website-pictures website-examples web-post
        cp $(SERVER_FILES)/favicon.ico $(OUT)/website/
-       cp $(SERVER_FILES)/lilypond.org.htaccess $(OUT)/website/.htaccess
        cp $(SERVER_FILES)/robots.txt $(OUT)/website/
+       cp $(top-htaccess) $(OUT)/.htaccess
+       cp $(dir-htaccess) $(OUT)/website/.htaccess
+