Major PenguinTuner Changes

.github/workflows/c-cpp.yml

@@ -9,31 +9,40 @@ on:
 
 jobs:
   # Build the project and ensure it compiles
-  build:
+  build-linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: amd64
+            add-arch-command: echo "Already on native arch"
+            apt-get-libs: libcurl4-openssl-dev libgtk-4-dev libssh-dev build-essential debhelper
+            make-and-build: dpkg-buildpackage
+          - os: armhf
+            add-arch-command: dpkg --add-architecture armhf
+            apt-get-libs: libgtk-4-dev:armhf libcurl4-openssl-dev:armhf libssh-dev:armhf crossbuild-essential-armhf debhelper
+            make-and-build: CONFIG_SITE=/etc/dpkg-cross/cross-config.armhf DCMAKE_TOOLCHAIN_FILE=armhf.ini dpkg-buildpackage -aarmhf -Pcross
+          - os: armel
+            add-arch-command: dpkg --add-architecture armel
+            apt-get-libs: libgtk-4-dev:armel libcurl4-openssl-dev:armel libssh-dev:armel crossbuild-essential-armel debhelper
+            make-and-build: CONFIG_SITE=/etc/dpkg-cross/cross-config.arm64 DCMAKE_TOOLCHAIN_FILE=arm64.ini dpkg-buildpackage -aarm64 -Pcross
+          - os: arm64
+            add-arch-command: dpkg --add-architecture arm64
+            apt-get-libs: libgtk-4-dev:arm64 libcurl4-openssl-dev:arm64 libssh-dev:arm64 crossbuild-essential-arm64 debhelper
+            make-and-build: CONFIG_SITE=/etc/dpkg-cross/cross-config.armel DCMAKE_TOOLCHAIN_FILE=armel.ini dpkg-buildpackage -aarmel -Pcross
 
     runs-on: ubuntu-18.04
     container:
-      image: debian:latest
+      image: debian:bookworm
     steps:
     - uses: actions/checkout@v2
     - name: 'prepare runner'
       run: |
-        dpkg --add-architecture armhf
-        dpkg --add-architecture armel
-        dpkg --add-architecture arm64
-        apt update
-        apt install -y libcurl4-openssl-dev libgtk-3-dev libssh-dev meson build-essential debhelper ninja-build
-        apt install -y libgtk-3-dev:armhf libcurl4-openssl-dev:armhf libssh-dev:armhf crossbuild-essential-armhf
-        apt install -y libgtk-3-dev:armel libcurl4-openssl-dev:armel libssh-dev:armel crossbuild-essential-armel
-        apt install -y libgtk-3-dev:arm64 libcurl4-openssl-dev:arm64 libssh-dev:arm64 crossbuild-essential-arm64
-    - name: 'build and package native'
-      run: dpkg-buildpackage
-    - name: 'build and package armhf'
-      run: CONFIG_SITE=/etc/dpkg-cross/cross-config.armhf DH_MESON_CROSS_FILE=armhf.ini dpkg-buildpackage -aarmhf -Pcross
-    - name: 'build and package arm64'
-      run: CONFIG_SITE=/etc/dpkg-cross/cross-config.arm64 DH_MESON_CROSS_FILE=arm64.ini dpkg-buildpackage -aarm64 -Pcross
-    - name: 'build and package armel'
-      run: CONFIG_SITE=/etc/dpkg-cross/cross-config.armel DH_MESON_CROSS_FILE=armel.ini dpkg-buildpackage -aarmel -Pcross
+        ${{ matrix.add-arch-command }}
+        apt-get update
+        apt install -y ${{ matrix.apt-get-libs }}
+    - name: 'build and package'
+      run: ${{ matrix.make-and-build }}
     - name: 'move debs back into home'
       run: |
         ls ..
@@ -42,7 +51,7 @@ jobs:
     - name: upload
       uses: actions/upload-artifact@v2
       with:
-        name: PenguinTuner_Packages
+        name: PenguinTuner Package ${{ matrix.os }}
         path: penguintuner*.deb
 
   build-macos:
@@ -51,8 +60,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: 'Prepare Runner'
         run: |
-          brew install pkgconfig cmake python3 curl libssh gtk+3
-          pip3 install meson ninja
+          brew install pkgconfig cmake curl libssh gtk+4
       - name: 'build'
         run: ./build.sh
       - name: Create upload folder
@@ -65,10 +73,50 @@ jobs:
         with:
           name: Mac Binaries
           path: macos-bins/*
+
+  build-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-2019
+            arch-name: x86_32
+            triplet: x86-windows
+          - os: windows-2019
+            arch-name: x86_64
+            triplet: x64-windows
+
+    env:
+      # Indicates the location of the vcpkg as a Git submodule of the project repository.
+      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: lukka/get-cmake@latest
+      - uses: lukka/run-vcpkg@v10
+        id: runvcpkg
+        with:
+          vcpkgJsonGlob: 'vcpkg.json'
+      - name: Run CMake to build PenguinTuner.
+        uses: lukka/run-cmake@v10
+        id: runcmake
+        with:
+          configurePreset: 'msbuild-vcpkg'
+          buildPreset: 'msbuild-vcpkg'
+      - name: 'upload'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Windows Backend ${{ matrix.arch-name }}
+          path: builds/msbuild-vcpkg/Debug/*
 
   verify-install:
-    runs-on: ubuntu-20.04
-    needs: [build]
+    runs-on: ubuntu-18.04
+    container:
+      image: debian:experimental
+    needs: [build-linux]
     steps:
       - name: Download previous job artifact
         uses: actions/download-artifact@v2
@@ -90,7 +138,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build-linux, build-macos, build-windows]
     # Release the version if it includes a tag that starts with "v"
     if: success() && startsWith(github.ref, 'refs/tags/v')
     steps:

.github/workflows/checkout-build.yml

@@ -8,14 +8,19 @@ on:
     branches: [ master ]
 
 jobs:
-  build-native:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-          - os: macos-10.15
-    runs-on: ${{ matrix.os }}
+  build-native-linux:
+    runs-on: ubuntu-18.04
+    container:
+      image: debian:bookworm
+    steps:
+      - uses: actions/checkout@v2
+      - name: configure
+        run: ./configure.sh
+      - name: build
+        run: ./build.sh
+
+  build-native-macos:
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
       - name: configure
@@ -36,11 +41,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: uraimo/run-on-arch-action@v2.0.8
+    - uses: tytanrock/run-on-arch-action@master
       name: build and configure
       with:
         arch: ${{ matrix.arch }}
-        distro: buster
+        distro: bookworm
         run: |
           ./configure.sh
           ./build.sh

.gitignore

@@ -1,4 +1,5 @@
 *build/*
+*builds/*
 *.swp
 *.*~
 debian/.debhelper/
@@ -7,4 +8,5 @@ debian/penguintuner.substvars
 debian/penguintuner/
 debian/files
 obj-*
+cmake-build-debug/
 

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "Phoenix-Linux-SocketCAN-Example"]
 	path = Phoenix-Linux-SocketCAN-Example
 	url = [email protected]:/CrossTheRoadElec/Phoenix-Linux-SocketCAN-Example
+[submodule "vcpkg"]
+	path = vcpkg
+	url = [email protected]:microsoft/vcpkg.git

.vscode/c_cpp_properties.json

@@ -13,7 +13,8 @@
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c11",
             "cppStandard": "c++14",
-            "intelliSenseMode": "clang-x64"
+            "intelliSenseMode": "clang-x64",
+            "configurationProvider": "ms-vscode.cmake-tools"
         }
     ],
     "version": 4

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "penguinbackend_export.h": "c"
+    }
+}

CMakeLists.txt

@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 3.10)
+project(penguintuner C)
+
+# Find required packages
+find_package(Threads REQUIRED)
+find_package(libssh REQUIRED)
+find_package(CURL REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK4 REQUIRED gtk4)
+
+# Configure source files
+SET(SRCS src/app_callbacks.c
+         src/application.c
+         src/can_devices.c
+         src/robot_controller.c
+         src/form_maker.c)
+
+# Configure project
+add_executable(${PROJECT_NAME} ${SRCS})
+
+if(WIN32)
+    SET(DIRECTORY "win32")
+elseif(WIN64)
+    SET(DIRECTORY "win64")
+elseif(APPLE)
+    SET(DIRECTORY "macos")
+elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "amd64")
+    SET(DIRECTORY "amd64")
+elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "armv7l" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "armhf")
+    SET(DIRECTORY "armhf")
+elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "armv8b" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "armv8l" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "armv8l" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+    SET(DIRECTORY "arm64")
+elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "armv6l")
+    SET(DIRECTORY "armel")
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+endif()
+
+target_link_directories(${PROJECT_NAME} PRIVATE ${GTK4_LIBRARY_DIRS})
+target_link_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backend/lib/${DIRECTORY})
+
+# Target link libraries
+target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
+target_link_libraries(${PROJECT_NAME} PRIVATE ssh)
+target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${GTK4_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} PRIVATE penguinbackend)
+
+# Include directories
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backend/headers)
+target_include_directories(${PROJECT_NAME} PRIVATE ${GTK4_INCLUDE_DIRS})
+
+# Copy libs in case they're necessary
+add_custom_command(TARGET ${PROJECT_NAME}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/backend/lib/win64 ${CMAKE_BINARY_DIR}/Debug
+    COMMENT "Copying necessary libraries into build output"
+)