X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=76f4515be93f6034c4fd0966788a8ff512afb9b3;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=fc35f9124597b9ee210437a9986035e72abc6ef8;hpb=3d0c45c00d400d3430fc4c0beb41cf96ebd28889;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index fc35f91245..76f4515be9 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -2,64 +2,116 @@ depth = . -SUBDIRS = buildscripts python scripts \ +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 ## value of DOCUMENTATION here. documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -SCRIPTS = configure autogen.sh -README_FILES = ChangeLog 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 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 SConstruct \ - $(README_FILES) $(SCRIPTS) $(IN_FILES) +RELEASE_FILES = ChangeLog RELEASE-COMMIT +RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%) +OUT_DIST_FILES += $(RELEASE_OUT_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 -include $(depth)/make/stepmake.make - -local-dist: dist-toplevel-txt-files +LOCALSTEPMAKE_TEMPLATES=lilypond -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)/ +include $(depth)/make/stepmake.make - $(MAKE) -C Documentation/user local-install-WWW - $(MAKE) -C Documentation/user install-info +.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 + +$(outdir)/VERSION: $(config_make) VERSION + -mkdir -p $(outdir) + echo $(TOPLEVEL_VERSION) > $@ + +$(outdir)/ChangeLog: $(outdir)/VERSION + @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@ + +$(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 > $@ + +# 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 scripts/build + $(MAKE) -C python + +top-doc: python-modules + +local-clean: local-clean-ChangeLog local-clean-filelist + +local-clean-ChangeLog: + rm -f ChangeLog + +info: + $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true + +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: @@ -68,53 +120,67 @@ 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 + +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 -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' +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) -local-WWW-post: -# need UTF8 setting in case this is hosted on a website. +# 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 - $(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-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 + +$(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 +# 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: @@ -122,27 +188,27 @@ 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-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 # 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) - 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 @@ -154,7 +220,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile 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 @@ -165,19 +231,15 @@ $(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 && \ - 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 && \ @@ -185,32 +247,38 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile 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 . + 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)/*.pfa . + ln -s ../../../../../../mf/$(outconfbase)/*.pf? . + touch $(tree-share-prefix)/mf-link-tree 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 # @@ -224,3 +292,72 @@ $(config_h): config.hh.in @echo ' rm $(config_h); ./autogen.sh' @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: + @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 + + +local-check: test + rm -rf $(RESULT_DIR) + mkdir -p $(RESULT_DIR) + $(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: + 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 +