windows action live

grodansparadis · Nov 12, 2024 · cc0c6fe · cc0c6fe
1 parent f62e380
commit cc0c6fe
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 27 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -6,7 +6,7 @@ env:
   # Path to the solution file relative to the root of the project.
   # -G "Visual Studio 16 2019"
   SOLUTION_FILE_PATH: .
-  VSCP_PATH: '${{ github.workspace }}/vscp'
+  VSCP_PATH: ${{github.workspace}}/third_party/vscp
   ENVIRONMENT_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
   GENERATORS: "Visual Studio 17 2022"
   BUILD_CONFIGURATION: Release
@@ -35,10 +35,10 @@ jobs:
     - name: Prepare Qt Libraries
       uses: jurplel/install-qt-action@v3
       with:
-        version: '5.15.2'
+        version: '6.8.0'
         host: 'windows'
         target: 'desktop'
-        arch: 'win64_msvc2019_64'
+        arch: 'win64_msvc2022_64'
         modules: 'qtcharts'
         archives: 'qtbase qtsvg qttools qtwebsockets qtserialbus qtserialport qtdeclarative'
         cache: 'true'
@@ -56,14 +56,6 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: Checkout vscp repo
-      uses: actions/checkout@v4
-      with:
-        repository: grodansparadis/vscp
-        path: ${{ github.workspace }}
-        ref: development  
-        submodules: recursive   
-
     # - name: Install vcpkg
     #   uses: lukka/run-vcpkg@v2
     #   with:
@@ -87,7 +79,7 @@ jobs:
         additionalCachedPaths: '${{ env.buildDir }}/vcpkg_installed'
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v2
       with:
         msbuild-architecture: x64
 

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -43,15 +43,13 @@
           }
         },
         "label": "clean & build all"
-      },
+      },      
       {
-        "taskName": "Clean & build all 5.15.2",
+        "taskName": "Clean & build all 6.8.0",
         "type": "shell",
-        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/5.15.2/gcc_64 .. ;  make -j4 -Wall",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.8.0/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.8.0/gcc_64 .. ;  make -j4",
         "args": [],
-        "group": {
-          "kind": "build"
-        },
+        "group": "build",
         "problemMatcher": {
           "owner": "cpp",
           "fileLocation": [
@@ -67,12 +65,12 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 5.15.2"
+        "label": "Clean & build all 6.8.0"
       },
       {
-        "taskName": "Clean & build all 6.8.0",
+        "taskName": "Clean & build all 6.7.3",
         "type": "shell",
-        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.8.0/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.8.0/gcc_64 .. ;  make -j4",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.7.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/7.3.0/gcc_64 .. ;  make -j4",
         "args": [],
         "group": "build",
         "problemMatcher": {
@@ -90,12 +88,12 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 6.8.0"
+        "label": "Clean & build all 6.7.3"
       },
       {
-        "taskName": "Clean & build all 6.7.3",
+        "taskName": "Clean & build all 6.5.3",
         "type": "shell",
-        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.7.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/7.3.0/gcc_64 .. ;  make -j4",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.5.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.5.3/gcc_64 .. ;  make -j4",
         "args": [],
         "group": "build",
         "problemMatcher": {
@@ -113,7 +111,32 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 6.7.3"
+        "label": "Clean & build all 6.5.3"
+      },
+      {
+        "taskName": "Clean & build all 5.15.2",
+        "type": "shell",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/5.15.2/gcc_64 .. ;  make -j4 -Wall",
+        "args": [],
+        "group": {
+          "kind": "build"
+        },
+        "problemMatcher": {
+          "owner": "cpp",
+          "fileLocation": [
+            "relative",
+            "${workspaceFolder}"
+          ],
+          "pattern": {
+            "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+            "file": 1,
+            "line": 2,
+            "column": 3,
+            "severity": 4,
+            "message": 5
+          }
+        },
+        "label": "Clean & build all 5.15.2"
       },
       {
         "type": "shell",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,9 +56,9 @@ include(GNUInstallDirs)
 # Added extensions for curl lib find
 list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a")
 
-# --- Path to vscp --- 
+# --- Path to VSCP --- 
 if (NOT DEFINED VSCP_PATH)
-  set (VSCP_PATH "${PROJECT_SOURCE_DIR}/../vscp")
+  set (VSCP_PATH "${PROJECT_SOURCE_DIR}/third_party/vscp")
 endif()
 
 file(TO_CMAKE_PATH "$ENV{VSCP_ROOT}" VSCP_PATH)