Merge pull request #138 from SylvainCorlay/pkg-rebuild-test

Optionally run pkg rebuild upon starting kernel

Author: SylvainCorlay

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

@@ -54,6 +54,7 @@ jobs:
             -DCMAKE_INSTALL_PREFIX="$PREFIX" \
             -DCMAKE_FIND_ROOT_PATH="$PREFIX" \
             -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+            -DXEUS_OCTAVE_PKG_REBUILD=ON \
             -DCMAKE_VERBOSE_MAKEFILE=ON
 
           emmake make -j${{ env.ncpus }} install
@@ -65,6 +66,8 @@ jobs:
               --XeusAddon.prefix=${{ env.PREFIX }} \
               --XeusAddon.mounts=$PREFIX/share/octave:/share/octave \
               --XeusAddon.mounts=$PREFIX/share/xeus-octave:/share/xeus-octave \
+              --XeusAddon.default_channels=https://repo.prefix.dev/emscripten-forge-dev \
+              --XeusAddon.default_channels=https://repo.prefix.dev/conda-forge \
               --contents notebooks/xeus-octave-wasm.ipynb \
               --output-dir dist
 

CMakeLists.txt

@@ -64,6 +64,8 @@ option(XEUS_OCTAVE_BUILD_STATIC "Build xeus-octave static library" OFF)
 option(XEUS_OCTAVE_BUILD_SHARED "Split xoctave build into executable and library" ON)
 option(XEUS_OCTAVE_BUILD_EXECUTABLE "Build the xoctave executable" ON)
 
+option(XEUS_OCTAVE_PKG_REBUILD "Run pkg rebuild upon starting the kernel" OFF)
+
 option(
     XEUS_OCTAVE_USE_SHARED_XEUS_ZMQ
     "Link xeus-octave with the xeus-zmq shared library (instead of the static library)"
@@ -252,6 +254,10 @@ macro(xeus_octave_create_target target_name linkage output_name)
         PRIVATE XEUS_OCTAVE_OVERRIDE_PATH="${CMAKE_INSTALL_PREFIX}/share/xeus-octave"
     )
 
+    if(XEUS_OCTAVE_PKG_REBUILD)
+        target_compile_definitions(${target_name} PRIVATE "XEUS_OCTAVE_PKG_REBUILD")
+    endif()
+
     target_include_directories(
         ${target_name}
         PUBLIC $<BUILD_INTERFACE:${XEUS_OCTAVE_INCLUDE_DIR}> $<INSTALL_INTERFACE:include>

environment-wasm-host.yml

@@ -8,6 +8,7 @@ dependencies:
   - nlohmann_json
   - nlohmann_json-abi
   - octave
+  - octave-fuzzy-logic-toolkit
   - libpng
   - zlib
   - libflang

src/xinterpreter.cpp

@@ -437,6 +437,13 @@ void xoctave_interpreter::configure_impl()
   // Initialize interpreter
   m_octave_interpreter.execute();
 
+#ifdef XEUS_OCTAVE_PKG_REBUILD
+  // Run pkg rebuild upon starting the kernel
+  std::string pkg_rebuild("pkg rebuild");
+  int status = 0;
+  m_octave_interpreter.eval_string(pkg_rebuild, true, status);
+#endif
+
   // Fix disp function and clear display function
   m_octave_interpreter.get_symbol_table().install_built_in_function("display", octave_value());