From 31eb91a18397027b52242d54c79cd05e0bccdb45 Mon Sep 17 00:00:00 2001 From: ssmahaja Date: Sun, 11 Dec 2022 21:10:48 -0500 Subject: [PATCH 1/4] Copy python executable (python.exe) to python3.exe --- Makefile.pre.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in index 815df69ad48c67..553d660c149750 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -279,6 +279,7 @@ LIBOBJDIR= Python/ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) +PYTHON3= python3$(EXE) BUILDPYTHON= python$(BUILDEXE) HOSTRUNNER= @HOSTRUNNER@ @@ -580,6 +581,7 @@ LIBEXPAT_HEADERS= \ all: @DEF_MAKE_ALL_RULE@ build_all: check-clean-src $(BUILDPYTHON) platform sharedmods \ gdbhooks Programs/_testembed scripts checksharedmods rundsymutil + cp $(PYTHON) $(PYTHON3) build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \ python-config checksharedmods From ac44d2fd364ccda3f8d9257a166ab5e01efca8d9 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 04:46:30 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Build/2022-12-12-04-46-29.gh-issue-99185.bQm_Wd.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Build/2022-12-12-04-46-29.gh-issue-99185.bQm_Wd.rst diff --git a/Misc/NEWS.d/next/Build/2022-12-12-04-46-29.gh-issue-99185.bQm_Wd.rst b/Misc/NEWS.d/next/Build/2022-12-12-04-46-29.gh-issue-99185.bQm_Wd.rst new file mode 100644 index 00000000000000..07822a8348c67c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2022-12-12-04-46-29.gh-issue-99185.bQm_Wd.rst @@ -0,0 +1 @@ +Copy python executable (python.exe) to python3.exe From 8b649888f7e180d1c6b0e2032b725ecd553800c9 Mon Sep 17 00:00:00 2001 From: ssmahaja Date: Mon, 12 Dec 2022 00:23:38 -0500 Subject: [PATCH 3/4] changed file copied from PYTHON to BUILDPYTHON --- Makefile.pre.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 553d660c149750..6d4b086c04c7d4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -279,8 +279,8 @@ LIBOBJDIR= Python/ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) -PYTHON3= python3$(EXE) BUILDPYTHON= python$(BUILDEXE) +BUILDPYTHON3= python3$(BUILDEXE) HOSTRUNNER= @HOSTRUNNER@ @@ -581,7 +581,7 @@ LIBEXPAT_HEADERS= \ all: @DEF_MAKE_ALL_RULE@ build_all: check-clean-src $(BUILDPYTHON) platform sharedmods \ gdbhooks Programs/_testembed scripts checksharedmods rundsymutil - cp $(PYTHON) $(PYTHON3) + cp $(BUILDPYTHON) $(BUILDPYTHON3) build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \ python-config checksharedmods From 005f12f5fed5e1c185c38a3fe7583cef654595f5 Mon Sep 17 00:00:00 2001 From: ssmahaja Date: Mon, 12 Dec 2022 21:26:51 -0500 Subject: [PATCH 4/4] Check extension before copy --- Makefile.pre.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 6d4b086c04c7d4..bb88ac43e7321e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -176,6 +176,7 @@ EXPORTSFROM= @EXPORTSFROM@ # Executable suffix (.exe on Windows and Mac OS X) EXE= @EXEEXT@ BUILDEXE= @BUILDEXEEXT@ +WINDOWSEXE=.exe # Short name and location for Mac OS X Python framework UNIVERSALSDK=@UNIVERSALSDK@ @@ -581,7 +582,9 @@ LIBEXPAT_HEADERS= \ all: @DEF_MAKE_ALL_RULE@ build_all: check-clean-src $(BUILDPYTHON) platform sharedmods \ gdbhooks Programs/_testembed scripts checksharedmods rundsymutil - cp $(BUILDPYTHON) $(BUILDPYTHON3) + @if test "$(BUILDEXE)" = "$(WINDOWSEXE)" ; then \ + cp $(BUILDPYTHON) $(BUILDPYTHON3) ; \ + fi build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \ python-config checksharedmods