Tools: move to compiling 64-bit Windows executables
Co-authored-by: davidbuzz@gmail.com Co-authored-by: robertlong13 cygwin has dropped 32-bit support
This commit is contained in:
parent
f9ae4bc3a3
commit
b50258245d
@ -8,13 +8,22 @@
|
||||
|
||||
set -x
|
||||
|
||||
# TOOLCHAIN=i686-pc-cygwin
|
||||
TOOLCHAIN=x86_64-pc-cygwin
|
||||
GPP_COMPILER="${TOOLCHAIN}-g++"
|
||||
|
||||
$GPP_COMPILER -print-sysroot
|
||||
|
||||
SYS_ROOT=$($GPP_COMPILER -print-sysroot)
|
||||
echo "SYS_ROOT=$SYS_ROOT"
|
||||
|
||||
git config --global --add safe.directory /cygdrive/d/a/ardupilot/ardupilot
|
||||
|
||||
rm -rf artifacts
|
||||
mkdir artifacts
|
||||
|
||||
(
|
||||
python ./waf --color yes --toolchain i686-pc-cygwin --board sitl configure 2>&1
|
||||
python ./waf --color yes --toolchain $TOOLCHAIN --board sitl configure 2>&1
|
||||
python ./waf plane 2>&1
|
||||
python ./waf copter 2>&1
|
||||
python ./waf heli 2>&1
|
||||
@ -22,8 +31,6 @@ mkdir artifacts
|
||||
python ./waf sub 2>&1
|
||||
) | tee artifacts/build.txt
|
||||
|
||||
i686-pc-cygwin-g++ -print-sysroot
|
||||
|
||||
# copy both with exe and without to cope with differences
|
||||
# between windows versions in CI
|
||||
cp -v build/sitl/bin/arduplane artifacts/ArduPlane.elf.exe
|
||||
@ -38,7 +45,14 @@ cp -v build/sitl/bin/arducopter-heli artifacts/ArduHeli.elf
|
||||
cp -v build/sitl/bin/ardurover artifacts/ArduRover.elf
|
||||
cp -v build/sitl/bin/ardusub artifacts/ArduSub.elf
|
||||
|
||||
cp -v /usr/i686-pc-cygwin/sys-root/usr/bin/*.dll artifacts/
|
||||
# Find all cyg*.dll files returned by cygcheck for each exe in artifacts
|
||||
# and copy them over
|
||||
for exe in artifacts/*.exe; do
|
||||
echo $exe
|
||||
cygcheck $exe | grep -oP 'cyg[^\s\\/]+\.dll' | while read -r line; do
|
||||
cp -v /usr/bin/$line artifacts/
|
||||
done
|
||||
done
|
||||
|
||||
git log -1 > artifacts/git.txt
|
||||
ls -l artifacts/
|
||||
|
Loading…
Reference in New Issue
Block a user