X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=3e8df628d564f956f0be839224a947ae082b1c54;hb=0fcecca77dbf876f7d25c07aab3d4a6067304ff8;hp=59ac71d8184cb555a4911aea631898320eea0aae;hpb=689382813a007255352a32847ab884ed67192fcc;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index 59ac71d818..3e8df628d5 100644
--- a/make/website.make
+++ b/make/website.make
@@ -29,6 +29,8 @@ else
   include $(config_make)
 endif
 
+include $(top-src-dir)/VERSION
+
 ################################################################
 #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
@@ -52,7 +54,7 @@ OUT=out-website
 
 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=ONLY_WEB_VERSION=v$(MAJOR_VERSION).$(MINOR_VERSION) TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD \
 	$(TEXI2HTML_PROGRAM) -D web_version --prefix=index --split=section \
 		--init-file=$(texi2html-init-file) \
 		--I=$(dir $<) \
@@ -66,11 +68,11 @@ EXTRACT_TEXI_FILENAMES=$(PYTHON) $(script-dir)/extract_texi_filenames.py $(quiet
 		-I $(dir $<) \
 		-I $(OUT) \
 		-o $(OUT)
-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
+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
 
 EXAMPLES=$(LILYPOND_WEB_MEDIA_GIT)/ly-examples
 PICTURES=$(LILYPOND_WEB_MEDIA_GIT)/pictures
@@ -139,10 +141,8 @@ css-files = $(css-src-files:%=$(OUT)/website/css/%)
 example-src-files := $(notdir $(wildcard $(EXAMPLES)/*))
 example-files = $(example-src-files:%=$(OUT)/website/ly-examples/%)
 
-misc-files = $(OUT)/.htaccess \
-             $(OUT)/website/.htaccess \
-             $(OUT)/website/favicon.ico \
-             $(OUT)/website/robots.txt
+misc-src-files := $(notdir $(wildcard $(top-src-dir)/Documentation/misc/*.*))
+misc-files += $(misc-src-files:%=$(OUT)/website/misc/%)
 
 picture-src-files := $(notdir $(wildcard $(PICTURES)/*))
 picture-files = $(picture-src-files:%=$(OUT)/website/pictures/%)
@@ -152,6 +152,12 @@ pdf-files = $(pdf-src-files:%=$(OUT)/website/pdf/%)
 
 post-files = $(OUT)/website/index.html
 
+root-files = $(OUT)/.htaccess \
+             $(OUT)/website/.htaccess \
+             $(OUT)/website/favicon.ico \
+             $(OUT)/website/tweets.xml \
+             $(OUT)/website/robots.txt
+
 texinfo-files = $(OUT)/index.html $(WEB_LANGS:%=$(OUT)/%/index.html)
 
 version-files = $(OUT)/version.itexi $(OUT)/weblinks.itexi
@@ -180,7 +186,7 @@ website-css: $(OUT)/website/css $(css-files)
 
 website-examples: $(OUT)/website/ly-examples $(example-files)
 
-website-misc: $(OUT)/website $(misc-files)
+website-misc: $(OUT)/website $(OUT)/website/misc $(misc-files) $(root-files)
 
 website-pictures: $(OUT)/website/pictures $(OUT)/pictures $(picture-files)
 
@@ -202,7 +208,7 @@ website-xrefs: website-version $(OUT) $(xref-files)
 ### Rules
 
 # Directories
-$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples $(OUT)/website/pictures $(OUT)/website/pdf: %:
+$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples $(OUT)/website/misc $(OUT)/website/pdf $(OUT)/website/pictures: %:
 	mkdir -p $@
 
 $(OUT)/pictures: $(OUT)/website/pictures
@@ -246,12 +252,12 @@ $(OUT)/web.%.xref-map: $(top-src-dir)/Documentation/%/web.texi
 	$(DO_TEXI_DEP) $(EXTRACT_TEXI_FILENAMES) --split=node $<
 
 # Build the English website
-$(OUT)/index.html: $(top-src-dir)/Documentation/web.texi $(xref-files)
+$(OUT)/index.html: $(top-src-dir)/Documentation/web.texi $(version-files) $(xref-files)
 	$(DO_TEXI_DEP) $(TEXI2HTML) $<
 
 # Build translated websites
 $(eval $(foreach l,$(WEB_LANGS),\
-$(eval $(OUT)/$(l)/index.html: $(top-src-dir)/Documentation/$(l)/web.texi $(xref-files); \
+$(eval $(OUT)/$(l)/index.html: $(top-src-dir)/Documentation/$(l)/web.texi $(version-files) $(xref-files); \
 	$$(DO_TEXI_DEP) $$(TEXI2HTML) --lang="$(l)" $$<; ) \
 ))
 
@@ -269,6 +275,9 @@ $(css-files): $(OUT)/website/css/%: $(top-src-dir)/Documentation/css/%
 $(example-files): $(OUT)/website/ly-examples/%: $(EXAMPLES)/%
 	cp $< $@
 
+$(misc-files): $(OUT)/website/misc/%: $(top-src-dir)/Documentation/misc/%
+	cp $< $@
+
 $(picture-files): $(OUT)/website/pictures/%: $(PICTURES)/%
 	cp $< $@
 
@@ -281,6 +290,9 @@ $(OUT)/website/favicon.ico: $(SERVER_FILES)/favicon.ico
 $(OUT)/website/robots.txt: $(SERVER_FILES)/robots.txt
 	cp $< $@
 
+$(OUT)/website/tweets.xml: $(SERVER_FILES)/tweets.xml
+	cp $< $@
+
 $(OUT)/.htaccess: $(top-htaccess)
 	cp $< $@