Skip to content

Commit 61b58af

Browse files
julianoesjulianoes
authored
Merge pull request #779 from mavlink/pr-win-exe
Windows build fixes
2 parents c704761 + a2c44eb commit 61b58af

19 files changed

+1054
-37
lines changed

‎.github/workflows/main.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,14 @@ jobs:
180180
matrix:
181181
include:
182182
- arch: x86
183+
host_arch: x64
183184
wheel_arch: win32
184185
- arch: x64
186+
host_arch: x64
185187
wheel_arch: win_amd64
188+
- arch: arm64
189+
host_arch: x64
190+
wheel_arch: win_arm64
186191

187192
steps:
188193
- uses: actions/checkout@v4
@@ -195,7 +200,7 @@ jobs:
195200
uses: actions/setup-python@v5
196201
with:
197202
python-version: 3.x
198-
architecture: ${{ matrix.arch }}
203+
architecture: ${{ matrix.host_arch }}
199204

200205
- name: Install prerequisites
201206
run: |
@@ -204,6 +209,7 @@ jobs:
204209
205210
- name: Create wheel
206211
run: |
212+
set MAVSDK_SERVER_ARCH=${{ matrix.arch }}
207213
python3 setup.py bdist_wheel
208214
Dir "dist/" | rename-item -NewName {$_.name -replace '-any.whl','-${{ matrix.wheel_arch }}.whl'}
209215

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
include mavsdk/bin
22
include mavsdk/bin/mavsdk_server
3+
include mavsdk/bin/mavsdk_server.exe

‎MAVSDK_SERVER_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.6.0
1+
v3.8.0

‎mavsdk/action_server.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ async def arm_disarm(self):
567567
raise ActionServerError(result, "arm_disarm()")
568568

569569
if result.result == ActionServerResult.Result.SUCCESS:
570-
arm_disarm_stream.cancel()
570+
arm_disarm_stream.cancel();
571571
return
572572

573573

@@ -606,7 +606,7 @@ async def flight_mode_change(self):
606606
raise ActionServerError(result, "flight_mode_change()")
607607

608608
if result.result == ActionServerResult.Result.SUCCESS:
609-
flight_mode_change_stream.cancel()
609+
flight_mode_change_stream.cancel();
610610
return
611611

612612

@@ -645,7 +645,7 @@ async def takeoff(self):
645645
raise ActionServerError(result, "takeoff()")
646646

647647
if result.result == ActionServerResult.Result.SUCCESS:
648-
takeoff_stream.cancel()
648+
takeoff_stream.cancel();
649649
return
650650

651651

@@ -684,7 +684,7 @@ async def land(self):
684684
raise ActionServerError(result, "land()")
685685

686686
if result.result == ActionServerResult.Result.SUCCESS:
687-
land_stream.cancel()
687+
land_stream.cancel();
688688
return
689689

690690

@@ -723,7 +723,7 @@ async def reboot(self):
723723
raise ActionServerError(result, "reboot()")
724724

725725
if result.result == ActionServerResult.Result.SUCCESS:
726-
reboot_stream.cancel()
726+
reboot_stream.cancel();
727727
return
728728

729729

@@ -762,7 +762,7 @@ async def shutdown(self):
762762
raise ActionServerError(result, "shutdown()")
763763

764764
if result.result == ActionServerResult.Result.SUCCESS:
765-
shutdown_stream.cancel()
765+
shutdown_stream.cancel();
766766
return
767767

768768

@@ -801,7 +801,7 @@ async def terminate(self):
801801
raise ActionServerError(result, "terminate()")
802802

803803
if result.result == ActionServerResult.Result.SUCCESS:
804-
terminate_stream.cancel()
804+
terminate_stream.cancel();
805805
return
806806

807807

‎mavsdk/calibration.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ async def calibrate_gyro(self):
368368
raise CalibrationError(result, "calibrate_gyro()")
369369

370370
if result.result == CalibrationResult.Result.SUCCESS:
371-
calibrate_gyro_stream.cancel()
371+
calibrate_gyro_stream.cancel();
372372
return
373373

374374

@@ -408,7 +408,7 @@ async def calibrate_accelerometer(self):
408408
raise CalibrationError(result, "calibrate_accelerometer()")
409409

410410
if result.result == CalibrationResult.Result.SUCCESS:
411-
calibrate_accelerometer_stream.cancel()
411+
calibrate_accelerometer_stream.cancel();
412412
return
413413

414414

@@ -448,7 +448,7 @@ async def calibrate_magnetometer(self):
448448
raise CalibrationError(result, "calibrate_magnetometer()")
449449

450450
if result.result == CalibrationResult.Result.SUCCESS:
451-
calibrate_magnetometer_stream.cancel()
451+
calibrate_magnetometer_stream.cancel();
452452
return
453453

454454

@@ -488,7 +488,7 @@ async def calibrate_level_horizon(self):
488488
raise CalibrationError(result, "calibrate_level_horizon()")
489489

490490
if result.result == CalibrationResult.Result.SUCCESS:
491-
calibrate_level_horizon_stream.cancel()
491+
calibrate_level_horizon_stream.cancel();
492492
return
493493

494494

@@ -528,7 +528,7 @@ async def calibrate_gimbal_accelerometer(self):
528528
raise CalibrationError(result, "calibrate_gimbal_accelerometer()")
529529

530530
if result.result == CalibrationResult.Result.SUCCESS:
531-
calibrate_gimbal_accelerometer_stream.cancel()
531+
calibrate_gimbal_accelerometer_stream.cancel();
532532
return
533533

534534

‎mavsdk/ftp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ async def download(self, remote_file_path, local_dir, use_burst):
432432
raise FtpError(result, "download()", remote_file_path, local_dir, use_burst)
433433

434434
if result.result == FtpResult.Result.SUCCESS:
435-
download_stream.cancel()
435+
download_stream.cancel();
436436
return
437437

438438

@@ -482,7 +482,7 @@ async def upload(self, local_file_path, remote_dir):
482482
raise FtpError(result, "upload()", local_file_path, remote_dir)
483483

484484
if result.result == FtpResult.Result.SUCCESS:
485-
upload_stream.cancel()
485+
upload_stream.cancel();
486486
return
487487

488488

‎mavsdk/log_files.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ async def download_log_file(self, entry, path):
422422
raise LogFilesError(result, "download_log_file()", entry, path)
423423

424424
if result.result == LogFilesResult.Result.SUCCESS:
425-
download_log_file_stream.cancel()
425+
download_log_file_stream.cancel();
426426
return
427427

428428

0 commit comments

Comments
 (0)