$(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; \
$(INSTALL) -pm 0644 \
lib/bup/*.py \
$(dest_libdir)/bup
runtests: runtests-python runtests-cmdline
python_tests := \
+ lib/bup/t/tbloom.py \
lib/bup/t/thashsplit.py \
+ lib/bup/t/tindex.py \
lib/bup/t/toptions.py \
lib/bup/t/tshquote.py \
lib/bup/t/tvint.py \
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/thelpers.py \
- lib/bup/t/tindex.py \
lib/bup/t/tmetadata.py \
lib/bup/t/tresolve.py \
lib/bup/t/tvfs.py
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 :=
ifeq "2" "$(bup_python_majver)"
cmdline_tests += \
+ t/test-argv \
t/test-ftp \
t/test-save-restore \
t/test-packsizelimit \
./wvtest run t/test-release-archive.sh
cmd/bup-python: cmd/python-cmd.sh config/config.vars Makefile
- head -n -1 $< > "$@".$$PPID.tmp
+ sed -e '$$ d' $< > "$@".$$PPID.tmp
printf "exec %q \"\$$@\"\n" "$(bup_python)" >> "$@".$$PPID.tmp
chmod +x "$@".$$PPID.tmp
mv "$@".$$PPID.tmp "$@"
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 \