HACKING: update for 0.27 release

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 48ad75d734655e0e131dad6b8005fe87f0f3a16d..6c4053a7f76e7cb74b36bd39e8cb4512d39c2e83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+
+sampledata_rev := $(shell t/configure-sampledata --revision)
+current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
+
 OS:=$(shell uname | sed 's/[-_].*//')
 CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
@@ -13,15 +17,18 @@ else
   test_tmp := $(CURDIR)/t/tmp
 endif
 
-default: all
+initial_setup := $(shell ./configure-version --update)
+bup_deps := bup lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
-all: bup Documentation/all
-       t/configure-sampledata --setup
+all: $(bup_deps) Documentation/all $(current_sampledata)
 
-bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds main.py
-       ln -sf main.py bup
+bup:
+       ln -s main.py bup
 
-Documentation/all: bup
+Documentation/all: $(bup_deps)
+
+$(current_sampledata):
+       t/configure-sampledata --setup
 
 INSTALL=install
 PYTHON=python
@@ -76,49 +83,55 @@ lib/bup/_helpers$(SOEXT): \
        LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
        cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
 
-.PHONY: lib/bup/_version.py
 lib/bup/_version.py:
-       rm -f $@ $@.new
-       ./format-subst.pl $@.pre >$@.new
-       mv $@.new $@
+       @echo "Something has gone wrong; $@ should already exist."
+       @echo 'Check "./configure-version --update"'
+       @false
 
 t/tmp:
        mkdir t/tmp
 
-runtests: all runtests-python runtests-cmdline
+runtests: runtests-python runtests-cmdline
 
 runtests-python: all t/tmp
        TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
 
-runtests-cmdline: all t/tmp
-       TMPDIR="$(test_tmp)" t/test-fuse.sh
-       TMPDIR="$(test_tmp)" t/test-drecurse.sh
-       TMPDIR="$(test_tmp)" t/test-cat-file.sh
-       TMPDIR="$(test_tmp)" t/test-compression.sh
-       TMPDIR="$(test_tmp)" t/test-fsck.sh
-       TMPDIR="$(test_tmp)" t/test-index-clear.sh
-       TMPDIR="$(test_tmp)" t/test-index-check-device.sh
-       TMPDIR="$(test_tmp)" t/test-ls.sh
-       TMPDIR="$(test_tmp)" t/test-meta.sh
-       TMPDIR="$(test_tmp)" t/test-on.sh
-       TMPDIR="$(test_tmp)" t/test-restore-map-owner.sh
-       TMPDIR="$(test_tmp)" t/test-restore-single-file.sh
-       TMPDIR="$(test_tmp)" t/test-rm-between-index-and-save.sh
-       TMPDIR="$(test_tmp)" t/test-sparse-files.sh
-       TMPDIR="$(test_tmp)" t/test-command-without-init-fails.sh
-       TMPDIR="$(test_tmp)" t/test-redundant-saves.sh
-       TMPDIR="$(test_tmp)" t/test-save-creates-no-unrefs.sh
-       TMPDIR="$(test_tmp)" t/test-save-restore-excludes.sh
-       TMPDIR="$(test_tmp)" t/test-save-strip-graft.sh
-       TMPDIR="$(test_tmp)" t/test-import-rdiff-backup.sh
-       TMPDIR="$(test_tmp)" t/test-xdev.sh
-       TMPDIR="$(test_tmp)" t/test.sh
+cmdline_tests := \
+  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.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-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-save-strip-graft.sh \
+  t/test-import-duplicity.sh \
+  t/test-import-rdiff-backup.sh \
+  t/test-xdev.sh \
+  t/test.sh
+
+# For parallel runs.
+tmp-target-run-test%: all t/tmp
+       TMPDIR="$(test_tmp)" t/test$*
+
+runtests-cmdline: $(subst t/test,tmp-target-run-test,$(cmdline_tests))
 
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test
 
 test: all
-       ./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests
+       ./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
 
 check: test
 
@@ -167,7 +180,8 @@ clean: Documentation/clean config/clean
        rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-               bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
+               bup bup-* cmd/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/mnt; then rm -r t/mnt; fi
@@ -177,4 +191,5 @@ clean: Documentation/clean config/clean
          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