diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2018-02-17 17:58:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 17:58:57 -0600 |
| commit | d6ff8a7037903497eff95fa32bdac2b6adf71505 (patch) | |
| tree | 67fa8dcf249d2d1cf8046b67f6453edcf8677e3a | |
| parent | 17ab8f0e8e2b2f66d11fbb95aa9936544a5e1a9a (diff) | |
| download | cpython-git-d6ff8a7037903497eff95fa32bdac2b6adf71505.tar.gz | |
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.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Makefile.pre.in | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index dd0688717c..665b266146 100644 --- 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 f58b715378..916f03091a 100644 --- 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 |