X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=5c00c290ceb63041f98fab58cfd0f9b71c5c16c0;hb=172cccc8b0205122f3061a70d016f745950da00e;hp=79fbcb36e9e04e41efc03f36e06c5aea67653ac5;hpb=c6ca14bac1e848d9414841d7181b7c7cdc85caa2;p=bup.git

diff --git a/Makefile b/Makefile
index 79fbcb3..5c00c29 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)
 
@@ -62,8 +62,12 @@ $(current_sampledata):
 
 define install-python-bin
   set -e; \
-  sed -e '1 s|.*|#!$(bup_python)|; 2,/^# end of bup preamble$$/d' $1 > $2; \
-  chmod 0755 $2;
+  if grep -qE '^# end of bup preamble$$' "$1"; then \
+    sed -E '1 s|.*|#!$(bup_python)|; 2,/^# end of bup preamble$$/d' $(1) > $(2); \
+  else \
+    cp $(1) $(2); \
+  fi; \
+  chmod 0755 $(2);
 endef
 
 PANDOC ?= $(shell type -p pandoc)
@@ -126,10 +130,13 @@ lib/bup/_helpers$(SOEXT): \
 	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
+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 +152,8 @@ runtests-python: all t/tmp
 	    | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-prune-older \
+  t/test-web.sh \
   t/test-rm.sh \
   t/test-gc.sh \
   t/test-main.sh \
@@ -199,10 +208,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
@@ -232,25 +244,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