Merge branch 'release/v1.2'

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

@@ -13,7 +13,9 @@ jobs:
         with:
           submodules: true
       - name: Install package
-        run: sudo apt-get -y install qtbase5-dev libfmt-dev libyaml-cpp-dev lcov
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install qtbase5-dev
       - name: Build and test
         run: ci/buildappimage.sh
       - name: Create Release

.github/workflows/deploy-windows.yml

@@ -0,0 +1,50 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+     - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v1  # not v2!
+        with:
+          path: ../Qt
+          key: ${{ runner.os }}-QtCache
+
+      - 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
+      - name: Install zip
+        shell: bash
+        run: choco install -y zip
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: CMake
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          cmake -DBUILD_TESTING=OFF ..
+      - name: Build
+        run: msbuild build\dxfplotter.sln /property:Configuration=Release
+      - name: Deploy Qt
+        shell: bash
+        run: ci/deploywindows.sh
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: "dxfplotter*.zip"
+

.github/workflows/sonarcloud.yml

@@ -12,7 +12,9 @@ jobs:
         with:
           submodules: true
       - name: Install package
-        run: sudo apt-get -y install qtbase5-dev libfmt-dev libyaml-cpp-dev lcov
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install qtbase5-dev lcov
       - name: Install build wrapper
         run: |
           wget http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "thirdparty/cereal"]
 	path = thirdparty/cereal
 	url = https://github.com/USCiLab/cereal.git
+[submodule "thirdparty/yaml-cpp"]
+	path = thirdparty/yaml-cpp
+	url = https://github.com/jbeder/yaml-cpp.git
+[submodule "thirdparty/fmt"]
+	path = thirdparty/fmt
+	url = https://github.com/fmtlib/fmt.git

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.15)
 
 project(dxfplotter)
 
@@ -15,11 +15,13 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(BUILD_TESTS OFF)
 set(JUST_INSTALL_CEREAL ON)
 
-# Compilation flag with all warning and error as much as possible on warning.
-add_compile_options(-fPIC -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=unknown-pragmas -Wno-expansion-to-defined -Wno-error=missing-field-initializers)
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0)
-	add_compile_options(-Wno-error=deprecated-copy -Wno-error=maybe-uninitialized)
+# Compilation flag with all warnings.
+if(MSVC)
+	add_compile_options(/W4)
+else()
+	add_compile_options(-fPIC -Wall -Wextra)
 endif()
 
 set(CMAKE_CXX_STANDARD 17)
@@ -29,28 +31,26 @@ set(TEMPLATE_DIR ${PROJECT_SOURCE_DIR}/template)
 
 find_package(codecov)
 
+find_package(PythonInterp)
+
 find_package(Qt5 COMPONENTS REQUIRED 
 	Widgets
 	Gui
 )
 
-find_package(yaml-cpp REQUIRED)
-find_package(fmt REQUIRED)
-
 set(INCLUDE_DIRS
 	src
 	thirdparty
 	thirdparty/cereal/include
 	thirdparty/cavaliercontours/include
 	thirdparty/fmt/include
 	thirdparty/nanoflann/include
-	thirdparty/tomlplusplus/include
+	thirdparty/yaml-cpp/include
 	template
 	${CMAKE_BINARY_DIR}/src
 	${CMAKE_BINARY_DIR}/template
 	${Qt5Widgets_INCLUDE_DIRS}
 	${Qt5Gui_INCLUDE_DIRS}
-	${YAML_CPP_INCLUDE_DIRS}
 )
 
 set(LINK_LIBRARIES
@@ -70,7 +70,7 @@ set(LINK_LIBRARIES
 	libdxfrw
 	fmt::fmt
 	Qt5::Widgets
-	${YAML_CPP_LIBRARIES}
+	yaml-cpp
 )
 
 include_directories(${INCLUDE_DIRS})

README.md

@@ -1,6 +1,6 @@
 # DXF Plotter
 
-> Fast and easy to use DXF to GCode converter for laser CNC
+> Fast and easy to use DXF to GCode converter for laser and router CNC
 
 
 [![Build Status](https://github.com/panzergame/dxfplotter/actions/workflows/sonarcloud.yml/badge.svg?branch=develop)](https://github.com/panzergame/dxfplotter/actions)

ci/buildappimage.sh

@@ -35,7 +35,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
+cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF
 
 # build project and install files into AppDir
 make -j$(nproc)

ci/deploywindows.sh

@@ -0,0 +1,21 @@
+#! /bin/bash
+
+set -x
+set -e
+
+# generate release name
+COMMIT=$(git rev-parse --short HEAD)
+TAG=$(git describe --tags)
+RELEASE_NAME="dxfplotter-$TAG-$COMMIT-x86_64"
+
+BUILD_DIR="build"
+BINARY_NAME="dxfplotter.exe"
+BINARY_PATH="${BUILD_DIR}/Release/${BINARY_NAME}"
+
+DEPLOY_DIR="${RELEASE_NAME}"
+mkdir $DEPLOY_DIR
+cp $BINARY_PATH $DEPLOY_DIR
+
+windeployqt --release --dir $DEPLOY_DIR "${DEPLOY_DIR}/${BINARY_NAME}"
+
+zip -r "${RELEASE_NAME}.zip" $RELEASE_NAME