Merge branch 'main' into Fix-issue-with-sysroot_path-and-XEUS_CPP_RESOURCE_DIR-with-@-in-absolute-path

Author: mcbarton

.github/workflows/deploy-github-page.yml

@@ -143,6 +143,8 @@ jobs:
           micromamba activate xeus-lite-host
           jupyter lite build \
               --XeusAddon.prefix=${{ env.PREFIX }} \
+              --XeusAddon.mounts="${{ env.PREFIX }}/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" \
+              --XeusAddon.mounts="${{ env.PREFIX }}/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \
               --contents README.md \
               --contents notebooks/xeus-cpp-lite-demo.ipynb \
               --contents notebooks/smallpt.ipynb \

CMakeLists.txt

@@ -452,8 +452,6 @@ if(EMSCRIPTEN)
         PUBLIC "SHELL: -s USE_SDL=2"
         PUBLIC "SHELL: --preload-file ${ESCAPED_SYSROOT_PATH}/include@/include"
         PUBLIC "SHELL: --preload-file ${ESCAPED_XEUS_CPP_RESOURCE_DIR}@/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}"
-        PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"
-        PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
         PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"
     )
 endif()