wip

Author: DerThorsten

.github/workflows/main.yml

@@ -116,6 +116,15 @@ jobs:
             -DCMAKE_PREFIX_PATH=$PREFIX                       \
             -DCMAKE_INSTALL_PREFIX=$PREFIX                    \
             -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
+            -Dtabulate_DIR=$PREFIX/lib/cmake/tabulate         \
+            -DXSQL_BUILD_XSQLITE_EXECUTABLE=OFF               \
+            -DXSQL_BUILD_SHARED=OFF                           \
+            -DXSQL_BUILD_STATIC=ON                            \
+            -DXSQL_USE_SHARED_XEUS=ON                         \
+            -DXSQL_USE_SHARED_XEUS_SQLITE=OFF                 \
+            -DXVEGA_STATIC_LIBRARY=$PREFIX/lib/libxvega.a     \
+            -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
+
             ..
 
           make -j${{ steps.cpu-cores.outputs.count }} install

CMakeLists.txt

@@ -65,6 +65,12 @@ if(EMSCRIPTEN)
     # for the emscripten build we need a FindSQLite3.cmake since
     # we install sqlite in a non-standart way
     set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_emscripten;${CMAKE_MODULE_PATH}")
+
+    # overwriteProp.cmake
+    set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE) # does not need to be global :)
+    set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-s SIDE_MODULE=1")
+    set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-s SIDE_MODULE=1")
+
 endif()
 
 # Dependencies
@@ -252,7 +258,7 @@ endif ()
 # xsqlite
 # =======
 
-if (XSQL_BUILD_XSQLITE_EXECUTABLE)
+if (XSQL_BUILD_XSQLITE_EXECUTABLE AND NOT EMSCRIPTEN)
     find_package(xeus-zmq 1.1.1 REQUIRED)
     add_executable(xsqlite ${XSQLITE_SRC})
     set_target_properties(xsqlite PROPERTIES ENABLE_EXPORTS 1)

build.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+
+# this is a helper script for local wasm builds.
+# we assume that script is run in the 
+# env defined in environment-wasm-build.yml
+
+set -e
+
+# flip this to true to create the environments
+if false; then
+    micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32 --yes
+
+else
+    echo "Skipping environment creation"
+fi
+
+mkdir -p build
+pushd build 
+
+export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-sqlite-wasm-host
+export CMAKE_PREFIX_PATH=$PREFIX
+export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
+
+emcmake cmake \
+-DCMAKE_BUILD_TYPE=Release                        \
+-DCMAKE_PREFIX_PATH=$PREFIX                       \
+-DCMAKE_INSTALL_PREFIX=$PREFIX                    \
+-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
+-Dtabulate_DIR=$PREFIX/lib/cmake/tabulate         \
+-DXSQL_BUILD_XSQLITE_EXECUTABLE=OFF               \
+-DXSQL_BUILD_SHARED=OFF                           \
+-DXSQL_BUILD_STATIC=ON                            \
+-DXSQL_USE_SHARED_XEUS=ON                         \
+-DXSQL_USE_SHARED_XEUS_SQLITE=OFF                 \
+-DXVEGA_STATIC_LIBRARY=$PREFIX/lib/libxvega.a     \
+-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
+..
+
+make -j2 install

environment-wasm-host.yml

@@ -3,12 +3,13 @@ channels:
   - https://repo.prefix.dev/emscripten-forge-dev
   - https://repo.mamba.pm/conda-forge
 dependencies:
-  - nlohmann_json
-  - sqlite
+  - nlohmann_json >= 3.12
+  - nlohmann_json-abi
+  - xproperty
+  - cpp-tabulate
+  - xvega
+  - xvega-bindings
+  - xeus-lite
+  - xeus
+  - xtl
   - sqlitecpp
-  - cpp-tabulate=1.5
-  - xvega>=0.1.3
-  - xproperty>=0.12.1
-  - xvega-bindings>=0.1.1
-  - xeus-lite >= 4.0.0
-  - xeus >= 2.4.0