X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=website.make;h=a6752531f89903a69fb8c0881b11f02ef2891159;hb=d18e768550a2b430bc6eeb76768fdd54e2a91e0d;hp=5d678b95bb548d7de584d213468f6ae801bfdaad;hpb=cc2c9af6dbd0ed5fa72170b300783f3e62c84e8b;p=lilypond.git

diff --git a/website.make b/website.make
index 5d678b95bb..a6752531f8 100644
--- a/website.make
+++ b/website.make
@@ -1,53 +1,85 @@
 ################################################################
 # website (without the rest of the docs)
 
-#top-src-dir=$(HOME)/src/lilypond/
-EXTRACT_TEXI_FILENAMES=scripts/build/out/extract_texi_filenames
-CREATE_VERSION=$(top-src-dir)/scripts/build/create-version-itexi.py
-out=out-website
-EXAMPLES=$(HOME)/media/examples/
-PICTURES=$(HOME)/media/pictures
+################################################################
+#####  SECURITY -- check these values for lilypond.org #########
+################################################################
+ifeq ($(WEBSITE_ONLY_BUILD),1)
+  ### for lilypond.org
+  top-src-dir=$(HOME)/src/lilypond
+  depth=.
+  trusted-dir=$(HOME)/lilypond/trusted-scripts
+  script-dir=$(trusted-dir)
+  texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
+  TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
+  EXAMPLES=$(HOME)/media/ly-examples/
+  PICTURES=$(HOME)/media/pictures
+else
+  ### for normal git
+  script-dir=$(top-src-dir)/scripts/build/
+  texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+  include $(config_make)
+  # I assume this is run from top-build-dir
+  EXAMPLES=Documentation/web/ly-examples/out-www/
+  PICTURES=Documentation/pictures/out-www/
+endif
+
+
+################################################################
+OUT=out-website
 
+TEXI2HTML=TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+
+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
+
+SERVER_FILES=$(top-src-dir)/Documentation/web/server/
 
 # don't include web
 MANUALS=$(wildcard $(top-src-dir)/Documentation/*.tely)
 MANUALS+=$(top-src-dir)/Documentation/contributor.texi
 
+website-test:
+	echo $(TEXI2HTML)
 
 website-version:
-	mkdir -p $(out)
-	python $(CREATE_VERSION) > $(out)/version.itexi
+	mkdir -p $(OUT)
+	$(CREATE_VERSION) $(top-src-dir) > $(OUT)/version.itexi
+	$(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 \
+		-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) && ) :
+		-I $(OUT) -o $(OUT) $(manual) && ) :
 
 website-texinfo: website-version website-xrefs
-	SRC_DIR=$(top-src-dir)/Documentation/ \
-		PERL_UNICODE=SD texi2html --prefix=index \
+	$(TEXI2HTML) --prefix=index \
 		--split=section \
 		--I=$(top-src-dir)/Documentation/ \
-		--I=$(out) \
-		--init-file=/home/gperciva/src/lilypond/Documentation/lilypond-texi2html.init \
+		--I=$(OUT) \
+		--init-file=$(texi2html-init-file) \
 		-D web_version \
-		--output=$(out)/website/ \
+		--output=$(OUT)/website/ \
 		$(top-src-dir)/Documentation/web.texi
 
 website-css:
-	cp $(top-src-dir)/Documentation/css/*.css $(out)/website/
+	cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website/
 
 website-pictures:
-	cp -r $(PICTURES) $(out)/website/
-	ln -sf website/pictures $(out)/pictures
+	mkdir -p $(OUT)/website/pictures/
+	cp $(PICTURES)/* $(OUT)/website/pictures/
+	ln -sf website/pictures $(OUT)/pictures
 
 website-examples:
-	cp -r $(EXAMPLES) $(out)/website/
-
+	mkdir -p $(OUT)/website/ly-examples
+	cp $(EXAMPLES)/* $(OUT)/website/ly-examples
 
 website: website-texinfo website-css website-pictures website-examples
-
+	cp $(SERVER_FILES)/favicon.ico $(OUT)/website/
+	cp $(SERVER_FILES)/lilypond.org.htaccess $(OUT)/website/.htaccess
+	cp $(SERVER_FILES)/robots.txt $(OUT)/website/