$(wildcard config/*.in)
MAKE="$(MAKE)" ./configure
-bup_cmds := cmd/bup-python\
+bup_cmds := cmd/bup-python \
$(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
$(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
-bup_deps := bup lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
all: $(bup_deps) Documentation/all $(current_sampledata)
-bup:
- ln -s main.py bup
-
$(current_sampledata):
t/configure-sampledata --setup
-define install-python-bin
+
+bup_libdir="$script_home/../lib" # bup_libdir will be adjusted during install
+
+define install-bup-python
set -e; \
- sed -e '1 s|.*|#!$(bup_python)|; 2,/^# end of bup preamble$$/d' $1 > $2; \
+ sed -e 's|.*# bup_libdir will be adjusted during install|bup_libdir="$$script_home/.."|' $1 > $2; \
chmod 0755 $2;
endef
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)
- $(call install-python-bin,bup,"$(dest_bindir)/bup")
+ $(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")
+ cd "$(dest_bindir)" && \
+ ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
set -e; \
- for cmd in $$(ls cmd/bup-* | grep -v cmd/bup-python); do \
- $(call install-python-bin,"$$cmd","$(dest_libdir)/$$cmd") \
- done
$(INSTALL) -pm 0644 \
lib/bup/*.py \
$(dest_libdir)/bup
runtests: runtests-python runtests-cmdline
-# The wildcards are not expanded until use
-ifeq "2" "$(bup_python_majver)"
- 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
-else
- python_tests := \
- lib/bup/t/thashsplit.py \
- lib/bup/t/toptions.py \
- lib/bup/t/tshquote.py \
- lib/bup/t/tvint.py \
- lib/bup/t/txstat.py
-endif
+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:
runtests-python: all t/tmp
mkdir -p t/tmp/test-log
$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
- "$(bup_python)" wvtest.py $(python_tests) 2>&1 \
+ ./wvtest.py $(python_tests) 2>&1 \
| tee -a t/tmp/test-log/$$$$.log
+cmdline_tests := \
+ 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-list-idx.sh \
+ t/test-ls \
+ t/test-ls-remote \
+ t/test-tz.sh
+
ifeq "2" "$(bup_python_majver)"
- cmdline_tests := \
+ cmdline_tests += \
t/test-ftp \
t/test-save-restore \
t/test-packsizelimit \
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-drecurse.sh \
- t/test-cat-file.sh \
- t/test-compression.sh \
- t/test-fsck.sh \
- t/test-index-clear.sh \
t/test-index-check-device.sh \
- t/test-ls \
- t/test-ls-remote \
- t/test-tz.sh \
t/test-meta.sh \
t/test-on.sh \
t/test-restore-map-owner.sh \
t/test-rm-between-index-and-save.sh \
t/test-save-with-valid-parent.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-excludes.sh \
t/test-import-rdiff-backup.sh \
t/test-xdev.sh \
t/test.sh
-else
- cmdline_tests :=
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
+test_get_targets :=
+
ifeq "2" "$(bup_python_majver)"
- test_get_targets := \
+ 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-pick \
tmp-target-run-test-get-new-tag \
tmp-target-run-test-get-unnamed
-else
- test_get_targets :=
endif
# For parallel runs.
distcheck: all
./wvtest run t/test-release-archive.sh
-cmd/python-cmd.sh: config/config.vars Makefile
- printf "#!/bin/sh\nexec %q \"\$$@\"" "$(bup_python)" \
- >> cmd/python-cmd.sh.$$PPID.tmp
- chmod +x cmd/python-cmd.sh.$$PPID.tmp
- mv cmd/python-cmd.sh.$$PPID.tmp cmd/python-cmd.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
long-check: export BUP_TEST_LEVEL=11
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
+
cmd/bup-%: cmd/%-cmd.py
rm -f $@
ln -s $*-cmd.py $@
clean: Documentation/clean cmd/bup-python
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 \
- bup \
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 \
./configure-version --clean
t/configure-sampledata --clean
# Remove last so that cleanup tools can depend on it
- rm -f cmd/bup-python cmd/python-cmd.sh
+ rm -f cmd/bup-python