X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=ca22c0557e0b080a82d11da80790e69338d927e5;hb=4d61a6859cf2c1c4385fd8ffd3cf3cac43ea525c;hp=385fdddeb9233a16ecaa8ed6d3984529b96a592f;hpb=b38d4806ffd84e239d9a766d35f1fb4ff980c2f4;p=bup.git diff --git a/Makefile b/Makefile index 385fddd..ca22c05 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,10 @@ SHELL := bash .DEFAULT_GOAL := all # See config/config.vars.in (sets bup_python, among other things) -include config/config.vars +-include config/config.vars pf := set -o pipefail +cfg_py := $(CURDIR)/config/bin/python define isok && echo " ok" || echo " no" @@ -42,11 +43,33 @@ endif initial_setup := $(shell ./configure-version --update $(isok)) initial_setup := $(call shout,$(initial_setup),Version configuration failed)) -config/config.vars: configure config/configure config/configure.inc \ +config/config.vars: \ + configure config/configure config/configure.inc \ $(wildcard config/*.in) MAKE="$(MAKE)" ./configure -bup_cmds := cmd/bup-python \ +# 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. +readline_cflags += $(shell pkg-config readline --cflags) +readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags)) +readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen)) +ifneq ($(readline_xopen),600) + $(error "Unexpected pkg-config readline _XOPEN_SOURCE --cflags $(readline_cflags)") +endif +readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags)) +readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen)) + +CFLAGS += $(readline_cflags) +LDFLAGS += $(shell pkg-config readline --libs) +ifeq ($(BUP_HAVE_LIBACL),yes) + CFLAGS += $(shell pkg-config libacl --cflags) + LDFLAGS += $(shell pkg-config libacl --libs) +endif + +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)) @@ -57,15 +80,6 @@ all: $(bup_deps) Documentation/all $(current_sampledata) $(current_sampledata): t/configure-sampledata --setup - -bup_libdir="$script_home/../lib" # bup_libdir will be adjusted during install - -define install-bup-python - set -e; \ - sed -e 's|.*# bup_libdir will be adjusted during install|bup_libdir="$$script_home/.."|' $1 > $2; \ - chmod 0755 $2; -endef - PANDOC ?= $(shell type -p pandoc) ifeq (,$(PANDOC)) @@ -98,9 +112,11 @@ install: all 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) - $(INSTALL) -pm 0755 cmd/bup $(dest_libdir)/cmd/ - $(INSTALL) -pm 0755 cmd/bup-* $(dest_libdir)/cmd/ - $(call install-bup-python,cmd/bup-python,"$(dest_libdir)/cmd/bup-python") + dev/install-python-script lib/cmd/bup "$(dest_libdir)/cmd/bup" + set -e; \ + 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; \ @@ -120,13 +136,12 @@ install: all 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)" "$(bup_python)" csetup.py build + cd lib/bup && $(cfg_py) csetup.py build "$(CFLAGS)" "$(LDFLAGS)" # Make sure there's just the one file we expect before we copy it. - "$(bup_python)" -c \ + $(cfg_py) -c \ "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)" cp lib/bup/build/*/_helpers*$(SOEXT) "$@" @@ -168,65 +183,58 @@ runtests-python: all t/tmp | tee -a t/tmp/test-log/$$$$.log cmdline_tests := \ + 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-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-index-clear.sh \ + t/test-list-idx.sh \ t/test-ls \ t/test-ls-remote \ - t/test-tz.sh - -ifeq "2" "$(bup_python_majver)" - cmdline_tests += \ - t/test-ftp \ - t/test-save-restore \ - t/test-packsizelimit \ - t/test-prune-older \ - t/test-web.sh \ - t/test-rm.sh \ - t/test-gc.sh \ - t/test-main.sh \ - t/test-list-idx.sh \ - t/test-index.sh \ - t/test-split-join.sh \ - t/test-fuse.sh \ - t/test-index-check-device.sh \ - t/test-meta.sh \ - t/test-on.sh \ - t/test-restore-map-owner.sh \ - t/test-restore-single-file.sh \ - t/test-rm-between-index-and-save.sh \ - t/test-save-with-valid-parent.sh \ - t/test-sparse-files.sh \ - t/test-redundant-saves.sh \ - t/test-save-creates-no-unrefs.sh \ - 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 -endif + 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-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-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 := - -ifeq "2" "$(bup_python_majver)" - 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 -endif +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 @@ -253,13 +261,6 @@ check: test distcheck: all ./wvtest run t/test-release-archive.sh -cmd/bup-python: cmd/python-cmd.sh config/config.var/bup-python - "$$(cat config/config.var/bup-python)" dev/replace -l '@bup_python@' \ - "$$(dev/shquote < config/config.var/bup-python)" \ - < "$<" > "$@".$$PPID.tmp - chmod +x "$@".$$PPID.tmp - mv "$@".$$PPID.tmp "$@" - long-test: export BUP_TEST_LEVEL=11 long-test: test @@ -268,10 +269,8 @@ long-check: check .PHONY: check-both check-both: - $(MAKE) clean \ - && PYTHON=python3 BUP_ALLOW_UNEXPECTED_PYTHON_VERSION=true $(MAKE) check - $(MAKE) clean \ - && PYTHON=python2 $(MAKE) check + $(MAKE) clean && PYTHON=python3 $(MAKE) check + $(MAKE) clean && PYTHON=python2 $(MAKE) check cmd/bup-%: cmd/%-cmd.py rm -f $@ @@ -317,10 +316,10 @@ 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 cmd/bup-python +clean: Documentation/clean config/bin/python + cd config && rm -rf config.var cd config && rm -f *~ .*~ \ ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES} - cd config && rm -rf config.var rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \ .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \ *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \ @@ -340,4 +339,4 @@ clean: Documentation/clean cmd/bup-python ./configure-version --clean t/configure-sampledata --clean # Remove last so that cleanup tools can depend on it - rm -f cmd/bup-python + rm -rf config/bin