X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=8cce2c8f72171d4dbc3221777e58b6e36e49afb9;hb=646848f37e1b5faca1678fb4d1845216f2a41993;hp=74c269d4e28397fcf90d4e9b8c37743f759a1493;hpb=cc2c9af6dbd0ed5fa72170b300783f3e62c84e8b;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 74c269d4e2..8cce2c8f72 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -38,8 +38,9 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 
 include $(depth)/make/stepmake.make
 
+.PHONY: test info website
 
-local-dist: refresh-release-files dist-toplevel-txt-files 
+local-dist: refresh-release-files dist-toplevel-txt-files
 
 all: $(outdir)/VERSION
 
@@ -70,8 +71,8 @@ local-clean-ChangeLog:
 
 dist-toplevel-txt-files: top-doc
 	-mkdir -p $(distdir)
-	ln $(TOPDOC_TXT_FILES) $(distdir)/
-	ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
+	ln $(TOPDOC_TXT_FILES) $(distdir)
+	ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)
 
 info:
 	$(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true
@@ -101,7 +102,7 @@ ifeq ($(out),www)
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
 	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-	rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+	rsync -rl --exclude='*.signature' $(outdir)/offline-root $(DESTDIR)$(webdir)
 	$(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
@@ -117,13 +118,29 @@ uninstall-WWW:
 # For both online and offline docs, issue `make doc WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
-WWW-post:
+WEB_ROOT_FILES = $(WEB_TARGETS:%=$(outdir)/%-root/index.html)
+
+WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \
+                    $(shell bash -O nullglob -c "echo $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")) \
+                    $(shell bash -O nullglob -c "echo input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo input/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo input/*/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo input/regression/lilypond-book/$(outdir)/*.{info,tex}") \
+                    $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")
+
+WWW-post: $(top-build-dir)/.htaccess $(WEB_ROOT_FILES)
+
 # need UTF8 setting in case this is hosted on a website.
+$(top-build-dir)/.htaccess:
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
-	$(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
-	find $(outdir) -name '*-root' | xargs rm -rf
-	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
-	find $(outdir)/offline-root -type l -delete
+
+$(outdir)/offline-root/index.html: $(WEB_TRACKED_FILES)
+	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) offline
+	find $(outdir)/offline-root -type l | xargs rm -f
+
+$(outdir)/online-root/index.html: $(WEB_TRACKED_FILES)
+	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) online
 endif # ifeq ($(out),www)
 
 # For those who cannot for the life in them remember to type
@@ -150,16 +167,21 @@ src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
 doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force
 
-default: $(config_h) build-dir-setup
+default: $(config_h) build-dir-setup build-scripts
 
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
+build-scripts:
+	$(MAKE) -C scripts/build
+
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
-CATALOGS = $(HELP_CATALOGS:lilypond=) 
+CATALOGS = $(HELP_CATALOGS:lilypond=)
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION 
 # Preparing LilyPond tree for build-dir exec
+link-tree: $(tree-share-prefix)/lilypond-force
+
+$(tree-share-prefix)/lilypond-force: GNUmakefile $(outdir)/VERSION
 	cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
 	mkdir -p $(tree-bin)
 	mkdir -p $(tree-share-prefix)
@@ -202,7 +224,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 		ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true
 	touch $(tree-share-prefix)/lilypond-force
 
-$(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
+link-mf-tree: $(tree-share-prefix)/mf-link-tree
+
+$(tree-share-prefix)/mf-link-tree: $(tree-share-prefix)/lilypond-force
 	-rm -f $(tree-share-prefix)/fonts/otf/* &&  \
 	rm -f $(tree-share-prefix)/fonts/svg/* &&  \
 	rm -f $(tree-share-prefix)/fonts/fonts.conf &&  \
@@ -210,14 +234,17 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 	rm -f $(tree-share-prefix)/fonts/type1/* &&  \
 		cd $(tree-share-prefix)/fonts/otf && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-	-cd $(tree-share-prefix)/fonts/ && \
+	-cd $(tree-share-prefix)/fonts && \
 		ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
 	-cd $(tree-share-prefix)/fonts/svg && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
+	-cd $(tree-share-prefix)/fonts/svg && \
+		ln -s ../../../../../../mf/$(outconfbase)/*.woff .
 	-cd $(tree-share-prefix)/fonts/tfm && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
 	-cd $(tree-share-prefix)/fonts/type1 && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.pf? .
+	touch $(tree-share-prefix)/mf-link-tree
 
 TAGS.make: dummy
 	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
@@ -247,30 +274,58 @@ RESULT_DIR=$(top-build-dir)/out/test-results
 
 
 test:
-	@echo -en 'For tracking crashes: use\n\n\t'
-	@echo 'grep sourcefilename `grep -L systems.texi out/lybook-db/*/*log|sed s/log/ly/g`'
+	@echo 'For tracking crashes: use'
 	@echo
-	$(MAKE) -C input/regression/ out=test local-test
+	@echo '        grep sourcefilename `grep -L systems.texi out/lybook-testdb/*/*log|sed s/log/ly/g`'
+	@echo
+	$(MAKE) -C input/regression out=test local-test
+	$(MAKE) -C input/regression/midi out=test local-test
 	$(MAKE) -C input/regression/musicxml out=test local-test
 	$(MAKE) -C input/regression/abc2ly out=test local-test
+	$(MAKE) -C input/regression/lilypond-book out=test local-test
+
+ifndef BASELINE_COMMIT
+BASELINE_COMMIT:=HEAD
+endif
+
+ifdef LILYPOND_BASELINES
+BASELINE_ARCHIVE:=$(LILYPOND_BASELINES)/baseline-$(shell git rev-list -1 $(BASELINE_COMMIT)).tar.gz
+
+test-baseline: $(BASELINE_ARCHIVE)
+	tar xzf $(BASELINE_ARCHIVE)
+	$(MAKE) test-snippets-clean
 
-test-baseline: 
+$(BASELINE_ARCHIVE):
+	$(MAKE) test-baseline-create
+	tar czf $(BASELINE_ARCHIVE) input/regression/out-test-baseline \
+		input/regression/midi/out-test-baseline \
+		input/regression/musicxml/out-test-baseline \
+		input/regression/abc2ly/out-test-baseline \
+		input/regression/lilypond-book/out-test-baseline
+else
+test-baseline: test-baseline-create
+	$(MAKE) test-snippets-clean
+endif
+
+test-baseline-create:
 	@if test -d .git ; then \
-		$(if $(shell git diff), echo "commit before base lining" && false,true) ; \
+		$(if $(shell git diff $(BASELINE_COMMIT)), echo "commit before base lining" && false,true) ; \
 	fi
-	$(MAKE) 
+	$(MAKE)
 	$(MAKE) test
-	$(MAKE) out=test -C input/regression/ local-test-baseline
+	$(MAKE) out=test -C input/regression local-test-baseline
+	$(MAKE) out=test -C input/regression/midi local-test-baseline
 	$(MAKE) out=test -C input/regression/musicxml local-test-baseline
 	$(MAKE) out=test -C input/regression/abc2ly local-test-baseline
-	$(MAKE) test-snippets-clean
-
+	$(MAKE) out=test -C input/regression/lilypond-book local-test-baseline
 
 local-check: test
 	rm -rf $(RESULT_DIR)
 	mkdir -p $(RESULT_DIR)
-	$(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
-	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
+	$(buildscript-dir)/output-distance --local-datadir --create-images --output-dir $(RESULT_DIR) \
+		input/regression/out-test-baseline input/regression/out-test \
+		input/regression/midi/out-test-baseline input/regression/midi/out-test 
+	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g'
 
 
 test-redo:
@@ -281,7 +336,7 @@ test-redo:
 	$(MAKE) check
 
 test-clean: test-snippets-clean
-	$(MAKE) -C input/regression/ out=test clean
+	$(MAKE) -C input/regression out=test clean
 
 snippets-clean:
 	rm -rf out/lybook-db
@@ -290,5 +345,9 @@ test-snippets-clean:
 	rm -rf out/lybook-testdb
 
 # we want this separate for security; see CG 4.2.  -gp
-include $(top-src-dir)/website.make
+website:
+	$(MAKE) config_make=$(config_make) \
+		top-src-dir=$(top-src-dir) \
+		-f $(top-src-dir)/make/website.make \
+		website