From 472a50f9c24fce87d953cd8b365aa09e48131f38 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 13 Mar 2015 11:36:54 +1100 Subject: [PATCH] Build: removed APM2 build for copter no longer supported --- Tools/scripts/build_all.sh | 2 +- Tools/scripts/build_binaries.sh | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/Tools/scripts/build_all.sh b/Tools/scripts/build_all.sh index ac0e15826d..cdb5f6e649 100755 --- a/Tools/scripts/build_all.sh +++ b/Tools/scripts/build_all.sh @@ -19,7 +19,7 @@ popd echo "Testing ArduCopter build" pushd ArduCopter -for b in all apm2 apm1-hil apm2-hil sitl apm2-heli linux; do +for b in all sitl linux; do pwd make clean make $b -j4 diff --git a/Tools/scripts/build_binaries.sh b/Tools/scripts/build_binaries.sh index 0a239f81d5..fd46aab18f 100755 --- a/Tools/scripts/build_binaries.sh +++ b/Tools/scripts/build_binaries.sh @@ -176,26 +176,6 @@ build_arducopter() { echo "Building ArduCopter $tag binaries from $(pwd)" pushd ArduCopter frames="quad tri hexa y6 octa octa-quad heli" - for b in apm1 apm2; do - checkout ArduCopter $tag $b || { - echo "Failed checkout of ArduCopter $b $tag" - error_count=$((error_count+1)) - continue - } - for f in $frames quad-hil heli-hil; do - echo "Building ArduCopter $b-$f binaries" - ddir="$binaries/Copter/$hdate/$b-$f" - skip_build $tag $ddir && continue - make clean || continue - make "$b-$f" -j4 || { - echo "Failed build of ArduCopter $b $tag" - error_count=$((error_count+1)) - continue - } - copyit $TMPDIR/ArduCopter.build/ArduCopter.hex "$ddir" "$tag" - touch $binaries/Copter/$tag - done - done test -n "$PX4_ROOT" && { checkout ArduCopter $tag PX4 || { echo "Failed checkout of ArduCopter PX4 $tag"