config/config.vars: configure config/configure config/configure.inc \
$(wildcard config/*.in)
- ./configure
+ MAKE="$(MAKE)" ./configure
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/_version.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := bup lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
all: $(bup_deps) Documentation/all $(current_sampledata)
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 $(BINDIR) \
- $(LIBDIR)/bup $(LIBDIR)/cmd \
- $(LIBDIR)/web $(LIBDIR)/web/static
- test -z "$(man_roff)" || install -d $(MANDIR)/man1
- test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(MANDIR)/man1
- test -z "$(man_html)" || install -d $(DOCDIR)
- test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_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)
+ $(call install-python-bin,bup,"$(dest_bindir)/bup")
set -e; \
for cmd in $$(ls cmd/bup-* | grep -v cmd/bup-python); do \
- $(call install-python-bin,"$$cmd","$(LIBDIR)/$$cmd") \
+ $(call install-python-bin,"$$cmd","$(dest_libdir)/$$cmd") \
done
$(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/
+ $(dest_libdir)/web/
config/config.h: config/config.vars
@rm -f $@
cd lib/bup && \
LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_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
+ # Make sure there's just the one file we expect before we copy it.
+ find lib/bup/build/* -maxdepth 1 -name '_helpers*$(SOEXT)' \
+ -exec printf 'x\c' '{}' \; | wc -c | xargs test 1 -eq
+ 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
| tee -a t/tmp/test-log/$$$$.log
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-fsck.sh \
t/test-index-clear.sh \
t/test-index-check-device.sh \
- t/test-ls.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-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-command-without-init-fails.sh \
t/test-redundant-saves.sh \
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) runtests-python runtests-cmdline
+ ./wvtest watch --no-counts \
+ $(MAKE) runtests-python runtests-cmdline 2>t/tmp/test-log/$$$$.log
./wvtest report t/tmp/test-log/*.log
check: test
+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 u+x 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-%: cmd/%-cmd.py
$(pf); git archive origin/html | (cd Documentation && tar -xvf -)
$(pf); git archive origin/man | (cd Documentation && tar -xvf -)
-clean: Documentation/clean
+clean: Documentation/clean cmd/bup-python
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 \
+ bup bup-* \
randomgen memtest \
testfs.img lib/bup/t/testfs.img
if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
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-* cmd/python-cmd.sh
projects / bup.git / blobdiff