X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=blobdiff_plain;f=Makefile;h=c0f1edc821f1d88405033b4fa6f6ca184ed988a9;hp=b1154c17aabc6df12c75bfb29546809744523ef7;hb=ea80387c098944bcfe17f63ea156b31cea27dce8;hpb=bfa900dd3681962ce9502a3ce6d3f3d054af6e6a

diff --git a/Makefile b/Makefile
index b1154c1..c0f1edc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,34 @@
+
+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 $(PYINCLUDE)
+CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(OS),CYGWIN)
   SOEXT:=.dll
 endif
 
-default: all
+ifdef TMPDIR
+  test_tmp := $(TMPDIR)
+else
+  test_tmp := $(CURDIR)/t/tmp
+endif
+
+initial_setup := $(shell ./configure-version --update)
+bup_deps := bup lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
-all: bup Documentation/all
+all: $(bup_deps) Documentation/all $(current_sampledata)
 
-bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+bup:
+	ln -s main.py bup
 
-Documentation/all: bup
+Documentation/all: $(bup_deps)
+
+$(current_sampledata):
+	t/configure-sampledata --setup
 
 INSTALL=install
 PYTHON=python
@@ -23,7 +39,7 @@ BINDIR=$(DESTDIR)$(PREFIX)/bin
 LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
 install: all
 	$(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-		$(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
+		$(LIBDIR)/bup $(LIBDIR)/cmd \
 		$(LIBDIR)/web $(LIBDIR)/web/static
 	[ ! -e Documentation/.docs-available ] || \
 	  $(INSTALL) -m 0644 \
@@ -33,23 +49,20 @@ install: all
 	  $(INSTALL) -m 0644 \
 		Documentation/*.html \
 		$(DOCDIR)
-	$(INSTALL) -m 0755 bup $(BINDIR)
-	$(INSTALL) -m 0755 \
+	$(INSTALL) -pm 0755 bup $(BINDIR)
+	$(INSTALL) -pm 0755 \
 		cmd/bup-* \
 		$(LIBDIR)/cmd
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/bup/*.py \
 		$(LIBDIR)/bup
-	$(INSTALL) -m 0755 \
+	$(INSTALL) -pm 0755 \
 		lib/bup/*$(SOEXT) \
 		$(LIBDIR)/bup
-	$(INSTALL) -m 0644 \
-		lib/tornado/*.py \
-		$(LIBDIR)/tornado
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/web/static/* \
 		$(LIBDIR)/web/static/
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/web/*.html \
 		$(LIBDIR)/web/
 %/all:
@@ -57,10 +70,10 @@ install: all
 
 %/clean:
 	$(MAKE) -C $* clean
-	
+
 config/config.h: config/Makefile config/configure config/configure.inc \
 		$(wildcard config/*.in)
-	cd config && make config.h
+	cd config && $(MAKE) config.h
 
 lib/bup/_helpers$(SOEXT): \
 		config/config.h \
@@ -70,33 +83,58 @@ 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 $@
-
-runtests: all runtests-python runtests-cmdline
-
-runtests-python:
-	$(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
-
-runtests-cmdline: all
-	t/test.sh
-	t/test-meta.sh
+	@echo "Something has gone wrong; $@ should already exist."
+	@echo 'Check "./configure-version --update"'
+	@false
+
+t/tmp:
+	mkdir t/tmp
+
+runtests: runtests-python runtests-cmdline
+
+runtests-python: all t/tmp
+	TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
+
+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
 
-bup: main.py
-	rm -f $@
-	ln -s $< $@
-
 cmds: \
     $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
     $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -105,14 +143,6 @@ cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
 	ln -s $*-cmd.py $@
 
-%: %.py
-	rm -f $@
-	ln -s $< $@
-
-bup-%: cmd-%.sh
-	rm -f $@
-	ln -s $< $@
-
 cmd/bup-%: cmd/%-cmd.sh
 	rm -f $@
 	ln -s $*-cmd.sh $@
@@ -126,13 +156,13 @@ export-docs: Documentation/all
 	rm -f $${GIT_INDEX_FILE} && \
 	git add -f Documentation/*.1 && \
 	git update-ref refs/heads/man \
-		$$(echo "Autogenerated man pages for $$(git describe)" \
+		$$(echo "Autogenerated man pages for $$(git describe --always)" \
 		    | git commit-tree $$(git write-tree --prefix=Documentation) \
 				-p refs/heads/man) && \
 	rm -f $${GIT_INDEX_FILE} && \
 	git add -f Documentation/*.html && \
 	git update-ref refs/heads/html \
-		$$(echo "Autogenerated html pages for $$(git describe)" \
+		$$(echo "Autogenerated html pages for $$(git describe --always)" \
 		    | git commit-tree $$(git write-tree --prefix=Documentation) \
 				-p refs/heads/html)
 
@@ -146,15 +176,20 @@ import-docs: Documentation/clean
 	git archive origin/html | (cd Documentation; tar -xvf -)
 	git archive origin/man | (cd Documentation; tar -xvf -)
 
-# tgit.py plays with permissions on lib/bup/t/pybuptest.tmp, so we should
-# ensure that we can delete the directory before doing it.
-clean: Documentation/clean
+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 \
-		out[12] out2[tc] tags[12] tags2[tc] \
+		bup bup-* cmd/bup-* \
+		randomgen memtest \
 		testfs.img lib/bup/t/testfs.img
-	rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build
-	if test -e testfs; then rmdir testfs; fi
-	if test -e lib/bup/t/testfs; then rmdir lib/bup/t/testfs; fi
+	if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
+	if test -e t/mnt; then rm -r t/mnt; fi
+	if test -e t/tmp; then t/cleanup-mounts-under t/tmp; fi
+        # FIXME: migrate these to t/mnt/
+	if test -e lib/bup/t/testfs; \
+	  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