Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: Change Cygwin default install location to Cygwin64

This commit is contained in:
hendjosh 2020-12-12 16:58:10 -05:00 committed by Andrew Tridgell
parent 40090dcce9
commit 7f999ef64a
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/win_sitl/RunCopter.bat
View File

@ -2,8 +2,8 @@ rem File run APM:Copter SITL
SETLOCAL enableextensions
@echo off
rem Assumes a Cgywin install at C:\cygwin
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin")
rem Assumes a Cgywin install at C:\cygwin64
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin64")
rem get current dir for Cygwin
set pth=%CD:~2,99%

4
Tools/autotest/win_sitl/RunPlane.bat
View File

@ -2,8 +2,8 @@ rem File run APM:Plane SITL
SETLOCAL enableextensions
@echo off
rem Assumes a Cgywin install at C:\cygwin
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin")
rem Assumes a Cgywin install at C:\cygwin64
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin64")
rem get current dir for Cygwin
set pth=%CD:~2,99%

4
Tools/autotest/win_sitl/RunRover.bat
View File

@ -2,8 +2,8 @@ rem File run APM:Rover SITL
SETLOCAL enableextensions
@echo off
rem Assumes a Cgywin install at C:\cygwin
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin")
rem Assumes a Cgywin install at C:\cygwin64
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin64")
rem get current dir for Cygwin
set pth=%CD:~2,99%

7
Tools/autotest/win_sitl/UpdateAPMSource.bat
View File

@ -2,6 +2,9 @@ rem File to update the APM source
rem Assumes a Cgywin install at C:\cygwin
@echo off
rem Assumes a Cgywin install at C:\cygwin64
if "%CYGWIN_LOCATION%" == "" (set "CYGWIN_LOCATION=C:\cygwin64")
rem get current dir for Cygwin
set pth=%CD:~2,99%
set pth=%pth:\=/%
@ -9,9 +12,9 @@ set drv=%CD:~0,1%
set "fullpath=/cygdrive/%drv%%pth%"
rem update the source
C:\cygwin\bin\bash.exe --login -i -c "cd ""%fullpath%"" && cd ../../../ && git pull && git submodule update --init --recursive"
%CYGWIN_LOCATION%\bin\bash.exe --login -i -c "cd ""%fullpath%"" && cd ../../../ && git pull && git submodule update --init --recursive"
rem re-configure build config
C:\cygwin\bin\bash.exe --login -i -c "cd ""%fullpath%"" && cd ../../../ && ./modules/waf/waf-light configure --board=sitl"
%CYGWIN_LOCATION%\bin\bash.exe --login -i -c "cd ""%fullpath%"" && cd ../../../ && ./modules/waf/waf-light configure --board=sitl"
pause

2
Tools/autotest/win_sitl/readme.txt
View File

@ -15,4 +15,4 @@ To continue with the current EEPROM, run:
To update the APM code with the latest of Github, run UpdateAPMSource.bat. Note this is bleeding-edge source code and some bugs may be present.
Deleting the SITL environment
To uninstall/delete the SITL environment, simply delete the "cygwin" folder in the C:\ drive.
To uninstall/delete the SITL environment, simply delete the "cygwin64" folder in the C:\ drive.