Merge pull request #779 from mavlink/pr-win-exe

Windows build fixes

Author: julianoes

.github/workflows/main.yml

@@ -180,9 +180,14 @@ jobs:
       matrix:
         include:
           - arch: x86
+            host_arch: x64
             wheel_arch: win32
           - arch: x64
+            host_arch: x64
             wheel_arch: win_amd64
+          - arch: arm64
+            host_arch: x64
+            wheel_arch: win_arm64
 
     steps:
       - uses: actions/checkout@v4
@@ -195,7 +200,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: 3.x
-          architecture: ${{ matrix.arch }}
+          architecture: ${{ matrix.host_arch }}
 
       - name: Install prerequisites
         run: |
@@ -204,6 +209,7 @@ jobs:
 
       - name: Create wheel
         run: |
+          set MAVSDK_SERVER_ARCH=${{ matrix.arch }}
           python3 setup.py bdist_wheel
           Dir "dist/" | rename-item -NewName {$_.name -replace '-any.whl','-${{ matrix.wheel_arch }}.whl'}
 

MANIFEST.in

@@ -1,2 +1,3 @@
 include mavsdk/bin
 include mavsdk/bin/mavsdk_server
+include mavsdk/bin/mavsdk_server.exe

MAVSDK_SERVER_VERSION

@@ -1 +1 @@
-v3.6.0
+v3.8.0

mavsdk/action_server.py

@@ -567,7 +567,7 @@ async def arm_disarm(self):
                     raise ActionServerError(result, "arm_disarm()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    arm_disarm_stream.cancel()
+                    arm_disarm_stream.cancel();
                     return
 
 
@@ -606,7 +606,7 @@ async def flight_mode_change(self):
                     raise ActionServerError(result, "flight_mode_change()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    flight_mode_change_stream.cancel()
+                    flight_mode_change_stream.cancel();
                     return
 
 
@@ -645,7 +645,7 @@ async def takeoff(self):
                     raise ActionServerError(result, "takeoff()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    takeoff_stream.cancel()
+                    takeoff_stream.cancel();
                     return
 
 
@@ -684,7 +684,7 @@ async def land(self):
                     raise ActionServerError(result, "land()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    land_stream.cancel()
+                    land_stream.cancel();
                     return
 
 
@@ -723,7 +723,7 @@ async def reboot(self):
                     raise ActionServerError(result, "reboot()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    reboot_stream.cancel()
+                    reboot_stream.cancel();
                     return
 
 
@@ -762,7 +762,7 @@ async def shutdown(self):
                     raise ActionServerError(result, "shutdown()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    shutdown_stream.cancel()
+                    shutdown_stream.cancel();
                     return
 
 
@@ -801,7 +801,7 @@ async def terminate(self):
                     raise ActionServerError(result, "terminate()")
 
                 if result.result == ActionServerResult.Result.SUCCESS:
-                    terminate_stream.cancel()
+                    terminate_stream.cancel();
                     return
 
 

mavsdk/calibration.py

@@ -368,7 +368,7 @@ async def calibrate_gyro(self):
                     raise CalibrationError(result, "calibrate_gyro()")
 
                 if result.result == CalibrationResult.Result.SUCCESS:
-                    calibrate_gyro_stream.cancel()
+                    calibrate_gyro_stream.cancel();
                     return
 
 
@@ -408,7 +408,7 @@ async def calibrate_accelerometer(self):
                     raise CalibrationError(result, "calibrate_accelerometer()")
 
                 if result.result == CalibrationResult.Result.SUCCESS:
-                    calibrate_accelerometer_stream.cancel()
+                    calibrate_accelerometer_stream.cancel();
                     return
 
 
@@ -448,7 +448,7 @@ async def calibrate_magnetometer(self):
                     raise CalibrationError(result, "calibrate_magnetometer()")
 
                 if result.result == CalibrationResult.Result.SUCCESS:
-                    calibrate_magnetometer_stream.cancel()
+                    calibrate_magnetometer_stream.cancel();
                     return
 
 
@@ -488,7 +488,7 @@ async def calibrate_level_horizon(self):
                     raise CalibrationError(result, "calibrate_level_horizon()")
 
                 if result.result == CalibrationResult.Result.SUCCESS:
-                    calibrate_level_horizon_stream.cancel()
+                    calibrate_level_horizon_stream.cancel();
                     return
 
 
@@ -528,7 +528,7 @@ async def calibrate_gimbal_accelerometer(self):
                     raise CalibrationError(result, "calibrate_gimbal_accelerometer()")
 
                 if result.result == CalibrationResult.Result.SUCCESS:
-                    calibrate_gimbal_accelerometer_stream.cancel()
+                    calibrate_gimbal_accelerometer_stream.cancel();
                     return
 
 

mavsdk/ftp.py

@@ -432,7 +432,7 @@ async def download(self, remote_file_path, local_dir, use_burst):
                     raise FtpError(result, "download()", remote_file_path, local_dir, use_burst)
 
                 if result.result == FtpResult.Result.SUCCESS:
-                    download_stream.cancel()
+                    download_stream.cancel();
                     return
 
 
@@ -482,7 +482,7 @@ async def upload(self, local_file_path, remote_dir):
                     raise FtpError(result, "upload()", local_file_path, remote_dir)
 
                 if result.result == FtpResult.Result.SUCCESS:
-                    upload_stream.cancel()
+                    upload_stream.cancel();
                     return
 
 

mavsdk/log_files.py

@@ -422,7 +422,7 @@ async def download_log_file(self, entry, path):
                     raise LogFilesError(result, "download_log_file()", entry, path)
 
                 if result.result == LogFilesResult.Result.SUCCESS:
-                    download_log_file_stream.cancel()
+                    download_log_file_stream.cancel();
                     return