From 7deec76af67d211e5ebb845a8617da1dd09f621f Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Fri, 7 Nov 2025 13:36:36 +0530 Subject: [PATCH 1/3] Fix make check_xeus_cpp command --- .github/workflows/deploy-github-page.yml | 12 ++++++------ .github/workflows/main.yml | 12 ++++++------ CONTRIBUTING.md | 8 ++++---- README.md | 8 ++++---- docs/source/InstallationAndUsage.rst | 18 +++++++++--------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index 94c0894b..0c8029e3 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -56,19 +56,19 @@ jobs: echo "PREFIX=$PREFIX" >> $GITHUB_ENV export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot + micromamba create -n node-env -c conda-forge nodejs=22 + export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ .. - micromamba create -n node-env -c conda-forge nodejs=22 - export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - - make check-xeus-cpp + emmake check-xeus-cpp -j ${{ env.ncpus }} emmake make -j ${{ env.ncpus }} install - name: Test Emscripten xeus-cpp in browser @@ -123,7 +123,7 @@ jobs: cd ./chrome/opt/google/chrome/ export PATH="$PWD:$PATH" cd - - + # Install Firefox wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz tar -xJf firefox-138.0.1.tar.xz diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a4a1689..31000551 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,19 +228,19 @@ jobs: echo "PREFIX=$PREFIX" >> $GITHUB_ENV export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot + micromamba create -n node-env -c conda-forge nodejs=22 + export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ .. - micromamba create -n node-env -c conda-forge nodejs=22 - export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - - make check-xeus-cpp + emmake check-xeus-cpp -j ${{ env.ncpus }} emmake make -j ${{ env.ncpus }} install - name: Test Emscripten xeus-cpp in browser @@ -300,7 +300,7 @@ jobs: cd ./chrome/opt/google/chrome/ export PATH="$PWD:$PATH" cd - - + # Install Firefox wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz tar -xJf firefox-138.0.1.tar.xz diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c6d42b7..de27d73d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,6 +84,9 @@ export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot +micromamba create -n node-env -c conda-forge nodejs=22 +export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ @@ -92,10 +95,7 @@ emcmake cmake \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. -micromamba create -n node-env -c conda-forge nodejs=22 -export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - -make check-xeus-cpp +emmake check-xeus-cpp emmake make install ``` diff --git a/README.md b/README.md index 0615ae40..e85ca860 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,9 @@ export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot +micromamba create -n node-env -c conda-forge nodejs=22 +export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ @@ -107,10 +110,7 @@ emcmake cmake \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. -micromamba create -n node-env -c conda-forge nodejs=22 -export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - -make check-xeus-cpp +emmake check-xeus-cpp emmake make install ``` diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index af8fa635..bb6b277a 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -79,18 +79,18 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot - emcmake cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ - -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ - .. - micromamba create -n node-env -c conda-forge nodejs=22 export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - make check-xeus-cpp + emcmake cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ + -DCMAKE_FIND_ROOT_PATH=$PREFIX \ + -DSYSROOT_PATH=$SYSROOT_PATH \ + .. + + emmake check-xeus-cpp emmake make install It is possible to run the Emscripten tests in a headless browser. We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this for Chrome and Firefox on MacOS execute the following From c8483bba01fde5255baa1bf712e8e2cc218dc8cf Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Fri, 7 Nov 2025 13:39:52 +0530 Subject: [PATCH 2/3] fix spacing --- docs/source/InstallationAndUsage.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index bb6b277a..06ee1e3d 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -83,12 +83,12 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" emcmake cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ - -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ - .. + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ + -DCMAKE_FIND_ROOT_PATH=$PREFIX \ + -DSYSROOT_PATH=$SYSROOT_PATH \ + .. emmake check-xeus-cpp emmake make install From b9258b064cc43565b5b5d47eaf33bc8f66ff3217 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Fri, 7 Nov 2025 14:00:44 +0530 Subject: [PATCH 3/3] fix typo --- .github/workflows/deploy-github-page.yml | 2 +- .github/workflows/main.yml | 2 +- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/source/InstallationAndUsage.rst | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index 0c8029e3..fc6c728e 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -68,7 +68,7 @@ jobs: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ .. - emmake check-xeus-cpp -j ${{ env.ncpus }} + emmake make check-xeus-cpp -j ${{ env.ncpus }} emmake make -j ${{ env.ncpus }} install - name: Test Emscripten xeus-cpp in browser diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31000551..ee5801fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -240,7 +240,7 @@ jobs: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ .. - emmake check-xeus-cpp -j ${{ env.ncpus }} + emmake make check-xeus-cpp -j ${{ env.ncpus }} emmake make -j ${{ env.ncpus }} install - name: Test Emscripten xeus-cpp in browser diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de27d73d..f68b64b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,7 +95,7 @@ emcmake cmake \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. -emmake check-xeus-cpp +emmake make check-xeus-cpp emmake make install ``` diff --git a/README.md b/README.md index e85ca860..bff97d94 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ emcmake cmake \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. -emmake check-xeus-cpp +emmake make check-xeus-cpp emmake make install ``` diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index 06ee1e3d..873a2eba 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -90,7 +90,7 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in -DSYSROOT_PATH=$SYSROOT_PATH \ .. - emmake check-xeus-cpp + emmake make check-xeus-cpp emmake make install It is possible to run the Emscripten tests in a headless browser. We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this for Chrome and Firefox on MacOS execute the following