From 5449cecaf58e0203ea8818c29e4e11bab5cad528 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Tue, 1 Jul 2025 14:56:01 +0530 Subject: [PATCH 1/2] Switch to xeus shared build --- CMakeLists.txt | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b4ca080..3bd5c6f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,16 +44,23 @@ if(EMSCRIPTEN) STRING(REGEX MATCH "python[0-9]+[.][0-9]+" PYTHON_VERSION_STRING ${WASM_PYTHON_LIBRARY}) STRING(REGEX MATCH "[0-9]+" PYTHON_VERSION_MAJOR ${PYTHON_VERSION_STRING}) STRING(REGEX MATCH "[0-9]+$" PYTHON_VERSION_MINOR ${PYTHON_VERSION_STRING}) + + configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/wasm_kernel.json.in" + "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json" + ) +else() + configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json.in" + "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json" + ) + configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json.in" + "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json" + ) endif() -configure_file ( - "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json.in" - "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json" -) -configure_file ( - "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json.in" - "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json" -) + # Build options # ============= @@ -88,12 +95,12 @@ if(EMSCRIPTEN) cat(wasm_patches/post.js post.js.in) add_compile_definitions(XPYT_EMSCRIPTEN_WASM_BUILD) + set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE) set(XPYT_BUILD_STATIC OFF) set(XPYT_BUILD_SHARED OFF) set(XPYT_BUILD_XPYTHON_EXECUTABLE OFF) set(XPYT_BUILD_XPYTHON_EXTENSION OFF) - set(XPYT_USE_SHARED_XEUS OFF) set(XPYT_USE_SHARED_XEUS_PYTHON OFF) set(XPYT_BUILD_TESTS OFF) endif() From 37c351b667aa2a6e79735443c10a1e8197cfb2d0 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Tue, 1 Jul 2025 14:58:37 +0530 Subject: [PATCH 2/2] Add wasm_kernel.json.in --- share/jupyter/kernels/xpython/wasm_kernel.json.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 share/jupyter/kernels/xpython/wasm_kernel.json.in diff --git a/share/jupyter/kernels/xpython/wasm_kernel.json.in b/share/jupyter/kernels/xpython/wasm_kernel.json.in new file mode 100644 index 00000000..6ab3ceaa --- /dev/null +++ b/share/jupyter/kernels/xpython/wasm_kernel.json.in @@ -0,0 +1,13 @@ +{ + "display_name": "Python @PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ (XPython)", + "argv": [ + "@XPYTHON_KERNELSPEC_PATH@xpython" + ], + "language": "python", + "metadata": { + "debugger": false, + "shared": { + "libxeus.so": "lib/libxeus.so" + } + } +}