X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=a185bac979dd6d00d749d26328e4b12a4e3483c8;hb=31d8bf04c831d8a86dd149cf0c7067a9a3e9c336;hp=0be621fd97bd3164c3fb73d80c8c9bdc650e41e3;hpb=18121c60223f1c8a2dc261989773dd2b501bfa38;p=bup.git

diff --git a/Makefile b/Makefile
index 0be621f..a185bac 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ 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)
 
@@ -80,36 +80,41 @@ man_html := $(patsubst %.md,%.html,$(man_md))
 
 INSTALL=install
 PREFIX=/usr/local
-MANDIR=$(DESTDIR)$(PREFIX)/share/man
-DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
-BINDIR=$(DESTDIR)$(PREFIX)/bin
-LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
+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
 
@@ -119,12 +124,18 @@ lib/bup/_helpers$(SOEXT): \
 	@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' '{}' \; | 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
@@ -140,6 +151,15 @@ runtests-python: all 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 \
@@ -149,13 +169,15 @@ cmdline_tests := \
   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 \
@@ -183,15 +205,19 @@ stupid:
 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