Packaging

.github/workflows/build-and-test-linux.yml

@@ -0,0 +1,51 @@
+name: Build daisy and run tests on linux
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v5
+
+    - name: Install build dependencies
+      run: sudo apt install cmake libsuitesparse-dev libboost-filesystem-dev python3-pybind11
+
+    - name: Install uv for testing
+      uses: astral-sh/setup-uv@v7
+      with:
+        version: "0.9.18"
+
+    - name: Install python
+      run: uv python install 3.13
+
+    - name: Create build dir
+      run: mkdir ci-build
+
+    - name: Configure CMake
+      working-directory: ci-build
+      run: cmake .. --preset linux-gcc-portable
+
+    - name: Build
+      working-directory: ci-build
+      run: cmake --build . -j 4
+
+    - name: Test environment
+      working-directory: ci-build
+      run: |
+        uv venv
+        uv pip install git+https://github.com/daisy-model/daisypy-test
+
+    - name: Test
+      working-directory: ci-build
+      run: ctest --output-on-failure
+
+    - name: Upload test log
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-output-ubuntu
+        path: build/Testing

.github/workflows/build-and-test-macos.yml

@@ -0,0 +1,62 @@
+name: Build daisy and run tests on MacOS
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v5
+
+    - name: Install build dependencies using brew
+      run: brew install cmake boost suite-sparse pybind11
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+      with:
+        version: "0.9.18"
+
+    - name: Install python
+      run: uv python install 3.13
+
+    - name: Create build dir
+      run: mkdir ci-build
+
+    - name: Configure CMake
+      working-directory: ci-build
+      run: >
+        cmake ..
+        -DUV_INSTALLED_PYTHON_ROOT_DIR=$( ls -d $( uv python dir )/* | grep 3.13 )
+        --preset macos-clang-portable
+
+    - name: Build
+      working-directory: ci-build
+      run: cmake --build . -j 4
+
+    - name: Pack
+      working-directory: ci-build
+      run: cpack -G ZIP
+
+    - name: Install
+      working-directory: ci-build
+      run: unzip $( ls | grep -e "daisy.*Darwin-python.*zip" )
+
+    - name: Setup test environment
+      working-directory: ci-build
+      run: |
+        uv venv
+        uv pip install git+https://github.com/daisy-model/daisypy-test
+
+    - name: Test
+      working-directory: ci-build
+      run: ctest --output-on-failure
+
+    - name: Upload test log
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-output-macos
+        path: ci-build/Testing

.github/workflows/build-and-test-windows.yml

@@ -3,66 +3,71 @@ name: Build daisy and run tests on windows
 on:
   pull_request:
     branches: [ "main" ]
-    
+
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
 
-    strategy:
-      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
-      # Consider changing this to true when your workflow is stable.
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
-        include:
-          - { sys: ucrt64,  env: ucrt-x86_64 }
     defaults:
       run:
         shell: msys2 {0}
+
     steps:
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: ${{matrix.sys}}
+          msystem: UCRT64
           update: true
           install: >-
             git
-            mingw-w64-${{matrix.env}}-cmake
-            mingw-w64-${{matrix.env}}-gcc
-            mingw-w64-${{matrix.env}}-ninja
-            mingw-w64-${{matrix.env}}-suitesparse
-            mingw-w64-${{matrix.env}}-boost
-            mingw-w64-${{matrix.env}}-pybind11
-            mingw-w64-${{matrix.env}}-python
-            mingw-w64-${{matrix.env}}-python-pip
-            mingw-w64-${{matrix.env}}-python-pandas
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-ninja
+            mingw-w64-ucrt-x86_64-suitesparse
+            mingw-w64-ucrt-x86_64-boost
+            mingw-w64-ucrt-x86_64-pybind11
+            mingw-w64-ucrt-x86_64-uv
             unzip
 
-      - name: Install python dependencies
-        run: pip install pint daisypy-test@git+https://github.com/daisy-model/daisypy-test
+      - uses: actions/checkout@v5
+
+      - name: Install python
+        run: uv python install 3.13
 
-      - uses: actions/checkout@v4
+      - name: Create build dir
+        run: mkdir ci-build
 
-      - name: Get embeddable python
-        run: mkdir -p python/python &&
-             wget https://www.python.org/ftp/python/3.12.10/python-3.12.10-embed-amd64.zip -O python/python.zip &&
-             unzip python/python.zip -d python/python &&
-             cp python/python/python312.dll python/python/libpython3.12.dll
-
       - name: Configure CMake
+        working-directory: ci-build
         run: >
-          cmake -B build --preset mingw-gcc-portable
+          cmake ..
+          -DUV_INSTALLED_PYTHON_ROOT_DIR=$( ls -d $( uv python dir | tr \\\\ / )/* | grep 3.13 )
+          --preset mingw-gcc-portable
 
       - name: Build
-        run: cmake --build build
-
-      - name: Test
-        working-directory: build 
+        working-directory: ci-build
+        run: cmake --build .
+
+      - name: Pack
+        working-directory: ci-build
+        run: cpack -G ZIP
+
+      - name: Install
+        working-directory: ci-build
+        run: unzip $( ls | grep -e "daisy-.*-Windows-python.*zip" )
+
+      - name: Setup test environment
+        working-directory: ci-build
         run: |
-          ctest --output-on-failure
+          uv venv
+          uv pip install git+https://github.com/daisy-model/daisypy-test
+
+      - name: Test
+        working-directory: ci-build
+        run: ctest --output-on-failure
 
       - name: Upload test logs
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
-          name: test-output-win
-          path: build/Testing
+          name: test-output-windows
+          path: ci-build/Testing

CMakeLists.txt

@@ -28,8 +28,6 @@ option(MAKE_PORTABLE "Set to ON to make a generic build" OFF)
 if (${BUILD_PYTHON})
   add_definitions( -DBUILD_PYTHON )
   include(cmake/python.cmake)
-else()
-  set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-no-python")
 endif()
 
 if (NOT CMAKE_BUILD_TYPE)
@@ -53,7 +51,11 @@ if (${OS} STREQUAL "macos")
   message("Using HOMEBREW_PREFIX = ${HOMEBREW_PREFIX}")
 endif()
 
-find_package(Boost 1.74 REQUIRED CONFIG COMPONENTS filesystem system)
+if (${OS} STREQUAL "macos")
+  find_package(Boost 1.90 REQUIRED CONFIG COMPONENTS filesystem)
+else()
+  find_package(Boost 1.83 REQUIRED CONFIG COMPONENTS filesystem system)
+endif()
 message(STATUS "Boost version: ${Boost_VERSION}")
 
 SET(COMPILE_OPTIONS
@@ -69,11 +71,12 @@ SET(LINKER_OPTIONS
   "$<$<BOOL:${MAKE_PORTABLE}>:${LINKER_OPTIONS_PORTABLE}>"
 )
 
-if (${OS} STREQUAL "macos" AND ${BUILD_PYTHON})
+if (${OS} STREQUAL "macos")
   set(DAISY_BIN_NAME daisy-bin)
 else()
   set(DAISY_BIN_NAME daisy)
 endif()
+
 add_executable(${DAISY_BIN_NAME})
 if (${OS} STREQUAL "mingw")
   include(cmake/MinGW.cmake)
@@ -86,10 +89,6 @@ endif()
 # Sources are added with target_sources in CMakeLists in the source tree
 add_subdirectory(src)
 
-# Test
-include(CTest)
-add_subdirectory(test)
-
 # Packaging
 # lib/ and sample/ contain .dai files that define functionality that should be installed
 add_subdirectory(lib)
@@ -113,3 +112,8 @@ include(CPack)
 
 # Documentation
 include(cmake/Doc.cmake)
+
+# Test
+# We do it last so we have access to variables set during build and packaging
+include(CTest)
+add_subdirectory(test)