X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=57f13d15aa3f1e7a0cc9f2fa5320b9d88af9900c;hb=2040b6890af45318eb512b4c7f5398e040b1ffe5;hp=39202e79329fa113812687b4c24b29e854b450af;hpb=9277b335d0be832b19f95f5f77f0c3bd29362a5b;p=bup.git diff --git a/Makefile b/Makefile index 39202e7..57f13d1 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ +MAKEFLAGS += --warn-undefined-variables + 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" @@ -39,48 +42,47 @@ else test_tmp := $(CURDIR)/t/tmp endif -initial_setup := $(shell ./configure-version --update $(isok)) -initial_setup := $(call shout,$(initial_setup),Version configuration failed)) +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 \ +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. -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)") + +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 + +LDFLAGS += $(bup_readline_ldflags) + +ifeq ($(bup_have_libacl),1) + CFLAGS += $(bup_libacl_cflags) + LDFLAGS += $(bup_libacl_ldflags) 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) +config/bin/python: config/config.vars -bup_cmds := cmd/bup-python \ +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/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds) +bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds) 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)) @@ -113,9 +115,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; \ @@ -131,6 +135,16 @@ install: all $(INSTALL) -pm 0644 \ lib/web/*.html \ $(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 + + + $(INSTALL) -pm 0644 lib/bup/checkout_info.py $(dest_libdir)/bup/; \ config/config.h: config/config.vars @@ -138,20 +152,12 @@ lib/bup/_helpers$(SOEXT): \ config/config.h lib/bup/bupsplit.h \ lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py @rm -f $@ - cd lib/bup && $(bup_python) csetup.py build "$(CFLAGS)" "$(LDFLAGS)" + 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) "$@" -lib/bup/_checkout.py: - @if grep -F '$Format' lib/bup/_release.py \ - && ! test -e lib/bup/_checkout.py; then \ - echo "Something has gone wrong; $@ should already exist."; \ - echo 'Check "./configure-version --update"'; \ - false; \ - fi - t/tmp: mkdir t/tmp @@ -191,6 +197,7 @@ cmdline_tests := \ 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 \ @@ -221,13 +228,6 @@ cmdline_tests := \ t/test-tz.sh \ t/test-xdev.sh -ifeq "2" "$(bup_python_majver)" - # unresolved - # web: needs more careful attention, path bytes round-trips, reprs, etc. - cmdline_tests += \ - t/test-web.sh -endif - 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 @@ -266,13 +266,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 @@ -281,10 +274,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 $@ @@ -298,7 +289,7 @@ cmd/bup-%: cmd/%-cmd.sh Documentation/all: $(man_roff) $(man_html) Documentation/substvars: $(bup_deps) - echo "s,%BUP_VERSION%,$$(./bup version --tag),g" > $@ + echo "s,%BUP_VERSION%,$$(./bup version),g" > $@ echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@ Documentation/%.1: Documentation/%.md Documentation/substvars @@ -330,13 +321,14 @@ 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 \ + 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 \ @@ -350,7 +342,6 @@ clean: Documentation/clean cmd/bup-python 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 -f cmd/bup-python + rm -rf config/bin