bpo-30638: Add clinic to `make regen-all` (GH-5671)

Also, use PYTHON_FOR_REGEN for clinic and blake2s_impl.c rather than PYTHON_FOR_BUILD, and update .travis.yml to make use of the change.

diff --git a/.travis.yml b/.travis.yml
index dd0688717c0890aa20708519c19d4080dcd5d810..665b266146aec590533004cc0119b56036c9adf0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -111,8 +111,7 @@ before_script:
       fi
       openssl version
       ./configure --with-pydebug
-      make -j4
-      make -j4 regen-all clinic
+      make -j4 regen-all
       changes=`git status --porcelain`
       if ! test -z "$changes"
       then
@@ -120,6 +119,7 @@ before_script:
         echo "$changes"
         exit 1
       fi
+      make -j4
       make pythoninfo
 
 script:

diff --git a/Makefile.pre.in b/Makefile.pre.in
index f58b715378876a16057f6bf32b8e5247b022a27f..916f03091a00bcee352ed088396a4b8ae77e2afe 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -560,10 +560,9 @@ coverage-report: regen-grammar regen-importlib
        $(MAKE) coverage-lcov
 
 # Run "Argument Clinic" over all source files
-# (depends on python having already been built)
 .PHONY=clinic
-clinic: check-clean-src $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
-       $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
+clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+       $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
 
 # Build the interpreter
 $(BUILDPYTHON):        Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
@@ -593,9 +592,9 @@ Modules/_math.o: Modules/_math.c Modules/_math.h
        $(CC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $<
 
 # blake2s is auto-generated from blake2b
-$(srcdir)/Modules/_blake2/blake2s_impl.c: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2b_impl.c $(srcdir)/Modules/_blake2/blake2b2s.py
-       $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Modules/_blake2/blake2b2s.py
-       $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/clinic/clinic.py -f $@
+$(srcdir)/Modules/_blake2/blake2s_impl.c: $(srcdir)/Modules/_blake2/blake2b_impl.c $(srcdir)/Modules/_blake2/blake2b2s.py
+       $(PYTHON_FOR_REGEN) $(srcdir)/Modules/_blake2/blake2b2s.py
+       $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f $@
 
 # Build the shared modules
 # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
@@ -733,7 +732,8 @@ regen-importlib: Programs/_freeze_importlib
 ############################################################################
 # Regenerate all generated files
 
-regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast regen-importlib
+regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar \
+       regen-ast regen-importlib clinic
 
 ############################################################################
 # Special rules for object files