X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=ef307e8b6ef3b9f0473f8697e9692f998a40085e;hb=03ce3667568361ee7433032988a4089c64de2ec7;hp=21681b64ccdf5a553134aeba4bca0223cd9de3ef;hpb=19c35ecafd1febb9350eff2f9a1ec8585dcde26c;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 21681b64cc..ef307e8b6e 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,6 +32,25 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 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
+
+default: $(outdir)/VERSION
+
+$(outdir)/VERSION: $(config_make) VERSION
+	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
 
@@ -42,14 +61,18 @@ install-WWW:
 	$(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)
@@ -59,7 +82,9 @@ final-install:
 
 web-ext = html midi pdf png txt ly signature
 
-footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+# 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'
 
 
@@ -73,17 +98,28 @@ local-WWW-post:
 
 	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/ 
-	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/../ ; \
+	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 
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -109,10 +145,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)
@@ -120,7 +156,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
@@ -143,9 +178,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 && \
@@ -164,7 +196,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 && \
@@ -175,17 +210,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
 #
@@ -199,3 +224,16 @@ $(config_h): config.hh.in
 	@echo '         rm $(config_h); ./autogen.sh'
 	@echo
 	@false
+
+
+test:
+	$(MAKE) -C input/regression/ out=test clean
+	$(MAKE) -C input/regression/ out=test WWW ANTI_ALIAS_FACTOR=1
+
+
+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
+	rm -rf $(RESULT_DIR)
+	mkdir -p $(RESULT_DIR)
+	$(PYTHON) $(buildscript-dir)/output-distance.py --output-dir $(RESULT_DIR) $(CHECK_SOURCE) input/regression/out-test/