X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=d61620209294bf281741f8d81fcdd9239544dab9;hb=eefefc514a3a42718ee29db04c345e8593c15273;hp=0f7d1d00ca4e69801ce9f45b6f2d64353c09f67e;hpb=7712919e78b1de810006afa82454030c70c1d5a3;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 0f7d1d00ca..d616202092 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -2,7 +2,7 @@ depth = . -SUBDIRS = buildscripts python scripts \ +SUBDIRS = python scripts \ flower lily \ mf ly \ tex ps scm \ @@ -16,30 +16,30 @@ SUBDIRS = buildscripts python scripts \ ## value of DOCUMENTATION here. documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -SCRIPTS = configure autogen.sh -README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING -TOPDOC_FILES = AUTHORS README INSTALL NEWS +SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh +README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \ + LICENSE LICENSE.DOCUMENTATION +TOPDOC_FILES = AUTHORS INSTALL README NEWS TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) -EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \ - $(README_FILES) $(SCRIPTS) $(IN_FILES) +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 # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install +LOCALSTEPMAKE_TEMPLATES=lilypond + include $(depth)/make/stepmake.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 +local-dist: refresh-release-files dist-toplevel-txt-files all: $(outdir)/VERSION @@ -47,32 +47,47 @@ $(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)/ +$(outdir)/ChangeLog: $(outdir)/VERSION + @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@ -doc: - $(MAKE) -C Documentation +$(outdir)/RELEASE-COMMIT: # FIXME: any file in $(top-src-dir)/.git/ we can depend on and be sure RELEASE-COMMIT is up to date? + git --git-dir=$(top-src-dir)/.git show HEAD | head -100 > $@ -install-WWW: - -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) - cp -a $(outdir)/web-root/ $(DESTDIR)$(webdir)/ +# junk me as soon as RELEASE-COMMIT FIXME: has been addressed +refresh-release-files: + test -d $(top-src-dir)/.git && rm -f $(RELEASE_OUT_FILES) + $(MAKE) $(RELEASE_OUT_FILES) + +python-modules: + $(MAKE) -C python + +top-doc: python-modules + +local-clean: local-clean-ChangeLog + +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 - $(MAKE) -C Documentation/user local-install-WWW - $(MAKE) -C Documentation/user install-info +install-info: info + $(MAKE) out=www COPY_INFO_IMAGES=1 install-info-WWW install-help2man: $(MAKE) -C scripts man install-help2man $(MAKE) -C lily man install-help2man -web-install: +install-doc: $(MAKE) out=www install-WWW + $(MAKE) out=www install-info-WWW -uninstall-WWW: - echo TODO - -web-uninstall: +uninstall-doc: $(MAKE) out=www uninstall-WWW local-install: @@ -81,55 +96,51 @@ local-install: final-install: @true -web-ext = html midi pdf png txt ly signature +ifeq ($(out),www) +# All web targets, except info image symlinks and info docs are +# 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) + $(MAKE) -C Documentation omf-local-install + +install-info-WWW: + $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true -# For docball, issue `make web CONTENT_NEGOTIATION=' -CONTENT_NEGOTIATION = --content-negotiation -footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) $(CONTENT_NEGOTIATION) -footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs' +uninstall-WWW: + rm -rf $(DESTDIR)$(webdir) + -rmdir $(package_docdir) + $(MAKE) -C Documentation uninstall +# For online docs with content negotiation, issue `make doc WEB_TARGETS=online' +# For both online and offline docs, issue `make doc WEB_TARGETS="offline online"' +WEB_TARGETS = offline -local-WWW-post: -# need UTF8 setting in case this is hosted on a website. +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 Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ - | grep -v 'lily-[0-9a-f]*.*pdf' \ - | grep -v '/fr/' \ - > $(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 + $(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 | xargs rm -f +endif # ifeq ($(out),www) + +# For those who cannot for the life in them remember to type +# WEB_TARGETS=..., just bloody make all doc stuff, already. +all-doc: + $(MAKE) WEB_TARGETS='online offline' doc 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: @@ -137,26 +148,22 @@ c-clean: src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh -web-clean: - $(MAKE) out=www clean - $(MAKE) $(tree-share-prefix)/lilypond-force +doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force -default: $(config_h) build-dir-setup +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:po/%.po=%) -CATALOGS = $(HELP_CATALOGS:lilypond=) +CATALOGS = $(HELP_CATALOGS:lilypond=) -$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION +$(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)/elisp mkdir -p $(tree-share-prefix)/fonts mkdir -p $(tree-share-prefix)/fonts/otf @@ -168,7 +175,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION mkdir -p $(tree-share-prefix)/tex cd $(tree-bin) && \ ln -sf ../../lily/$(outconfbase)/lilypond . && \ - for i in abc2ly convert-ly etf2ly lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ + for i in abc2ly convert-ly etf2ly lilymidi lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ do ln -sf ../../scripts/$(outconfbase)/$$i . ; done cd $(tree-lib-prefix) && \ ln -s ../../../../python/$(outconfbase) python @@ -182,13 +189,12 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION cd $(tree-share-prefix)/tex && \ ln -s $(top-src-dir)/tex source && \ ln -s ../../../../../tex/$(outconfbase) tex-out && \ - ln -s ../../../../../mf/$(outconfbase) mf-out - + true cd $(tree-share-prefix)/fonts && \ ln -s $(top-src-dir)/mf source && \ true -cd $(tree-share-prefix)/elisp && \ - ln -sf ../../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ + ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ ln -s $(top-src-dir)/elisp/*.el . $(foreach i,$(CATALOGS), \ (mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \ @@ -199,16 +205,21 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION $(tree-share-prefix)/mf-link-tree link-mf-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/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 . -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)/*.pfa . + ln -s ../../../../../../mf/$(outconfbase)/*.pf? . TAGS.make: dummy etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') @@ -226,15 +237,71 @@ $(config_h): config.hh.in @echo @false +grand-replace: + $(MAKE) -C scripts/build + PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace + + +################################################################ +# testing + +RESULT_DIR=$(top-build-dir)/out/test-results + test: - $(MAKE) -C input/regression/ out=test clean - $(MAKE) -C input/regression/ out=test WWW ANTI_ALIAS_FACTOR=1 + @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/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: + @if test -d .git ; then \ + $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ + fi + $(MAKE) + $(MAKE) test + $(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 -CHECK_SOURCE=$(HOME)/vc/gub/target/linux-x86/build/lilypond-master-git.sv.gnu.org-lilypond.git/input/regression/out-test/ -RESULT_DIR=$(top-build-dir)/out/test-results/ -check: test +local-check: test rm -rf $(RESULT_DIR) mkdir -p $(RESULT_DIR) - $(PYTHON) $(buildscript-dir)/output-distance.py --output-dir $(RESULT_DIR) $(CHECK_SOURCE) input/regression/out-test/ + $(buildscript-dir)/output-distance --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: + for a in `cat $(RESULT_DIR)/changed.txt` ; do \ + echo removing $$a* ; \ + rm -f $$a* ;\ + done + $(MAKE) check + +test-clean: test-snippets-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 +