X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=b1e1214440f88c43c183278e7246841f48c6fe6c;hb=68098e710b73cd68eb91f563ba08dcbc5b0416ec;hp=e49f80d992406a5746af0505d372e75b7d8e6e6d;hpb=7e0fcaa5b28eb1aa022a59e5056679e7854070b9;p=bup.git

diff --git a/Makefile b/Makefile
index e49f80d..b1e1214 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,35 @@
 
-sampledata_rev := $(shell t/configure-sampledata --revision)
+SHELL := bash
+.DEFAULT_GOAL := all
+
+# See config/config.vars.in (sets bup_python, among other things)
+include config/config.vars
+
+pf := set -o pipefail
+
+define isok
+  && echo " ok" || echo " no"
+endef
+
+# If ok, strip trailing " ok" and return the output, otherwise, error
+define shout
+$(if $(subst ok,,$(lastword $(1))),$(error $(2)),$(shell x="$(1)"; echo $${x%???}))
+endef
+
+sampledata_rev := $(shell t/configure-sampledata --revision $(isok))
+sampledata_rev := \
+  $(call shout,$(sampledata_rev),Could not parse sampledata revision)
+
 current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
 
-OS:=$(shell uname | sed 's/[-_].*//')
+os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
+os := $(call shout,$(os),Unable to determine OS)
+
 CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
-ifeq ($(OS),CYGWIN)
+ifeq ($(os),CYGWIN)
   SOEXT:=.dll
 endif
 
@@ -17,78 +39,91 @@ 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
+initial_setup := $(shell ./configure-version --update $(isok))
+initial_setup := $(call shout,$(initial_setup),Version configuration failed))
+
+config/config.vars: configure config/configure config/configure.inc \
+  $(wildcard config/*.in)
+	MAKE="$(MAKE)" ./configure
+
+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)
 
 all: $(bup_deps) Documentation/all $(current_sampledata)
 
 bup:
 	ln -s main.py bup
 
-Documentation/all: $(bup_deps)
-
 $(current_sampledata):
 	t/configure-sampledata --setup
 
-PYTHON = $(shell cmd/bup-python -c 'import sys; print sys.executable')
-
 define install-python-bin
   set -e; \
-  sed -e '1 s|.*|#!$(PYTHON)|; 2,/^# end of bup preamble$$/d' $1 > $2; \
+  sed -e '1 s|.*|#!$(bup_python)|; 2,/^# end of bup preamble$$/d' $1 > $2; \
   chmod 0755 $2;
 endef
 
+PANDOC ?= $(shell type -p pandoc)
+
+ifeq (,$(PANDOC))
+  $(shell echo "Warning: pandoc not found; skipping manpage generation" 1>&2)
+  man_md :=
+else
+  man_md := $(wildcard Documentation/*.md)
+endif
+
+man_roff := $(patsubst %.md,%.1,$(man_md))
+man_html := $(patsubst %.md,%.html,$(man_md))
+
 INSTALL=install
-PREFIX=/usr
-MANDIR=$(DESTDIR)$(PREFIX)/share/man
-DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
-BINDIR=$(DESTDIR)$(PREFIX)/bin
-LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
+PREFIX=/usr/local
+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 $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-		$(LIBDIR)/bup $(LIBDIR)/cmd \
-		$(LIBDIR)/web $(LIBDIR)/web/static
-	[ ! -e Documentation/.docs-available ] || \
-	  $(INSTALL) -m 0644 \
-		Documentation/*.1 \
-		$(MANDIR)/man1
-	[ ! -e Documentation/.docs-available ] || \
-	  $(INSTALL) -m 0644 \
-		Documentation/*.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/
-%/all:
-	$(MAKE) -C $* all
+		$(dest_libdir)/web/
 
-%/clean:
-	$(MAKE) -C $* clean
-
-config/config.h: config/Makefile config/configure config/configure.inc \
-		$(wildcard config/*.in)
-	cd config && $(MAKE) config.h
+config/config.h: config/config.vars
 
 lib/bup/_helpers$(SOEXT): \
 		config/config.h \
 		lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
 	@rm -f $@
 	cd lib/bup && \
-	LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
+	LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
 	cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
 
 lib/bup/_version.py:
@@ -101,9 +136,13 @@ t/tmp:
 
 runtests: runtests-python runtests-cmdline
 
+# The "pwd -P" here may not be appropriate in the long run, but we
+# need it until we settle the relevant drecurse/exclusion questions:
+# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
 runtests-python: all t/tmp
-	TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py 2>&1 \
-	| tee -a t/tmp/test-log/$$$$.log
+	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
+	  "$(bup_python)" wvtest.py t/t*.py lib/*/t/t*.py 2>&1 \
+	    | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
   t/test-index.sh \
@@ -134,8 +173,12 @@ cmdline_tests := \
   t/test.sh
 
 # For parallel runs.
+# The "pwd -P" here may not be appropriate in the long run, but we
+# need it until we settle the relevant drecurse/exclusion questions:
+# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
 tmp-target-run-test%: all t/tmp
-	TMPDIR="$(test_tmp)" t/test$* 2>&1 | tee -a t/tmp/test-log/$$$$.log
+	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
+	  t/test$* 2>&1 | tee -a t/tmp/test-log/$$$$.log
 
 runtests-cmdline: $(subst t/test,tmp-target-run-test,$(cmdline_tests))
 
@@ -145,18 +188,16 @@ 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) PYTHON=$(PYTHON) runtests-python runtests-cmdline
+	./wvtest watch --no-counts $(MAKE) runtests-python runtests-cmdline
 	./wvtest report t/tmp/test-log/*.log
 
 check: test
 
-cmd/python-cmd.sh: config/configure
-	./config/configure
-
-cmds: \
-    $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
-    $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.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
+	mv cmd/python-cmd.sh.$$PPID.tmp cmd/python-cmd.sh
 
 cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
@@ -166,11 +207,31 @@ cmd/bup-%: cmd/%-cmd.sh
 	rm -f $@
 	ln -s $*-cmd.sh $@
 
+.PHONY: Documentation/all
+Documentation/all: $(man_roff) $(man_html)
+
+Documentation/substvars: $(bup_deps)
+	echo "s,%BUP_VERSION%,$$(./bup version --tag),g" > $@
+	echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
+
+Documentation/%.1: Documentation/%.md Documentation/substvars
+	$(pf); sed -f Documentation/substvars $< \
+	  | $(PANDOC) -s -r markdown -w man -o $@
+
+Documentation/%.html: Documentation/%.md Documentation/substvars
+	$(pf); sed -f Documentation/substvars $< \
+	  | $(PANDOC) -s -r markdown -w html -o $@
+
+.PHONY: Documentation/clean
+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 && \
@@ -192,14 +253,16 @@ push-docs: export-docs
 # import pregenerated doc files from origin/man and origin/html, in case you
 # don't have pandoc but still want to be able to install the docs.
 import-docs: Documentation/clean
-	git archive origin/html | (cd Documentation; tar -xvf -)
-	git archive origin/man | (cd Documentation; tar -xvf -)
+	$(pf); git archive origin/html | (cd Documentation && tar -xvf -)
+	$(pf); git archive origin/man | (cd Documentation && tar -xvf -)
 
-clean: Documentation/clean config/clean
+clean: Documentation/clean cmd/bup-python
+	cd config && rm -f *~ .*~ \
+	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
 	rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
 		.*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
 		*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-		bup bup-* cmd/bup-* \
+		bup bup-* \
 		randomgen memtest \
 		testfs.img lib/bup/t/testfs.img
 	if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
@@ -212,3 +275,5 @@ clean: Documentation/clean config/clean
 	if test -e t/tmp; then t/force-delete t/tmp; fi
 	./configure-version --clean
 	t/configure-sampledata --clean
+        # Remove last so that cleanup tools can depend on it
+	rm -f cmd/bup-* cmd/python-cmd.sh