Makefile: remove NO_PYTHON flag in anticipation of making it compulsory.

And note the EXPERIMENTAL_DUAL_FUND env var in HACKING.md. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ElementsProject · Sep 22, 2021 · 9a071bf · 9a071bf
1 parent eaec226
commit 9a071bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,7 +49,6 @@ jobs:
           COMPAT: ${{ matrix.COMPAT }}
           PYTEST_PAR: ${{ matrix.PYTEST_PAR }}
           PYTEST_OPTS: ${{ matrix.PYTEST_OPTS }}
-          NO_PYTHON: ${{ matrix.NO_PYTHON }}
           COPTFLAGS: ${{ matrix.COPTFLAGS }}
           NETWORK: ${{ matrix.NETWORK }}
           TEST_CMD: ${{ matrix.TEST_CMD }}

diff --git a/Makefile b/Makefile
@@ -298,22 +298,22 @@ endif
 
 # generate-wire.py --page [header|impl] hdrfilename wirename < csv > file
 %_wiregen.h: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED); then if [ "$$NO_PYTHON" = 1 ]; then echo "Error: NO_PYTHON on $@"; exit 1; fi; \
+	@if $(call SHA256STAMP_CHANGED); then \
 		$(call VERBOSE,"wiregen $@",tools/generate-wire.py --page header $($@_args) $@ `basename $< .csv | sed 's/_exp_/_/'` < $< > $@ && $(call SHA256STAMP,//,)); \
 	fi
 
 %_wiregen.c: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED); then if [ "$$NO_PYTHON" = 1 ]; then echo "Error: NO_PYTHON on $@"; exit 1; fi; \
+	@if $(call SHA256STAMP_CHANGED); then \
 		$(call VERBOSE,"wiregen $@",tools/generate-wire.py --page impl $($@_args) ${@:.c=.h} `basename $< .csv | sed 's/_exp_/_/'` < $< > $@ && $(call SHA256STAMP,//,)); \
 	fi
 
 %_printgen.h: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED); then if [ "$$NO_PYTHON" = 1 ]; then echo "Error: NO_PYTHON on $@"; exit 1; fi; \
+	@if $(call SHA256STAMP_CHANGED); then \
 		$(call VERBOSE,"printgen $@",tools/generate-wire.py -s -P --page header $($@_args) $@ `basename $< .csv | sed 's/_exp_/_/'` < $< > $@ && $(call SHA256STAMP,//,)); \
 	fi
 
 %_printgen.c: %_wire.csv $(WIRE_GEN_DEPS)
-	@if $(call SHA256STAMP_CHANGED); then  if [ "$$NO_PYTHON" = 1 ]; then echo "Error: NO_PYTHON on $@"; exit 1; fi; \
+	@if $(call SHA256STAMP_CHANGED); then \
 		$(call VERBOSE,"printgen $@",tools/generate-wire.py -s -P --page impl $($@_args) ${@:.c=.h} `basename $< .csv | sed 's/_exp_/_/'` < $< > $@ && $(call SHA256STAMP,//,)); \
 	fi
 

diff --git a/doc/HACKING.md b/doc/HACKING.md
@@ -241,10 +241,7 @@ TEST_CHECK_DBSTMTS=[0|1]            - When running blackbox tests, this will
                                       Note: Only SQLite3.
 TEST_DB_PROVIDER=[sqlite3|postgres] - Selects the database to use when running
                                       blackbox tests.
-NO_PYTHON=[0|1]                     - Disables the usage of python when using
-                                      `make`. Useful to discover if regeneration
-                                      of e.g. `wallet/db_sqlite3_sqlgen.c` would
-                                      be required to build the source correctly.
+EXPERIMENTAL_DUAL_FUND=[0|1]	    - Enable dual-funding tests.
 ```
 
 Making BOLT Modifications

diff --git a/wallet/Makefile b/wallet/Makefile
@@ -37,12 +37,12 @@ SQL_FILES := 				\
 	wallet/test/run-wallet.c	\
 
 wallet/statements_gettextgen.po: $(SQL_FILES) $(FORCE)
-	@if $(call SHA256STAMP_CHANGED); then if [ "$$NO_PYTHON" = 1 ]; then echo "Error: NO_PYTHON on $@"; exit 1; fi; \
+	@if $(call SHA256STAMP_CHANGED); then \
 		$(call VERBOSE,"xgettext $@",xgettext -kNAMED_SQL -kSQL --add-location --no-wrap --omit-header -o $@ $(SQL_FILES) && $(call SHA256STAMP,# ,)); \
 	fi
 
 wallet/db_%_sqlgen.c: wallet/statements_gettextgen.po devtools/sql-rewrite.py $(FORCE)
-	@if $(call SHA256STAMP_CHANGED); then if [ "$$NO_PYTHON" = 1 ]; then echo "Error: NO_PYTHON on $@"; exit 1; fi; \
+	@if $(call SHA256STAMP_CHANGED); then \
 		$(call VERBOSE,"sql-rewrite $@",devtools/sql-rewrite.py wallet/statements_gettextgen.po $* > $@ && $(call SHA256STAMP,//,)); \
 	fi