X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=d17a0548001cb06b00930931b128d60e010aa021;hb=ce593a5d9614d463ac0255eac17ceb50ce3bcc29;hp=c10baee18339d00f7b549be0bf52dc6d41534bd3;hpb=ec0537104010e4e2a51083b181974b19690bcc1a;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index c10baee183..d17a054800 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -9,21 +9,21 @@ 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 @@ -32,24 +32,55 @@ INSTALLATION_FILES=$(config_make) VERSION STEPMAKE_TEMPLATES=toplevel po install include $(depth)/make/stepmake.make +# +# suggested settings +# +# CHECK_SOURCE= +# 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,36 +88,18 @@ 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 '' > $(outdir)/index.html - echo 'Redirecting to the documentation index...' >> $(outdir)/index.html - - cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) - -## rewrite file names so we lose out-www - -mv $(outdir)/web-root/ $(outdir)/old-web-root - for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \ - echo $$d ; \ - (mkdir -p $(outdir)/web-root/$$d/ || true) ; \ - rsync -Wa --include source --include music-glossary \ - --include lilypond-internals \ - --include lilypond \ - $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \ - done -## todo: use --link-dest -# --link-dest=$(outdir)/old-web-root/$$d - echo $(TOPLEVEL_VERSION)> $(outdir)/web-root/VERSION - -rm -rf $(outdir)/old-web-root + 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 @@ -112,10 +125,10 @@ 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) @@ -123,7 +136,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile 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 @@ -146,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 && \ @@ -167,7 +176,10 @@ $(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 . -cd $(tree-share-prefix)/fonts/svg && \ @@ -178,11 +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 -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 # @@ -196,3 +204,21 @@ $(config_h): config.hh.in @echo ' rm $(config_h); ./autogen.sh' @echo @false + + +test-clean: + $(MAKE) -C input/regression/ out=test clean + +test: +## no aa-scaling, no PDF + $(MAKE) -C input/regression/ out=test LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps,png $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-test/collated-files.html + @echo "Missing \\version" + find input ly -name '*.ly' |grep -v 'out.*/' | xargs grep '\\version' -L | sed 's/^/**** /g' + + + +RESULT_DIR=$(top-build-dir)/out/test-results/ +check-test: 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/