For porting dulcificumJS for conanv2

NP-734
Ultimaker · Feb 6, 2025 · 9d623a3 · 9d623a3
1 parent 0225cb2
commit 9d623a3
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 3,609 deletions.
diff --git a/.github/workflows/npm-package.yml b/.github/workflows/npm-package.yml
diff --git a/.github/workflows/conan-package.yml → .github/workflows/package.yml b/.github/workflows/conan-package.yml → .github/workflows/package.yml
@@ -11,7 +11,7 @@ on:
       - 'CMakeLists.txt'
       - 'pyDulcificum/**'
       - 'DulcificumJS/**'
-      - '.github/workflows/conan-package.yml'
+      - '.github/workflows/package.yml'
       - '.github/worflows/requirements-conan-package.txt'
     branches:
       - main
@@ -28,4 +28,14 @@ on:
 jobs:
   conan-package:
     uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main
+    with:
+      platform_wasm: true
+    secrets: inherit
+
+  npm-package:
+    needs: [ conan-package ]
+    if: ${{ github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'NP-')) }}
+    uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@main
+    with:
+      package_version_full: ${{ needs.conan-package.outputs.package_version_full }}
     secrets: inherit
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,7 +73,7 @@ endif ()
 
 # --- Setup JavaScript bindings ---
 if (WITH_JS_BINDINGS)
-    add_subdirectory(DulcificumJS/cpp)
+    add_subdirectory(DulcificumJS)
 endif ()
 
 # --- Setup Python bindings ---

diff --git a/DulcificumJS/.npmignore b/DulcificumJS/.npmignore
diff --git a/DulcificumJS/.npmrc b/DulcificumJS/.npmrc
diff --git a/DulcificumJS/.nvmrc b/DulcificumJS/.nvmrc
diff --git a/DulcificumJS/cpp/CMakeLists.txt → DulcificumJS/CMakeLists.txt b/DulcificumJS/cpp/CMakeLists.txt → DulcificumJS/CMakeLists.txt
diff --git a/DulcificumJS/cpp/DulcificumJS.cpp → DulcificumJS/DulcificumJS.cpp b/DulcificumJS/cpp/DulcificumJS.cpp → DulcificumJS/DulcificumJS.cpp
diff --git a/DulcificumJS/README.md b/DulcificumJS/README.md
@@ -35,18 +35,15 @@ We are using conan to manage our C++ dependencies and build configuration. If yo
 That said, installing our config goes as follows:
 
 ```
-pip install conan==1.64
+pip install conan==2.7.0
 conan config install https://github.com/ultimaker/conan-config.git
 conan profile new default --detect --force
 ```
 
-2. Installing NodeJS deps
-
-Using Dulcificum in this project follows normal NodeJS package conventions. During an explicit user instigated pre-install step,
-we use Conan (installed and setup above), to build or download the wasm binaries from the JFrog Artifactory.
-and installing these in `src/Dulcificum/`
+3. conan install with wasm
 
 ```
-npm run install_dulcificum
-npm install
+conan install . -s build_type=Release --build=missing --update -c tools.build:skip_test=True -pr:h cura_wasm.jinja
+conan install . -s build_type=Debug --build=missing --update -c tools.build:skip_test=True -pr:h cura_wasm.jinja
 ```
+