4v5u09Z5a4Yuc/mtgodot-poc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port(2P step 2): ScriptLib/PythonLauncher on the embedded interpreter

Browse Source 
Link mtpython into port_logic and copy 40250's ScriptLib launcher across:
PythonLauncher, PythonUtils and PythonMarshal, plus the 12 forwarding headers
that make its `#include <Python-2.7/*>` lines compile unchanged. symtable.h
forward-declares mod_ty rather than including Python-ast.h, whose one-word
macros (Delete, Module, Set, Print) collide with EterLib/Pool.h — the same
clash 40250 sidestepped by commenting out PySymtable_Build.

Two `// PORT:` edits: `unsigned char(val)` is an MSVC extension (PythonUtils.cpp,
twice), and PyObject_AsCharBuffer wants a Py_ssize_t* (TraceFunc).

port_python_launcher_test drives the launcher in the order UserInterface.cpp
does (:241-434): Create(), __DEBUG__/__COMMAND_LINE__, TRUE/FALSE, a CRLF script
through RunMemoryTextFile, a .pyc through RunCompiledFile, then RunFile reading
system.py out of the real pack. It stops at `ImportError: No module named app`,
i.e. the first C++ module RunMainScript registers — that is the 2V0 slice, and
the stdlib behind it is step 3. The host flags (Py_NoSiteFlag and friends) sit
in the test for now; step 3 moves them into the platform layer.

port-map statuses are set only for what the test actually executes: 10 of 12
launcher functions and 4 of 11 marshal ones (the small-.pyc path delegates to
CPython's own reader, so the ported r_object stays unreached). PythonUtils
compiles but nothing calls it until the binding modules arrive, so it stays TODO.

Windows has no mtpython yet, so port_logic drops ScriptLib and the shims there.

Tests: macOS ctest 27/27 incl. port.python_launcher; port_logic (with ScriptLib)
also compiles for android arm64 (NDK API 24) and ios arm64.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
shenlei
2026-09-23 08:54:48 +09:00
co-authored by Claude Opus 5
parent 5fad769ee8
commit 43bb561551
28 changed files with 1879 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/third_party/CMakeLists.txt
Vendored
+10 -3
View File
@@ -46,8 +46,15 @@ set_target_properties(minilzo PROPERTIES C_STANDARD 99)
add_library(mt3p::minilzo ALIAS minilzo)
# --- CPython 2.7.18 (embedded 40250 script layer, 批次 2P) ----------------------
# Off by default: it only needs to build where the script layer is actually linked or tested.
option(MTGODOT_EMBED_PYTHON "Build the embedded CPython 2.7.18 static library" OFF)
# On everywhere the interpreter has a pyconfig.h: since step 2 the ported ScriptLib is part of
# port_logic. Windows has none yet (MinGW vs MSVC, see cpython-2.7.18/CMakeLists.txt), so the
# script layer is left out of that build until 批次 2P step 4 decides.
if(WIN32)
set(MT_EMBED_PYTHON_DEFAULT OFF)
else()
set(MT_EMBED_PYTHON_DEFAULT ON)
endif()
option(MTGODOT_EMBED_PYTHON "Build the embedded CPython 2.7.18 static library" ${MT_EMBED_PYTHON_DEFAULT})
if(MTGODOT_EMBED_PYTHON)
add_subdirectory(cpython-2.7.18 EXCLUDE_FROM_ALL)
add_subdirectory(cpython-2.7.18)
endif()