Merge pull request #2315 from blueloveTH/main

Upgrade Python language bindings to `v1.2.x`

.github/workflows/build.yml

@@ -161,6 +161,14 @@ jobs:
     runs-on: windows-2019
 
     steps:
+      # https://github.com/actions/runner-images/issues/2642#issuecomment-774988591
+      - name: configure Pagefile
+        uses: al-cheb/[email protected]
+        with:
+            minimum-size: 16GB
+            maximum-size: 16GB
+            disk-root: "C:"
+
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6

.gitignore

@@ -3,6 +3,7 @@
 *.opendb
 *.suo
 compile_commands.json
+compile_flags.txt
 sexit
 .vscode/
 build/install_manifest.txt

CMakeLists.txt

@@ -397,39 +397,24 @@ target_include_directories(squirrel PRIVATE ${SQUIRREL_DIR}/squirrel)
 target_include_directories(squirrel PRIVATE ${SQUIRREL_DIR}/sqstdlib)
 
 ################################
-# PocketPy (Python)
+# pocketpy (Python)
 ################################
 
-set(POCKETPY_DIR ${THIRDPARTY_DIR}/pocketpy)
+add_subdirectory(${THIRDPARTY_DIR}/pocketpy)
+target_compile_definitions(pocketpy PRIVATE PK_ENABLE_OS=0)
+include_directories(${THIRDPARTY_DIR}/pocketpy/include)
 
-if (${CMAKE_VERSION} VERSION_LESS "3.12.0") 
-    set(Python3_EXECUTABLE "python3")
-else()
-    find_package(Python3 COMPONENTS Interpreter)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(pocketpy PRIVATE -Wno-psabi)
 endif()
 
-add_custom_command(
-    OUTPUT ${POCKETPY_DIR}/src/_generated.h
-    COMMAND ${Python3_EXECUTABLE} preprocess.py
-    WORKING_DIRECTORY ${POCKETPY_DIR}
-    DEPENDS ${POCKETPY_DIR}/preprocess.py
-)
-
-add_library(python STATIC
-    ${POCKETPY_DIR}/src/_generated.h
-    ${POCKETPY_DIR}/c_bindings/pocketpy_c.cpp
-)
-
-set_target_properties(python PROPERTIES LINKER_LANGUAGE CXX)
-target_compile_definitions(python PRIVATE PK_ENABLE_OS=0)
-target_include_directories(python 
-    PRIVATE ${POCKETPY_DIR}/src 
-    PUBLIC ${POCKETPY_DIR}/c_bindings)
+# alias pocketpy to python for next steps
+set_target_properties(pocketpy PROPERTIES OUTPUT_NAME python)
+add_library(python ALIAS pocketpy)
 
-if (${CMAKE_VERSION} VERSION_LESS "3.8.0") 
-    set_target_properties(python PROPERTIES COMPILE_FLAGS "--std=c++17")
-else()
-    target_compile_features(python PRIVATE cxx_std_17)
+if(EMSCRIPTEN)
+    # exceptions must be enabled for emscripten
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fexceptions")
 endif()
 
 ################################