Merge branch 'develop'

Author: panzergame

.github/workflows/deploy-linux-appimage.yml

@@ -8,17 +8,19 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/${{ github.repository }}/ubuntu:feature-docker_build_appimage
+      options: --cap-add SYS_ADMIN --device /dev/fuse --security-opt apparmor:unconfined
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           submodules: true
-      - name: Install package
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install qtbase5-dev qt3d5-dev libqt5svg5-dev freeglut3-dev libfuse2
+          fetch-depth: 0
       - name: Build and test
         run: ci/buildappimage.sh
+        env:
+          LD_LIBRARY_PATH: /opt/lib
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:

.github/workflows/deploy-windows.yml

@@ -4,46 +4,48 @@ on:
     # Sequence of patterns matched against refs/tags
     tags:
      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      
+env:
+  Qt_ROOT: ../Qt/6.8.2/msvc2022_64/
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1  # not v2!
+        uses: actions/cache@v4
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache
-      
+          key: ${{ runner.os }}-QtCache      
+      - name: Install python packages
+        shell: bash
+        run: python -m pip install jinja2 aqtinstall
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        with:
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
-      - uses: lukka/get-cmake@latest
-      - name: Add msbuild to PATH
-        uses: microsoft/[email protected]
-      - name: Install jinja2
         shell: bash
-        run: python -m pip install jinja2
+        run: aqt install-qt -O ../Qt windows desktop 6.8.2 win64_msvc2022_64 -m qt3d qtshadertools
       - name: Install zip
         shell: bash
         run: choco install -y zip
+      - name: Install ortools
+        shell: bash
+        run: | 
+          C:/msys64/usr/bin/wget.exe https://github.com/google/or-tools/releases/download/v9.10/or-tools_x64_VisualStudio2022_cpp_v9.10.4067.zip
+          unzip or-tools_x64_VisualStudio2022_cpp_v9.10.4067.zip -d ../
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: true
+          fetch-depth: 0
       - name: CMake
         shell: bash
         run: |
-          mkdir build
-          cd build
-          cmake -DBUILD_TESTING=OFF ..
+          cmake -B build -DBUILD_TESTING=OFF -DQt6_DIR=${Qt_ROOT}/lib/cmake/Qt6 -DCMAKE_PREFIX_PATH=../or-tools_x64_VisualStudio2022_cpp_v9.10.4067
       - name: Build
-        run: msbuild build\dxfplotter.sln /property:Configuration=Release
+        run: cmake --build build --config Release
       - name: Deploy Qt
         shell: bash
-        run: ci/deploywindows.sh
+        run: PATH=$PATH:${Qt_ROOT}/bin ci/deploywindows.sh
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:

.github/workflows/docker-ubuntu.yml

@@ -0,0 +1,42 @@
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "ci/docker/ubuntu/**"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}/ubuntu
+
+jobs:
+  build-ubuntu-docker:
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Log into registry ${{ env.REGISTRY }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Extract Docker metadata
+      id: meta
+      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: ci/docker/ubuntu/ 
+        file: ci/docker/ubuntu/Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/sonarcloud.yml

@@ -7,23 +7,13 @@ on:
 jobs:
   static_analysis:
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/${{ github.repository }}/ubuntu:develop
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: true
-      - name: Install package
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install qtbase5-dev qt3d5-dev libqt5svg5-dev freeglut3-dev lcov
-      - name: Install build wrapper
-        run: |
-          wget http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
-          unzip build-wrapper-linux-x86.zip
-      - name: Install sonar scanner
-        run: |
-          wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472-linux.zip
-          unzip sonar-scanner-cli-4.6.2.2472-linux.zip
       - name: Build and scan
         run: ci/buildsonarcloud.sh
         env:

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "thirdparty/fmt"]
 	path = thirdparty/fmt
 	url = https://github.com/fmtlib/fmt.git
+[submodule "thirdparty/or-tools"]
+	path = thirdparty/or-tools
+	url = https://github.com/google/or-tools.git

CMakeLists.txt

@@ -1,4 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
+set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 project(dxfplotter)
 
@@ -15,30 +17,36 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC OFF)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 set(BUILD_TESTS OFF)
+set(BUILD_SAMPLES OFF)
+set(BUILD_EXAMPLES OFF)
+set(USE_SCIP OFF)
+set(USE_COINOR OFF)
+set(BUILD_FLATZINC OFF)
+set(USE_HIGHS OFF)
 set(JUST_INSTALL_CEREAL ON)
 
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
 
 # Compilation flag with all warnings.
 if(MSVC)
-	add_compile_options(/W4)
+	add_compile_options(/W4 /Zc:__cplusplus)
 else()
-	add_compile_options(-fPIC -Wall -Wextra)
+	add_compile_options(-fPIC -Wall -Wextra -DNDEBUG)
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(TEMPLATE_DIR ${PROJECT_SOURCE_DIR}/template)
 
 find_package(codecov)
 
 find_package(PythonInterp REQUIRED)
+find_package(ortools CONFIG REQUIRED)
 
-find_package(Qt5 COMPONENTS REQUIRED
+find_package(Qt6 COMPONENTS REQUIRED
 	Core
 	Widgets
 	Gui
@@ -47,7 +55,9 @@ find_package(Qt5 COMPONENTS REQUIRED
 	3DExtras
 )
 
-#qt_standard_project_setup()
+qt_standard_project_setup()
+
+add_definitions(${Qt6Core_DEFINITIONS})
 
 set(INCLUDE_DIRS
 	src
@@ -57,14 +67,14 @@ set(INCLUDE_DIRS
 	thirdparty/fmt/include
 	thirdparty/nanoflann/include
 	thirdparty/units/include
-	thirdparty/yaml-cpp/include
+	thirdparty/or-tools
 	template
 	${CMAKE_BINARY_DIR}/src
 	${CMAKE_BINARY_DIR}/template
-	${Qt5Widgets_INCLUDE_DIRS}
-	${Qt5Gui_INCLUDE_DIRS}
-	${Qt53DCore_INCLUDE_DIRS}
-	${Qt53DExtras_INCLUDE_DIRS}
+	${Qt6Widgets_INCLUDE_DIRS}
+	${Qt6Gui_INCLUDE_DIRS}
+	${Qt63DCore_INCLUDE_DIRS}
+	${Qt63DExtras_INCLUDE_DIRS}
 )
 
 set(LINK_LIBRARIES
@@ -87,11 +97,10 @@ set(LINK_LIBRARIES
 	geometry-filter
 	libdxfrw
 	fmt::fmt
-	Qt5::Widgets
-	Qt5::Svg
-	Qt5::3DCore
-	Qt5::3DExtras
-	yaml-cpp
+	Qt6::Widgets
+	Qt6::Svg
+	Qt6::3DCore
+	Qt6::3DExtras
 )
 
 include_directories(${INCLUDE_DIRS})

ci/buildappimage.sh

@@ -25,6 +25,8 @@ trap cleanup EXIT
 REPO_ROOT=$(readlink -f $(dirname $(dirname $0)))
 OLD_CWD=$(readlink -f .)
 
+git config --global --add safe.directory $REPO_ROOT
+
 # generate release name
 COMMIT=$(git rev-parse --short HEAD)
 TAG=$(git describe --tags)
@@ -35,7 +37,7 @@ pushd "$BUILD_DIR"
 
 # configure build files with CMake
 # we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
-cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF
+cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF -DQt6_DIR=/opt/qt/6.8.2/gcc_64/lib/cmake/Qt6
 
 # build project and install files into AppDir
 make -j$(nproc)

ci/buildsonarcloud.sh

@@ -30,11 +30,11 @@ pushd "$BUILD_DIR"
 
 # configure build files with CMake
 # we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
-cmake "$REPO_ROOT" -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON
+cmake "$REPO_ROOT" -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DQt6_DIR=/opt/qt/6.8.2/gcc_64/lib/cmake/Qt6
 
 # Wraps the compilation with the Build Wrapper to generate configuration (used
 # later by the SonarQube Scanner) into the "bw-output" folder
-"$REPO_ROOT"/build-wrapper-linux-x86/build-wrapper-linux-x86-64 \
+/opt/build-wrapper-linux-x86/build-wrapper-linux-x86-64 \
 	--out-dir bw-output cmake \
 	--build .
 # Test project
@@ -44,6 +44,6 @@ ctest -VV
 make gcov
 
 # Scan project
-"$REPO_ROOT"/sonar-scanner-4.6.2.2472-linux/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings="$REPO_ROOT"/sonar-project.properties -Dsonar.projectBaseDir="$REPO_ROOT" -Dsonar.cfamily.gcov.reportsPath="$BUILD_DIR"
+/opt/sonar-scanner-6.2.1.4610-linux-x64/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings="$REPO_ROOT"/sonar-project.properties -Dsonar.projectBaseDir="$REPO_ROOT" -Dsonar.cfamily.gcov.reportsPath="$BUILD_DIR"
 
 

ci/docker/ubuntu/Dockerfile

@@ -0,0 +1,24 @@
+FROM ubuntu:noble
+
+RUN apt update && apt install -y libglib2.0-bin libdbus-1-3 libgtk-3-0 \
+    libxcb* libxkbcommon* \
+    freeglut3-dev lcov \
+    build-essential cmake \
+    fuse file
+
+RUN apt update && apt install -y wget unzip git python3-jinja2 python3-pip
+RUN pip install aqtinstall --break-system-packages
+
+RUN aqt install-qt -O /opt/qt linux desktop 6.8.2 -m qt3d qtshadertools
+ENV PATH="/opt/qt/6.8.2/gcc_64/bin/:$PATH" 
+
+RUN wget http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
+RUN unzip build-wrapper-linux-x86.zip -d /opt
+
+RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.2.1.4610-linux-x64.zip
+RUN unzip sonar-scanner-cli-6.2.1.4610-linux-x64.zip -d /opt
+
+RUN wget https://github.com/google/or-tools/releases/download/v9.10/or-tools_amd64_ubuntu-24.04_cpp_v9.10.4067.tar.gz
+RUN tar -C /opt --strip-components=1 -xvf or-tools_amd64_ubuntu-24.04_cpp_v9.10.4067.tar.gz
+
+RUN git config --global --add safe.directory '*'

cmake/FindLcov.cmake

@@ -169,7 +169,7 @@ function (lcov_capture_initial_tgt TNAME)
 		list(APPEND GENINFO_FILES ${OUTFILE})
 
 		add_custom_command(OUTPUT ${OUTFILE} COMMAND ${GCOV_ENV} ${GENINFO_BIN}
-				--quiet --base-directory ${PROJECT_SOURCE_DIR} --initial
+				--quiet --ignore-errors mismatch --base-directory ${PROJECT_SOURCE_DIR} --initial
 				--gcov-tool ${GCOV_BIN} --output-filename ${OUTFILE}
 				${GENINFO_EXTERN_FLAG} ${TDIR}/${FILE}.gcno
 			DEPENDS ${TNAME}
@@ -269,7 +269,7 @@ function (lcov_capture_tgt TNAME)
 
 		add_custom_command(OUTPUT ${OUTFILE}
 			COMMAND test -s "${TDIR}/${FILE}.gcda"
-				&& ${GCOV_ENV} ${GENINFO_BIN} --quiet --base-directory
+				&& ${GCOV_ENV} ${GENINFO_BIN} --quiet --ignore-errors mismatch --base-directory
 					${PROJECT_SOURCE_DIR} --gcov-tool ${GCOV_BIN}
 					--output-filename ${OUTFILE} ${GENINFO_EXTERN_FLAG}
 					${TDIR}/${FILE}.gcda