X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=4eea5f17918f5d9205affb259503424168f2bbbe;hb=77861413e78d1b92b5b8acd2913d7aa8f93174bf;hp=c84bf3fa4cebe5a83c66438e224bee4bce2360eb;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index c84bf3fa4c..4eea5f1791 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -9,47 +9,77 @@ SUBDIRS = buildscripts python scripts \ po make \ elisp vim \ input \ - cygwin stepmake $(documentation-dir) + stepmake $(documentation-dir) ## this convoluted construction is necessary, since we don't know the ## value of DOCUMENTATION here. documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile -README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING -README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt +SCRIPTS = configure autogen.sh +README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING +TOPDOC_FILES = AUTHORS README INSTALL NEWS +TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) -PATCH_FILES = emacsclient.patch server.el.patch darwin.patch -EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \ - $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES) -NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) + +EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \ + $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install -include $(depth)/make/stepmake.make +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 $(top-src-dir)/.git ; then \ + cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \ + else \ + cp $(top-src-dir)/ChangeLog $(distdir) ; \ + fi + +all: $(outdir)/VERSION + +$(outdir)/VERSION: $(config_make) VERSION + -mkdir -p $(outdir) + echo $(TOPLEVEL_VERSION) > $@ + +dist-toplevel-txt-files: + -mkdir -p $(distdir) + ln $(TOPDOC_TXT_FILES) $(distdir)/ + ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/ doc: $(MAKE) -C Documentation 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 +install-help2man: + $(MAKE) -C scripts man install-help2man + $(MAKE) -C lily man install-help2man + web-install: $(MAKE) out=www install-WWW uninstall-WWW: - #TODO + echo TODO web-uninstall: - $(MAKE) out=www uninstall-WWW= + $(MAKE) out=www uninstall-WWW local-install: $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir) @@ -57,42 +87,30 @@ local-install: final-install: @true -web-ext = html midi pdf png txt ly -footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) -footifymail = MAILADDRESS=bug-lilypond@gnu.org +# 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 '' > $(outdir)/index.html - echo 'Redirecting to the documentation index...' >> $(outdir)/index.html - - cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) - cd $(top-build-dir) && find . -name \*.html~ -print | xargs rm -f - cd $(top-build-dir) && find Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ - > $(outdir)/weblist - ls $(outdir)/*.html >> $(outdir)/weblist - -## rewrite file names so we lose out-www - rm -rf $(outdir)/web-root/ - mkdir $(outdir)/web-root/ - cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf- -T- ) | \ - tar -C $(outdir)/web-root/ -xf - - cd $(outdir)/web-root/ && \ - for a in `find . -name out-www`; do \ - mv $$a/* $$a/.. ; \ - rmdir $$a ; \ - done + 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-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION) + +# 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: @@ -109,18 +127,15 @@ default: $(config_h) build-dir-setup build-dir-setup: $(tree-share-prefix)/lilypond-force PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po) -HELP_CATALOGS = $(PO_FILES:$(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) mkdir -p $(tree-lib-prefix) - (cd $(tree-lib)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current) - (cd $(tree-share)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) 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 @@ -132,9 +147,8 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile mkdir -p $(tree-share-prefix)/tex cd $(tree-bin) && \ ln -sf ../../lily/$(outconfbase)/lilypond . && \ - ln -sf ../../scripts/$(outconfbase)/convert-ly . && \ - ln -sf ../../scripts/$(outconfbase)/lilypond-book . && \ - ln -sf ../../scripts/$(outconfbase)/*.ly . + for i in abc2ly convert-ly etf2ly lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ + do ln -sf ../../scripts/$(outconfbase)/$$i . ; done cd $(tree-lib-prefix) && \ ln -s ../../../../python/$(outconfbase) python cd $(tree-share-prefix) && \ @@ -144,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 && \ @@ -165,9 +176,12 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile touch $(tree-share-prefix)/lilypond-force $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force - -rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* && \ + -rm -f $(tree-share-prefix)/fonts/otf/* && \ + rm -f $(tree-share-prefix)/fonts/svg/* && \ + 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,ttf} . + ln -s ../../../../../../mf/$(outconfbase)/*.otf . -cd $(tree-share-prefix)/fonts/svg && \ ln -s ../../../../../../mf/$(outconfbase)/*.svg . -cd $(tree-share-prefix)/fonts/tfm && \ @@ -175,10 +189,8 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo -cd $(tree-share-prefix)/fonts/type1 && \ ln -s ../../../../../../mf/$(outconfbase)/*.pfa . - -local-clean: build-dir-setup-clean -build-dir-setup-clean: - cd $(top-build-dir) && rm -rf share +TAGS.make: dummy + etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') $(config_h): config.hh.in # @@ -192,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