]> git.donarmstrong.com Git - lilypond.git/blobdiff - GNUmakefile.in
Merge with master
[lilypond.git] / GNUmakefile.in
index 8a0c464306b00ce0f17b7ce50bd653c3840486e0..4eea5f17918f5d9205affb259503424168f2bbbe 100644 (file)
@@ -32,18 +32,26 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+#
+# suggested settings
+#
+# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
+# 
+include local.make
+
 local-dist: dist-toplevel-txt-files dist-changelog
 
 dist-changelog:
-       if  test -d $(srcdir)/.git ; then \
-               git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
+       if  test -d $(top-src-dir)/.git ; then \
+               cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
        else \
-               cp $(srcdir)/ChangeLog $(distdir) ; \
+               cp $(top-src-dir)/ChangeLog $(distdir) ; \
        fi
 
-default: $(outdir)/VERSION
+all: $(outdir)/VERSION
 
-$(outdir)/VERSION: $(config_make)
+$(outdir)/VERSION: $(config_make) VERSION
+       -mkdir -p $(outdir)
        echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
@@ -56,8 +64,7 @@ doc:
 
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-       cp -a $(outdir)/web-root/ $(DESTDIR)$(webdir)/
-
+       rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
        $(MAKE) -C Documentation/user local-install-WWW
        $(MAKE) -C Documentation/user install-info
 
@@ -80,53 +87,30 @@ local-install:
 final-install:
        @true
 
-web-ext = html midi pdf png txt ly signature
-
-footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
-footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
-
 
+# For online docs with content negotiation, issue `make web WEB_TARGETS=online'
+# For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
+WEB_TARGETS = offline
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
        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
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
-       echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/index.html">' > $(outdir)/index.html
-       echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(outdir)/index.html
-
-       cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
-
-       cd $(top-build-dir) && find Documentation input \
-               $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
-               | grep -v 'lily-[0-9].*.pdf' \
-               > $(outdir)/weblist
-       ls $(outdir)/*.html >> $(outdir)/weblist
-
-## urg: this is too hairy, should write a python script to do this.
-
-## rewrite file names so we lose out-www
-       rm -rf $(outdir)/web-root/ 
-       mkdir $(outdir)/web-root/
-## urg slow.
-       cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
-               tar -C $(outdir)/web-root/ -xf -  
-       for dir in $(outdir)/web-root/ ; do  \
-               cd $$dir && \
-               for a in `find . -name out-www`; do \
-                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
-                       rm -rf $$a ; \
-               done \
-       done
-       echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
+       rm -rf $(outdir)/online-root
+       rm -rf $(outdir)/offline-root
+       $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
+
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
-tree-share-prefix-current = $(tree-share)/lilypond/current
-tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
-tree-lib-prefix-current = $(tree-lib)/lilypond/current
+
+# Don't put version numbers here. During development
+# they make no sense, and cause EPS files to become invalid.
+
+tree-share-prefix = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/current
 
 C_DIRS = flower lily
 c-clean:
@@ -146,15 +130,12 @@ PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
+$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION 
 # Preparing LilyPond tree for build-dir exec
        cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
        mkdir -p $(tree-bin)
        mkdir -p $(tree-share-prefix)
-       ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
        mkdir -p $(tree-lib-prefix)
-       ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
-       mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
        mkdir -p $(tree-share-prefix)/fonts/otf
@@ -177,9 +158,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
                ln -s ../../../../python/$(outconfbase) python && \
                ln -s $(top-src-dir)/scm && \
                ln -s $(top-src-dir)/scripts scripts
-       cd $(tree-share-prefix)/dvips && \
-               ln -s ./../../../mf/$(outconfbase) mf-out && \
-               ln -s $(top-src-dir)/ps
        cd $(tree-share-prefix)/tex && \
                ln -s $(top-src-dir)/tex source && \
                ln -s ../../../../../tex/$(outconfbase) tex-out && \
@@ -212,17 +190,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
                ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
 
 TAGS.make: dummy
-       etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
-
-local-clean: build-dir-setup-clean local-web-clean
-
-local-web-clean:
-       rm -rf $(outdir)/web-root/
-
-
-
-build-dir-setup-clean:
-       cd $(top-build-dir) && rm -rf share
+       etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
 
 $(config_h): config.hh.in
 #
@@ -236,3 +204,46 @@ $(config_h): config.hh.in
        @echo '         rm $(config_h); ./autogen.sh'
        @echo
        @false
+
+
+################################################################
+# testing
+
+RESULT_DIR=$(top-build-dir)/out/test-results
+OUT_TEST=test
+
+
+test:
+       rm -f input/regression/out-$(OUT_TEST)/collated-files.html
+       @echo -en 'For tracking crashes: use\n\n\t'
+       @echo 'grep sourcefilename `grep -L systems.texi input/regression/out-test/*log|sed s/log/ly/g`'
+       @echo
+       if test -d .git  ; then \
+               echo -e 'HEAD is:\n\n\t' ; \
+               git log --max-count=1 --pretty=oneline ;\
+               echo -e '\n\n\n' ; \
+               git diff ; \
+       fi > input/regression/out-test/tree.gittxt
+       $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html
+       @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
+
+
+test-baseline: test
+       rm -rf input/regression/out-test-baseline
+       mv input/regression/out-test input/regression/out-test-baseline
+
+local-check: test
+       rm -rf $(RESULT_DIR)
+       mkdir -p $(RESULT_DIR)
+       $(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+
+
+test-redo:
+       for a in `cat $(RESULT_DIR)/changed.txt` ; do \
+               echo removing $$a* ; \
+               rm -f $$a* ;\
+       done
+       $(MAKE) check
+
+test-clean:
+       $(MAKE) -C input/regression/ out=$(OUT_TEST) clean