Skip to content

Commit ef08a28

Browse files
committed
Improve check_modules script
1 parent 80894ee commit ef08a28

File tree

6 files changed

+879
-254
lines changed

6 files changed

+879
-254
lines changed

Makefile.pre.in

+8-5
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ LIBEXPAT_HEADERS= \
582582
# Default target
583583
all: @DEF_MAKE_ALL_RULE@
584584
build_all: check-clean-src $(BUILDPYTHON) platform oldsharedmods sharedmods \
585-
gdbhooks Programs/_testembed scripts
586-
build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config
585+
gdbhooks Programs/_testembed scripts checkoldsharedmods
586+
build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config checkoldsharedmods
587587

588588
# Check that the source is clean when building out of source.
589589
check-clean-src:
@@ -909,15 +909,17 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
909909
# create relative links from build/lib.platform/egg.so to Modules/egg.so
910910
# pybuilddir.txt is created too late. We cannot use it in Makefile
911911
# targets. ln --relative is not portable.
912-
oldsharedmods: $(SHAREDMODS) pybuilddir.txt
912+
oldsharedmods: $(SHAREDMODS) $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt
913913
@target=`cat pybuilddir.txt`; \
914914
$(MKDIR_P) $$target; \
915915
for mod in X $(SHAREDMODS); do \
916916
if test $$mod != X; then \
917917
$(LN) -sf ../../$$mod $$target/`basename $$mod`; \
918918
fi; \
919919
done
920-
@$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/check_shared_ext.py
920+
921+
checkoldsharedmods: oldsharedmods $(BUILDPYTHON)
922+
@$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/check_modules.py
921923

922924
Modules/Setup.local:
923925
@# Create empty Setup.local when file was deleted by user
@@ -2532,7 +2534,8 @@ update-config:
25322534
Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
25332535

25342536
# Declare targets that aren't real files
2535-
.PHONY: all build_all build_wasm sharedmods check-clean-src oldsharedmods test quicktest
2537+
.PHONY: all build_all build_wasm sharedmods check-clean-src oldsharedmods
2538+
.PHONY: checkoldsharedmods test quicktest
25362539
.PHONY: install altinstall oldsharedinstall bininstall altbininstall
25372540
.PHONY: maninstall libinstall inclinstall libainstall sharedinstall
25382541
.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure

0 commit comments

Comments
 (0)