X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=7635f900d94bdea3e36db4fd7dba067974e78350;hb=07c0a34b1977740211186d79e8b979bb906ccea1;hp=51d04acbe559cd0516f0cc82dd65ed8801432e68;hpb=c4d3e3aebd973cdb27d3c8057db05ed7f81475b8;p=bup.git

diff --git a/Makefile b/Makefile
index 51d04ac..7635f90 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)
 
@@ -124,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.
+	"$(bup_python)" -c \
+	  "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
+	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
@@ -145,6 +151,11 @@ 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 \
@@ -158,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 \
@@ -198,10 +211,13 @@ test: all
 
 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
@@ -231,25 +247,12 @@ Documentation/%.html: Documentation/%.md Documentation/substvars
 Documentation/clean:
 	cd Documentation && rm -f *~ .*~ *.[0-9] *.html substvars
 
-# update the local 'man' and 'html' branches with pregenerated output files, for
-# people who don't have pandoc (and maybe to aid in google searches or something)
-export-docs: Documentation/all
-	git update-ref refs/heads/man origin/man '' 2>/dev/null || true
-	git update-ref refs/heads/html origin/html '' 2>/dev/null || true
-	set -eo pipefail; \
-	GIT_INDEX_FILE=gitindex.tmp; export GIT_INDEX_FILE; \
-	rm -f $${GIT_INDEX_FILE} && \
-	git add -f Documentation/*.1 && \
-	git update-ref refs/heads/man \
-		$$(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 --always)" \
-		    | git commit-tree $$(git write-tree --prefix=Documentation) \
-				-p refs/heads/html)
+# Note: this adds commits containing the current manpages in roff and
+# html format to the man and html branches respectively.  The version
+# is determined by "git describe --always".
+.PHONY: update-doc-branches
+update-doc-branches: Documentation/all
+	dev/update-doc-branches refs/heads/man refs/heads/html
 
 # push the pregenerated doc files to origin/man and origin/html
 push-docs: export-docs