X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=blobdiff_plain;f=GNUmakefile.in;h=76f4515be93f6034c4fd0966788a8ff512afb9b3;hp=ad94e6a1f30eb8a96ccbc2c8966e565a27506bd4;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hpb=2f66656ec33a87cd9ca3dce5df229e721243b47b

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ad94e6a1f3..76f4515be9 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -6,10 +6,10 @@ SUBDIRS = python scripts \
 	flower lily \
 	mf ly \
 	tex ps scm \
-	po make \
+	po \
 	elisp vim \
 	input \
-	stepmake $(documentation-dir)
+	$(documentation-dir)
 
 
 ## this convoluted construction is necessary, since we don't know the
@@ -17,7 +17,7 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \
+README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
   LICENSE LICENSE.DOCUMENTATION
 TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
@@ -26,11 +26,9 @@ IN_FILES := $(call src-wildcard,*.in)
 RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
-EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
-
+GENERATED_BUILD_FILES=configure aclocal.m4 autogen.sh
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
@@ -38,8 +36,38 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 
 include $(depth)/make/stepmake.make
 
-
-local-dist: refresh-release-files dist-toplevel-txt-files 
+.PHONY: test info website
+
+dist: local-dist $(GENERATED_BUILD_FILES) top-doc refresh-release-files .gitfilelist
+	@cd $(top-src-dir) && \
+	  if test -n "`find . -name .git`" -a '(' -n "`git diff HEAD | head -1`" \
+	    -o -n "`git status | grep -i untracked`" ')'; \
+	  then echo "***   dist must been rolled on a clean git tree;"; \
+	  echo "uncommitted changes or untracked files detected, aborting."; \
+	  exit 1; fi
+	rm -rf $(distdir)
+	$(MAKE) local-dist $(distdir)
+	chmod -R a+r $(distdir)
+	chmod  a+x `find $(distdir) -type d -print`
+	$(LN) $(TOPDOC_TXT_FILES) $(distdir)
+	$(LN) $(GENERATED_BUILD_FILES:%=$(src-dir)/%) .gitfilelist $(distdir)
+	cd $(top-src-dir) && xargs $(buildscript-dir)/mass-link hard . $(distdir) <$(top-build-dir)/.gitfilelist
+	if test -n "`find $(top-src-dir) -name .git`"; then \
+	  COMMIT_DATE=`git --git-dir=$(top-src-dir)/.git log -1 --format=%cD`; \
+	  find $(distdir) | xargs touch -d "$$COMMIT_DATE"; fi
+	(cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
+	rm -rf $(distdir)
+
+ifneq ($(shell find $(top-src-dir) -name .git),)
+.gitfilelist: $(top-src-dir)/.git/index
+	cd $(top-src-dir) && git ls-files >$(top-build-dir)/$@
+local-clean-filelist:
+	rm -f .gitfilelist
+else
+.gitfilelist: $(src-dir)/.gitfilelist
+	cp $< $@
+local-clean-filelist:
+endif
 
 all: $(outdir)/VERSION
 
@@ -59,20 +87,16 @@ refresh-release-files:
 	$(MAKE) $(RELEASE_OUT_FILES)
 
 python-modules:
+	$(MAKE) -C scripts/build
 	$(MAKE) -C python
 
 top-doc: python-modules
 
-local-clean: local-clean-ChangeLog
+local-clean: local-clean-ChangeLog local-clean-filelist
 
 local-clean-ChangeLog:
 	rm -f ChangeLog
 
-dist-toplevel-txt-files: top-doc
-	-mkdir -p $(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
 
@@ -117,13 +141,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 +190,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,22 +247,35 @@ $(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 &&  \
+	rm -f $(tree-share-prefix)/fonts/00-lilypond-fonts.conf &&  \
+	rm -f $(tree-share-prefix)/fonts/99-lilypond-fonts.conf &&  \
 	rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
 	rm -f $(tree-share-prefix)/fonts/type1/* &&  \
 		cd $(tree-share-prefix)/fonts/otf && \
-		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-	-cd $(tree-share-prefix)/fonts/ && \
-		ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
+		ln -s ../../../../../../mf/$(outconfbase)/*.otf . && \
+		$(foreach i,$(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES)), \
+			ln -s $i . && ) true && \
+		$(foreach i,$(addprefix $(URWOTF_DIR)/,$(URWOTF_FILES)), \
+			ln -s $i . && ) true
+	-cd $(tree-share-prefix)/fonts && \
+		ln -s ../../../../../mf/$(outconfbase)/fonts.conf . && \
+		ln -s ../../../../../mf/$(outconfbase)/00-lilypond-fonts.conf . && \
+		ln -s ../../../../../mf/$(outconfbase)/99-lilypond-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')
@@ -240,13 +298,6 @@ grand-replace:
 	PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
 
-################################################################
-# website (without the rest of the docs)
-web-version:
-	touch $(top-src-dir)/Documentation/web.texi
-	cd $(top-build-dir)/Documentation && make out=www WEB_VERSION=yes out-www/web/index.html
-
-
 ################################################################
 # testing
 
@@ -254,30 +305,37 @@ 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
+	@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 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
 
-test-baseline: 
+test-baseline:
 	@if test -d .git ; then \
 		$(if $(shell git diff), 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) out=test -C input/regression/lilypond-book local-test-baseline
 	$(MAKE) test-snippets-clean
 
 
 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:
@@ -288,10 +346,18 @@ 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
 
 test-snippets-clean:
 	rm -rf out/lybook-testdb
+
+# we want this separate for security; see CG 4.2.  -gp
+website:
+	$(MAKE) config_make=$(config_make) \
+		top-src-dir=$(top-src-dir) \
+		-f $(top-src-dir)/make/website.make \
+		website
+