Skip to content

Commit c01092e

Browse files
authored
Merge branch 'main' into Remove-lower-bound-on-cppargparse
2 parents 4449f78 + 93d7a6a commit c01092e

File tree

9 files changed

+196
-75
lines changed

9 files changed

+196
-75
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
shell: bash -l {0}
7171
run: |
7272
set -e
73-
micromamba create -n xeus-lite-host jupyterlite-core
73+
micromamba create -n xeus-lite-host jupyterlite-core jupyter_server
7474
micromamba activate xeus-lite-host
7575
cd build/test
7676
# Fresh install browsers, and run Emscripten tests in them
@@ -140,7 +140,6 @@ jobs:
140140
- name: Jupyter Lite integration
141141
shell: bash -l {0}
142142
run: |
143-
micromamba create -n xeus-lite-host jupyterlite-core jupyter_server
144143
micromamba activate xeus-lite-host
145144
python -m pip install jupyterlite-xeus
146145
jupyter lite build \

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,14 @@ if (XEUS_CPP_BUILD_EXECUTABLE)
431431
endif()
432432

433433
if(EMSCRIPTEN)
434+
# Ensure required SDL2 ports (e.g. SDL2) are built before header preloading
435+
execute_process(
436+
COMMAND embuilder build sdl2
437+
RESULT_VARIABLE SDL2_RESULT
438+
)
439+
if(NOT SDL2_RESULT EQUAL 0)
440+
message(FATAL_ERROR "Failed to run 'embuilder build sdl2'")
441+
endif()
434442
include(WasmBuildOptions)
435443
find_package(xeus-lite REQUIRED)
436444
add_executable(xcpp src/main_emscripten_kernel.cpp )

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ To do this on Ubuntu x86 execute the following
147147

148148
To build Jupyter Lite with this kernel without creating a website you can execute the following
149149
```bash
150-
micromamba create -n xeus-lite-host jupyterlite-core -c conda-forge
150+
micromamba create -n xeus-lite-host jupyterlite-core jupyter_server -c conda-forge
151151
micromamba activate xeus-lite-host
152152
python -m pip install jupyterlite-xeus
153153
jupyter lite build --XeusAddon.prefix=$PREFIX

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# ![xeus-cpp](docs/source/xeus-logo.svg)
2-
2+
<div align="center">
3+
34
[![Build Status](https://github.com/compiler-research/xeus-cpp/actions/workflows/main.yml/badge.svg)](https://github.com/compiler-research/xeus-cpp/actions/workflows/main.yml)
45
[![Documentation Status](http://readthedocs.org/projects/xeus-cpp/badge/?version=latest)](https://xeus-cppreadthedocs.io/en/latest/?badge=latest)
56
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/compiler-research/xeus-cpp/main?urlpath=/lab/tree/notebooks/xeus-cpp.ipynb)
@@ -9,14 +10,17 @@
910
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/xeus-cpp/badges/license.svg)](https://github.com/conda-forge/xeus-cpp-feedstock)
1011
[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/xeus-cpp.svg)](https://anaconda.org/conda-forge/xeus-cpp)
1112
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/xeus-cpp/badges/downloads.svg)](https://github.com/conda-forge/xeus-cpp-feedstock)
12-
13+
</div>
1314

1415
`xeus-cpp` is a Jupyter kernel for cpp based on the native implementation of the
1516
Jupyter protocol [xeus](https://github.com/jupyter-xeus/xeus).
1617

1718
Try Jupyter Lite demo by clicking below
1819

20+
<div align="center">
21+
1922
[![lite-badge](https://jupyterlite.rtfd.io/en/latest/_static/badge.svg)](https://compiler-research.github.io/xeus-cpp/lab/index.html)
23+
</div>
2024

2125
## Installation within a mamba environment (non wasm build instructions)
2226

@@ -148,7 +152,7 @@ To do this on Ubuntu x86 execute the following
148152

149153
To build Jupyter Lite with this kernel without creating a website you can execute the following
150154
```bash
151-
micromamba create -n xeus-lite-host jupyterlite-core -c conda-forge
155+
micromamba create -n xeus-lite-host jupyterlite-core jupyter_server -c conda-forge
152156
micromamba activate xeus-lite-host
153157
python -m pip install jupyterlite-xeus
154158
jupyter lite build --XeusAddon.prefix=$PREFIX

docs/source/InstallationAndUsage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ To build Jupyter Lite with this kernel without creating a website you can execut
137137

138138
.. code-block:: bash
139139
140-
micromamba create -n xeus-lite-host jupyterlite-core -c conda-forge
140+
micromamba create -n xeus-lite-host jupyterlite-core jupyter_server -c conda-forge
141141
micromamba activate xeus-lite-host
142142
python -m pip install jupyterlite-xeus
143143
jupyter lite build --XeusAddon.prefix=$PREFIX

0 commit comments

Comments
 (0)