X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=2928f53b064d10e00def3dc263faf5606c978a7e;hb=f7294c3f773b4ab81784a50808af08eb5bb9ac82;hp=54a535e3f42cef90da19cdf02cec20962c35c674;hpb=2683b1203cf10324e3106b4aa37a2b82f92432fd;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index 54a535e3f4..2928f53b06 100644
--- a/make/website.make
+++ b/make/website.make
@@ -6,7 +6,7 @@
 ################################################################
 ifeq ($(WEBSITE_ONLY_BUILD),1)
   ### for lilypond.org
-  TOP_SRC_DIR=$(HOME)/src/lilypond
+  TOP_SRC_DIR=$(HOME)/lilypond/lilypond-git
   TRUSTED_DIR=$(HOME)/lilypond/trusted-scripts
   top-src-dir=$(TOP_SRC_DIR)
   depth=.
@@ -35,8 +35,8 @@ endif
 OUT=out-website
 
 ### only update this when the language compiles correctly!
-#WEB_LANGS = es fr nl
-WEB_LANGS = es nl
+# LANGUAGES = (site, de, es, fr, hu, it, ja, nl)
+WEB_LANGS = es fr it nl de
 
 TEXI2HTML=ONLY_WEB=1 TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 
@@ -45,6 +45,7 @@ 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
+WEB_BIBS=python $(script-dir)/bib2texi.py
 
 SERVER_FILES=$(top-src-dir)/Documentation/web/server/
 
@@ -61,20 +62,7 @@ website-version:
 	$(CREATE_WEBLINKS) $(top-src-dir) > $(OUT)/weblinks.itexi
 
 website-xrefs: website-version
-	$(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
-		-I $(OUT) -o $(OUT) --split=node \
-		$(top-src-dir)/Documentation/web.texi
-	# 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 \
+	for l in '' $(WEB_LANGS); do \
 		$(EXTRACT_TEXI_FILENAMES) \
 			-I $(top-src-dir)/Documentation/ \
 			-I $(top-src-dir)/Documentation/"$$l" \
@@ -94,30 +82,34 @@ website-xrefs: website-version
 		done; \
 	done;
 
-
-
-website-texinfo: website-version website-xrefs
-	$(TEXI2HTML) --prefix=index \
-		--split=section \
-		--I=$(top-src-dir)/Documentation/ \
-		--I=$(OUT) \
-		--init-file=$(texi2html-init-file) \
-		-D web_version \
-		--output=$(OUT)/website/ \
-		$(top-src-dir)/Documentation/web.texi
-	# translations
-	for l in $(WEB_LANGS); do \
+website-bibs: website-version
+	BSTINPUTS=$(top-src-dir)/Documentation/web/ \
+		$(WEB_BIBS) -s web \
+		-o $(OUT)/others-did.itexi \
+		$(top-src-dir)/Documentation/web/others-did.bib
+	BSTINPUTS=$(top-src-dir)/Documentation/web/ \
+		$(WEB_BIBS) -s web \
+		-o $(OUT)/we-wrote.itexi \
+		$(top-src-dir)/Documentation/web/we-wrote.bib
+
+
+website-texinfo: website-version website-xrefs website-bibs
+	for l in '' $(WEB_LANGS); do \
+	        if test -n "$$l"; then \
+			langopt=--lang="$$l"; \
+			langsuf=.$$l; \
+		fi; \
 		$(TEXI2HTML) --prefix=index \
 			--split=section \
 			--I=$(top-src-dir)/Documentation/"$$l" \
 			--I=$(top-src-dir)/Documentation/ \
 			--I=$(OUT) \
-			--lang="$$l" \
+			$$langopt \
 			--init-file=$(texi2html-init-file) \
 			-D web_version \
 			--output=$(OUT)/"$$l" \
 			$(top-src-dir)/Documentation/"$$l"/web.texi ; \
-		find $(OUT)/$$l/ -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(OUT)/'$$l'/!!g' | xargs $(MASS_LINK) --prepend-suffix .$$l hard $(OUT)/$$l/ $(OUT)/website/ ; \
+		ls $(OUT)/$$l/*.html | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(OUT)/'$$l'/!!g' | xargs $(MASS_LINK) --prepend-suffix="$$langsuf" hard $(OUT)/$$l/ $(OUT)/website/ ; \
 	done