cirrus: make macos image match reality (catalina)

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 4ca1a031c7c2a3daf362849a782e7f364e5a7ce7..51afd1a0a722933812de191408b9af5af648ea21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 
+MAKEFLAGS += --warn-undefined-variables
+
 SHELL := bash
 .DEFAULT_GOAL := all
 
@@ -26,8 +28,9 @@ current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
 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)
+CFLAGS := -O2 -Wall -Werror -Wformat=2 $(CFLAGS)
+CFLAGS := -Wno-unknown-pragmas -Wsign-compare $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(PYINCLUDE) $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(os),CYGWIN)
@@ -40,8 +43,8 @@ else
   test_tmp := $(CURDIR)/t/tmp
 endif
 
-initial_setup := $(shell ./configure-version --update $(isok))
-initial_setup := $(call shout,$(initial_setup),Version configuration failed))
+initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
+initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
 
 config/config.vars: \
   configure config/configure config/configure.inc \
@@ -51,17 +54,22 @@ config/config.vars: \
 # On some platforms, Python.h and readline.h fight over the
 # _XOPEN_SOURCE version, i.e. -Werror crashes on a mismatch, so for
 # now, we're just going to let Python's version win.
-readline_cflags += $(shell pkg-config readline --cflags)
-readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
-readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
-ifneq ($(readline_xopen),600)
-  $(error "Unexpected pkg-config readline _XOPEN_SOURCE --cflags $(readline_cflags)")
+
+ifneq ($(strip $(bup_readline_cflags)),)
+  readline_cflags += $(bup_readline_cflags)
+  readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
+  readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
+  readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
+  readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
+  CFLAGS += $(readline_cflags)
 endif
-readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
-readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
 
-CFLAGS += $(readline_cflags)
-LDFLAGS += $(shell pkg-config readline --libs)
+LDFLAGS += $(bup_readline_ldflags)
+
+ifeq ($(bup_have_libacl),1)
+  CFLAGS += $(bup_libacl_cflags)
+  LDFLAGS += $(bup_libacl_ldflags)
+endif
 
 config/bin/python: config/config.vars
 
@@ -69,7 +77,7 @@ bup_cmds := \
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
   $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
 
-bup_deps := lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds)
 
 all: $(bup_deps) Documentation/all $(current_sampledata)
 
@@ -128,6 +136,13 @@ install: all
        $(INSTALL) -pm 0644 \
                lib/web/*.html \
                $(dest_libdir)/web/
+       if test -e lib/bup/checkout_info.py; then \
+           $(INSTALL) -pm 0644 lib/bup/checkout_info.py \
+               $(dest_libdir)/bup/source_info.py; \
+       else \
+           ! grep -qF '$$Format' lib/bup/source_info.py; \
+           $(INSTALL) -pm 0644 lib/bup/source_info.py $(dest_libdir)/bup/; \
+       fi
 
 config/config.h: config/config.vars
 
@@ -141,14 +156,6 @@ lib/bup/_helpers$(SOEXT): \
          "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
 
@@ -157,6 +164,7 @@ runtests: runtests-python runtests-cmdline
 python_tests := \
   lib/bup/t/tbloom.py \
   lib/bup/t/tclient.py \
+  lib/bup/t/tcompat.py \
   lib/bup/t/tgit.py \
   lib/bup/t/thashsplit.py \
   lib/bup/t/thelpers.py \
@@ -179,6 +187,7 @@ runtests-python: all t/tmp
            | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-help \
   t/test.sh \
   t/test-argv \
   t/test-cat-file.sh \
@@ -280,7 +289,7 @@ cmd/bup-%: cmd/%-cmd.sh
 Documentation/all: $(man_roff) $(man_html)
 
 Documentation/substvars: $(bup_deps)
-       echo "s,%BUP_VERSION%,$$(./bup version --tag),g" > $@
+       echo "s,%BUP_VERSION%,$$(./bup version),g" > $@
        echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
 
 Documentation/%.1: Documentation/%.md Documentation/substvars
@@ -319,6 +328,7 @@ clean: Documentation/clean config/bin/python
        rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
+               lib/bup/checkout_info.py \
                randomgen memtest \
                testfs.img lib/bup/t/testfs.img
        for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \
@@ -332,7 +342,6 @@ clean: Documentation/clean config/bin/python
          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
         # Remove last so that cleanup tools can depend on it
        rm -rf config/bin