X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=ba646b22848cbcc40548c1b7b965c9ef62041331;hb=ca53f84df7f1cb46b4a93281823f47ba816c2615;hp=2ac54c5a4308354298444f5cb3e8b5ce889ac0e8;hpb=c58b9bd118958423656e674c25d940cdec71f58a;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index 2ac54c5a43..ba646b2284 100644
--- a/make/website.make
+++ b/make/website.make
@@ -4,6 +4,7 @@
 ################################################################
 #####  SECURITY -- check these values for lilypond.org #########
 ################################################################
+
 ifeq ($(WEBSITE_ONLY_BUILD),1)
   ### for lilypond.org
   TOP_SRC_DIR=$(HOME)/lilypond/lilypond-git
@@ -18,6 +19,8 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
   EXAMPLES=$(HOME)/lilypond/media/ly-examples
   PICTURES=$(HOME)/lilypond/media/pictures
+  PYTHON=python
+  PYTHONPATH=$(TRUSTED_DIR)
 else
   ### for normal git
   script-dir=$(top-src-dir)/scripts/build
@@ -30,13 +33,28 @@ else
   PICTURES=Documentation/pictures/out-www
 endif
 
+################################################################
+#The 4 lines below present an option to force make website to run
+# quietly only when it is run as make -s website.  However, we've
+# decided not to use this switch, and run the scripts quietly all
+# the time
+################################################################
+#quiet-run = $(findstring s, $(MAKEFLAGS))
+#ifeq ($(quiet-run),s)
+#  quiet-flag=-q
+#endif
+
+#Nothing clever here - just allows the use of a boolean to control
+#  quiet running
+quiet-run = true
+ifeq ($(quiet-run),true)
+  quiet-flag=-q
+endif
 
 ################################################################
 OUT=out-website
 
-### only update this when the language compiles correctly!
-# LANGUAGES = (site, de, es, fr, hu, it, ja, nl)
-WEB_LANGS = es fr it nl de hu ja
+WEB_LANGS = $(shell MAKEWEB=1 $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
 TEXI2HTML=ONLY_WEB=1 TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 
@@ -63,10 +81,17 @@ website-version:
 
 website-xrefs: website-version
 	for l in '' $(WEB_LANGS); do \
+		len="$${#l}" ; \
+		r="$$l"; \
+		if [ "$$len" -gt "0" ] ; then \
+			r="$$r"/; \
+		fi ; \
 		$(EXTRACT_TEXI_FILENAMES) \
 			-I $(top-src-dir)/Documentation \
 			-I $(top-src-dir)/Documentation/"$$l" \
 			-I $(OUT) -o $(OUT) --split=node \
+			--known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \
+			$(quiet-flag) \
 			$(top-src-dir)/Documentation/"$$l"/web.texi ;\
 		for m in $(MANUALS); do \
 			n=`echo "$$m" | sed 's/Documentation/Documentation\/'$$l'/'` ; \
@@ -76,7 +101,9 @@ website-xrefs: website-version
 				$(EXTRACT_TEXI_FILENAMES) \
 				-I $(top-src-dir)/Documentation \
 				-I $(top-src-dir)/Documentation/"$$l" \
-				-I $(top-src-dir)/Documentation/"$$l"/"$$d" \
+				-I $(top-src-dir)/Documentation/"$$r""$$d" \
+				--known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \
+			  $(quiet-flag) \
 				-I $(OUT) -o $(OUT) "$$n" ; \
 			fi ; \
 		done; \
@@ -85,11 +112,15 @@ website-xrefs: website-version
 website-bibs: website-version
 	BSTINPUTS=$(top-src-dir)/Documentation/web \
 		$(WEB_BIBS) -s web \
+		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(OUT)/others-did.itexi \
+		$(quiet-flag) \
 		$(top-src-dir)/Documentation/web/others-did.bib
 	BSTINPUTS=$(top-src-dir)/Documentation/web \
 		$(WEB_BIBS) -s web \
+		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(OUT)/we-wrote.itexi \
+		$(quiet-flag) \
 		$(top-src-dir)/Documentation/web/we-wrote.bib
 
 
@@ -118,12 +149,18 @@ website-css:
 
 website-pictures:
 	mkdir -p $(OUT)/website/pictures
-	cp $(PICTURES)/* $(OUT)/website/pictures
-	ln -sf website/pictures $(OUT)/pictures
+	if [ -d $(PICTURES) ]; \
+	then \
+		cp $(PICTURES)/* $(OUT)/website/pictures ; \
+		ln -sf website/pictures $(OUT)/pictures  ;\
+	fi
 
 website-examples:
 	mkdir -p $(OUT)/website/ly-examples
-	cp $(EXAMPLES)/* $(OUT)/website/ly-examples
+	if [ -d $(EXAMPLES) ]; \
+	then \
+		cp $(EXAMPLES)/* $(OUT)/website/ly-examples ; \
+	fi
 
 web-post:
 	$(WEB_POST) $(OUT)/website