X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=d96c149cb958b5dff7b8195212968216bac81002;hb=f07eb0cd7911559ffc47f4ad4ac9ddb49a0de678;hp=1e38797816c9ea7eccbdb9cf5fd8522834fcb5b1;hpb=3eed49cbbd14f8e2419a2b7b6408d34f4d002c57;p=bup.git

diff --git a/Makefile b/Makefile
index 1e38797..d96c149 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,38 @@
 
+MAKEFLAGS += --warn-undefined-variables
+
 SHELL := bash
+.DEFAULT_GOAL := all
+
+# See config/config.vars.in (sets bup_python, among other things)
+-include config/config.vars
+
 pf := set -o pipefail
+cfg_py := $(CURDIR)/config/bin/python
+
+define isok
+  && echo " ok" || echo " no"
+endef
+
+# If ok, strip trailing " ok" and return the output, otherwise, error
+define shout
+$(if $(subst ok,,$(lastword $(1))),$(error $(2)),$(shell x="$(1)"; echo $${x%???}))
+endef
+
+sampledata_rev := $(shell t/configure-sampledata --revision $(isok))
+sampledata_rev := \
+  $(call shout,$(sampledata_rev),Could not parse sampledata revision)
 
-sampledata_rev := $(shell t/configure-sampledata --revision)
 current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
 
-OS:=$(shell uname | sed 's/[-_].*//')
+os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
+os := $(call shout,$(os),Unable to determine OS)
+
 CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
-ifeq ($(OS),CYGWIN)
+ifeq ($(os),CYGWIN)
   SOEXT:=.dll
 endif
 
@@ -20,129 +42,215 @@ else
   test_tmp := $(CURDIR)/t/tmp
 endif
 
-initial_setup := $(shell ./configure-version --update)
-bup_deps := bup lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
+initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
+
+config/config.vars: \
+  configure config/configure config/configure.inc \
+  $(wildcard config/*.in)
+	MAKE="$(MAKE)" ./configure
+
+# On some platforms, Python.h and readline.h fight over the
+# _XOPEN_SOURCE version, i.e. -Werror crashes on a mismatch, so for
+# now, we're just going to let Python's version win.
+
+ifneq ($(strip $(bup_readline_cflags)),)
+  readline_cflags += $(bup_readline_cflags)
+  readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
+  readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
+  readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
+  readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
+  CFLAGS += $(readline_cflags)
+endif
 
-all: $(bup_deps) Documentation/all $(current_sampledata)
+LDFLAGS += $(bup_readline_ldflags)
 
-bup:
-	ln -s main.py bup
+ifeq ($(bup_have_libacl),1)
+  CFLAGS += $(bup_libacl_cflags)
+  LDFLAGS += $(bup_libacl_ldflags)
+endif
 
-Documentation/all: $(bup_deps)
+config/bin/python: config/config.vars
+
+bup_cmds := \
+  $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
+  $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
+
+bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds)
+
+all: $(bup_deps) Documentation/all $(current_sampledata)
 
 $(current_sampledata):
 	t/configure-sampledata --setup
 
-PYTHON = $(shell cmd/bup-python -c 'import sys; print sys.executable')
+PANDOC ?= $(shell type -p pandoc)
 
-define install-python-bin
-  set -e; \
-  sed -e '1 s|.*|#!$(PYTHON)|; 2,/^# end of bup preamble$$/d' $1 > $2; \
-  chmod 0755 $2;
-endef
+ifeq (,$(PANDOC))
+  $(shell echo "Warning: pandoc not found; skipping manpage generation" 1>&2)
+  man_md :=
+else
+  man_md := $(wildcard Documentation/*.md)
+endif
+
+man_roff := $(patsubst %.md,%.1,$(man_md))
+man_html := $(patsubst %.md,%.html,$(man_md))
 
 INSTALL=install
-PREFIX=/usr
-MANDIR=$(DESTDIR)$(PREFIX)/share/man
-DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
-BINDIR=$(DESTDIR)$(PREFIX)/bin
-LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
+PREFIX=/usr/local
+MANDIR=$(PREFIX)/share/man
+DOCDIR=$(PREFIX)/share/doc/bup
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib/bup
+
+dest_mandir := $(DESTDIR)$(MANDIR)
+dest_docdir := $(DESTDIR)$(DOCDIR)
+dest_bindir := $(DESTDIR)$(BINDIR)
+dest_libdir := $(DESTDIR)$(LIBDIR)
+
 install: all
-	$(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-		$(LIBDIR)/bup $(LIBDIR)/cmd \
-		$(LIBDIR)/web $(LIBDIR)/web/static
-	[ ! -e Documentation/.docs-available ] || \
-	  $(INSTALL) -m 0644 \
-		Documentation/*.1 \
-		$(MANDIR)/man1
-	[ ! -e Documentation/.docs-available ] || \
-	  $(INSTALL) -m 0644 \
-		Documentation/*.html \
-		$(DOCDIR)
-	$(call install-python-bin,bup,"$(BINDIR)/bup")
+	$(INSTALL) -d $(dest_bindir) \
+		$(dest_libdir)/bup $(dest_libdir)/cmd \
+		$(dest_libdir)/web $(dest_libdir)/web/static
+	test -z "$(man_roff)" || install -d $(dest_mandir)/man1
+	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
+	test -z "$(man_html)" || install -d $(dest_docdir)
+	test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(dest_docdir)
+	dev/install-python-script lib/cmd/bup "$(dest_libdir)/cmd/bup"
 	set -e; \
-	for cmd in $$(ls cmd/bup-* | grep -v cmd/bup-python); do \
-	  $(call install-python-bin,"$$cmd","$(LIBDIR)/$$cmd") \
+	for cmd in $$(ls cmd/bup-*); do \
+	  dev/install-python-script "$$cmd" "$(dest_libdir)/$$cmd"; \
 	done
+	cd "$(dest_bindir)" && \
+	  ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
+	set -e; \
 	$(INSTALL) -pm 0644 \
 		lib/bup/*.py \
-		$(LIBDIR)/bup
+		$(dest_libdir)/bup
 	$(INSTALL) -pm 0755 \
 		lib/bup/*$(SOEXT) \
-		$(LIBDIR)/bup
+		$(dest_libdir)/bup
 	$(INSTALL) -pm 0644 \
 		lib/web/static/* \
-		$(LIBDIR)/web/static/
+		$(dest_libdir)/web/static/
 	$(INSTALL) -pm 0644 \
 		lib/web/*.html \
-		$(LIBDIR)/web/
-%/all:
-	$(MAKE) -C $* all
+		$(dest_libdir)/web/
+	if test -e lib/bup/checkout_info.py; then \
+	    $(INSTALL) -pm 0644 lib/bup/checkout_info.py \
+	        $(dest_libdir)/bup/source_info.py; \
+	else \
+	    ! grep -qF '$$Format' lib/bup/source_info.py; \
+	    $(INSTALL) -pm 0644 lib/bup/source_info.py $(dest_libdir)/bup/; \
+	fi
+
 
-%/clean:
-	$(MAKE) -C $* clean
+	    $(INSTALL) -pm 0644 lib/bup/checkout_info.py $(dest_libdir)/bup/; \
 
-config/config.h: config/Makefile config/configure config/configure.inc \
-		$(wildcard config/*.in)
-	cd config && $(MAKE) config.h
+config/config.h: config/config.vars
 
 lib/bup/_helpers$(SOEXT): \
-		config/config.h \
+		config/config.h lib/bup/bupsplit.h \
 		lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
 	@rm -f $@
-	cd lib/bup && \
-	LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
-	cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
-
-lib/bup/_version.py:
-	@echo "Something has gone wrong; $@ should already exist."
-	@echo 'Check "./configure-version --update"'
-	@false
+	cd lib/bup && $(cfg_py) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
+        # Make sure there's just the one file we expect before we copy it.
+	$(cfg_py) -c \
+	  "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
+	cp lib/bup/build/*/_helpers*$(SOEXT) "$@"
 
 t/tmp:
 	mkdir t/tmp
 
 runtests: runtests-python runtests-cmdline
 
+python_tests := \
+  lib/bup/t/tbloom.py \
+  lib/bup/t/tclient.py \
+  lib/bup/t/tgit.py \
+  lib/bup/t/thashsplit.py \
+  lib/bup/t/thelpers.py \
+  lib/bup/t/tindex.py \
+  lib/bup/t/tmetadata.py \
+  lib/bup/t/toptions.py \
+  lib/bup/t/tresolve.py \
+  lib/bup/t/tshquote.py \
+  lib/bup/t/tvfs.py \
+  lib/bup/t/tvint.py \
+  lib/bup/t/txstat.py
+
+# The "pwd -P" here may not be appropriate in the long run, but we
+# need it until we settle the relevant drecurse/exclusion questions:
+# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
 runtests-python: all t/tmp
-	$(pf); TMPDIR="$(test_tmp)" \
-	  $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py 2>&1 \
+	mkdir -p t/tmp/test-log
+	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
+	  ./wvtest.py  $(python_tests) 2>&1 \
 	    | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
-  t/test-index.sh \
-  t/test-split-join.sh \
-  t/test-fuse.sh \
-  t/test-drecurse.sh \
+  t/test-help \
+  t/test.sh \
+  t/test-argv \
   t/test-cat-file.sh \
+  t/test-command-without-init-fails.sh \
   t/test-compression.sh \
+  t/test-drecurse.sh \
   t/test-fsck.sh \
-  t/test-index-clear.sh \
+  t/test-fuse.sh \
+  t/test-ftp \
+  t/test-web.sh \
+  t/test-gc.sh \
+  t/test-import-duplicity.sh \
+  t/test-import-rdiff-backup.sh \
+  t/test-index.sh \
   t/test-index-check-device.sh \
-  t/test-ls.sh \
-  t/test-tz.sh \
+  t/test-index-clear.sh \
+  t/test-list-idx.sh \
+  t/test-ls \
+  t/test-ls-remote \
+  t/test-main.sh \
   t/test-meta.sh \
   t/test-on.sh \
+  t/test-packsizelimit \
+  t/test-prune-older \
+  t/test-redundant-saves.sh \
   t/test-restore-map-owner.sh \
   t/test-restore-single-file.sh \
+  t/test-rm.sh \
   t/test-rm-between-index-and-save.sh \
-  t/test-sparse-files.sh \
-  t/test-command-without-init-fails.sh \
-  t/test-redundant-saves.sh \
   t/test-save-creates-no-unrefs.sh \
+  t/test-save-restore \
+  t/test-save-errors \
   t/test-save-restore-excludes.sh \
   t/test-save-strip-graft.sh \
-  t/test-import-duplicity.sh \
-  t/test-import-rdiff-backup.sh \
-  t/test-xdev.sh \
-  t/test.sh
+  t/test-save-with-valid-parent.sh \
+  t/test-sparse-files.sh \
+  t/test-split-join.sh \
+  t/test-tz.sh \
+  t/test-xdev.sh
+
+tmp-target-run-test-get-%: all t/tmp
+	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
+	  t/test-get $* 2>&1 | tee -a t/tmp/test-log/$$$$.log
+
+test_get_targets += \
+  tmp-target-run-test-get-replace \
+  tmp-target-run-test-get-universal \
+  tmp-target-run-test-get-ff \
+  tmp-target-run-test-get-append \
+  tmp-target-run-test-get-pick \
+  tmp-target-run-test-get-new-tag \
+  tmp-target-run-test-get-unnamed
 
 # For parallel runs.
+# The "pwd -P" here may not be appropriate in the long run, but we
+# need it until we settle the relevant drecurse/exclusion questions:
+# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
 tmp-target-run-test%: all t/tmp
-	$(pf); TMPDIR="$(test_tmp)" \
+	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
 	  t/test$* 2>&1 | tee -a t/tmp/test-log/$$$$.log
 
-runtests-cmdline: $(subst t/test,tmp-target-run-test,$(cmdline_tests))
+runtests-cmdline: $(test_get_targets) $(subst t/test,tmp-target-run-test,$(cmdline_tests))
 
 stupid:
 	PATH=/bin:/usr/bin $(MAKE) test
@@ -151,17 +259,24 @@ test: all
 	if test -e t/tmp/test-log; then rm -r t/tmp/test-log; fi
 	mkdir -p t/tmp/test-log
 	./wvtest watch --no-counts \
-	  $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
+	  $(MAKE) runtests 2>t/tmp/test-log/$$$$.log
 	./wvtest report t/tmp/test-log/*.log
 
 check: test
 
-cmd/python-cmd.sh: config/configure config/configure.inc
-	./configure
+distcheck: all
+	./wvtest run t/test-release-archive.sh
 
-cmds: \
-    $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
-    $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
+long-test: export BUP_TEST_LEVEL=11
+long-test: test
+
+long-check: export BUP_TEST_LEVEL=11
+long-check: check
+
+.PHONY: check-both
+check-both:
+	$(MAKE) clean && PYTHON=python3 $(MAKE) check
+	$(MAKE) clean && PYTHON=python2 $(MAKE) check
 
 cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
@@ -171,25 +286,31 @@ cmd/bup-%: cmd/%-cmd.sh
 	rm -f $@
 	ln -s $*-cmd.sh $@
 
-# update the local 'man' and 'html' branches with pregenerated output files, for
-# people who don't have pandoc (and maybe to aid in google searches or something)
-export-docs: Documentation/all
-	git update-ref refs/heads/man origin/man '' 2>/dev/null || true
-	git update-ref refs/heads/html origin/html '' 2>/dev/null || true
-	set -eo pipefail; \
-	GIT_INDEX_FILE=gitindex.tmp; export GIT_INDEX_FILE; \
-	rm -f $${GIT_INDEX_FILE} && \
-	git add -f Documentation/*.1 && \
-	git update-ref refs/heads/man \
-		$$(echo "Autogenerated man pages for $$(git describe --always)" \
-		    | git commit-tree $$(git write-tree --prefix=Documentation) \
-				-p refs/heads/man) && \
-	rm -f $${GIT_INDEX_FILE} && \
-	git add -f Documentation/*.html && \
-	git update-ref refs/heads/html \
-		$$(echo "Autogenerated html pages for $$(git describe --always)" \
-		    | git commit-tree $$(git write-tree --prefix=Documentation) \
-				-p refs/heads/html)
+.PHONY: Documentation/all
+Documentation/all: $(man_roff) $(man_html)
+
+Documentation/substvars: $(bup_deps)
+	echo "s,%BUP_VERSION%,$$(./bup version),g" > $@
+	echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
+
+Documentation/%.1: Documentation/%.md Documentation/substvars
+	$(pf); sed -f Documentation/substvars $< \
+	  | $(PANDOC) -s -r markdown -w man -o $@
+
+Documentation/%.html: Documentation/%.md Documentation/substvars
+	$(pf); sed -f Documentation/substvars $< \
+	  | $(PANDOC) -s -r markdown -w html -o $@
+
+.PHONY: Documentation/clean
+Documentation/clean:
+	cd Documentation && rm -f *~ .*~ *.[0-9] *.html substvars
+
+# Note: this adds commits containing the current manpages in roff and
+# html format to the man and html branches respectively.  The version
+# is determined by "git describe --always".
+.PHONY: update-doc-branches
+update-doc-branches: Documentation/all
+	dev/update-doc-branches refs/heads/man refs/heads/html
 
 # push the pregenerated doc files to origin/man and origin/html
 push-docs: export-docs
@@ -201,14 +322,19 @@ import-docs: Documentation/clean
 	$(pf); git archive origin/html | (cd Documentation && tar -xvf -)
 	$(pf); git archive origin/man | (cd Documentation && tar -xvf -)
 
-clean: Documentation/clean config/clean
+clean: Documentation/clean config/bin/python
+	cd config && rm -rf config.var
+	cd config && rm -f *~ .*~ \
+	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
 	rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
 		.*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
 		*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-		bup bup-* cmd/bup-* \
-		cmd/python-cmd.sh \
+		lib/bup/checkout_info.py \
 		randomgen memtest \
 		testfs.img lib/bup/t/testfs.img
+	for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \
+	    echo "cmd/bup-$${x%-cmd.*}"; \
+	done | xargs -t rm -f
 	if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
 	if test -e t/mnt; then rm -r t/mnt; fi
 	if test -e t/tmp; then t/cleanup-mounts-under t/tmp; fi
@@ -217,5 +343,6 @@ clean: Documentation/clean config/clean
 	  then umount lib/bup/t/testfs || true; fi
 	rm -rf *.tmp *.tmp.meta t/*.tmp lib/*/*/*.tmp build lib/bup/build lib/bup/t/testfs
 	if test -e t/tmp; then t/force-delete t/tmp; fi
-	./configure-version --clean
 	t/configure-sampledata --clean
+        # Remove last so that cleanup tools can depend on it
+	rm -rf config/bin