Switch from makefiles to cmake

Author: ianthomas23

wasm/.gitignore

@@ -1,2 +1,14 @@
-serve/cockle/
-serve/lite/
+CMakeCache.txt
+CMakeFiles/
+Makefile
+cmake_install.cmake
+cockle-config.json
+cockle_wasm_env/
+node_modules/
+package-lock.json
+.jupyterlite.doit.db
+
+recipe/em-forge-recipes/
+serve/*/
+test/assets/*/
+test/lib/

wasm/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm)
+
+add_subdirectory(recipe)
+add_subdirectory(cockle-deploy)
+add_subdirectory(lite-deploy)
+add_subdirectory(test)
+
+# Build everything (package, cockle and lite deployments, tests).
+add_custom_target(build ALL DEPENDS build-recipe build-cockle build-lite build-test)
+
+# Rebuild after change in C++ code.
+add_custom_target(rebuild DEPENDS rebuild-recipe rebuild-cockle rebuild-lite rebuild-test)
+
+# Serve both cockle and JupyterLite deployments.
+add_custom_target(serve COMMAND npx static-handler --cors --coop --coep --corp serve)

wasm/Makefile

@@ -10,7 +10,7 @@ It works on Linux and macOS but not Windows.
 
 There are 5 sub-directories:
 
-- `build`: build local `git2cpp` source code into an Emscripten-forge package.
+- `recipe`: build local `git2cpp` source code into an Emscripten-forge package.
 - `cockle-deploy`: create a `cockle` deployment in the `serve` directory.
 - `lite-deploy`: create a JupyterLite `terminal` deployment in the `serve` directory.
 - `serve`: where the two deployments are served from.
@@ -29,9 +29,13 @@ micromamba activate git2cpp-wasm
 Then to build the WebAssembly package, both deployments and the testing resources use:
 
 ```bash
+cmake .
 make
 ```
 
+The built emscripten-forge package will be file named something like `git2cpp-0.0.5-h7223423_1.tar.bz2`
+in the directory `recipe/em-force-recipes/output/emscripten-wasm32`.
+
 The local deployments in the `serve` directory can be manually checked using:
 
 ```bash
@@ -58,7 +62,13 @@ make test
 ```
 
 This runs (some of) the tests in the top-level `test` directory with various monkey patching so that
-`git2cpp` commands are executed in the browser.
+`git2cpp` commands are executed in the browser. If there are problems running the tests then ensure
+you have the latest `playwright` browser installed:
+
+
+```bash
+playwright install chromium
+```
 
 ## Rebuild
 

wasm/README.md

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm-cockle-deploy)
+
+include("../common.cmake")
+
+set(SERVE_DIR "../serve/cockle")
+
+add_custom_target(build-cockle
+    DEPENDS build-recipe
+    COMMAND npm install
+    COMMAND COCKLE_WASM_EXTRA_CHANNEL=${BUILT_PACKAGE_DIR} npm run build
+    BYPRODUCTS cockle_wasm_env node_modules ${SERVE_DIR}
+)
+
+add_custom_target(rebuild-cockle
+    DEPENDS rebuild-recipe clean-env-cockle build-cockle
+)
+
+add_custom_target(clean-env-cockle
+    COMMAND ${CMAKE_COMMAND} -E remove_directory cockle_wasm_env
+)

wasm/build/.gitignore

@@ -0,0 +1,8 @@
+# Emscripten-forge recipes directory relative to 'recipe' directory
+set(EM_FORGE_RECIPES_DIR "em-forge-recipes")
+
+# Output directory for built emscripten-forge packages relative to EM_FORGE_RECIPES_DIR
+set(BUILT_PACKAGE_SUBDIR "output")
+
+# Output directory for built emscripten-forge packages relative to subdirectories of this directory
+set(BUILT_PACKAGE_DIR "../recipe/${EM_FORGE_RECIPES_DIR}/${BUILT_PACKAGE_SUBDIR}")