scripts: fixed build_binaries for submodules

no longer have PX4_ROOT
This commit is contained in:
Andrew Tridgell 2015-06-15 06:53:20 +10:00
parent 71bc48189e
commit 22d5d2e251

View File

@ -138,7 +138,6 @@ build_arduplane() {
copyit $TMPDIR/ArduPlane.build/ArduPlane.hex $ddir $tag copyit $TMPDIR/ArduPlane.build/ArduPlane.hex $ddir $tag
touch $binaries/Plane/$tag touch $binaries/Plane/$tag
done done
test -n "$PX4_ROOT" && {
echo "Building ArduPlane PX4 binaries" echo "Building ArduPlane PX4 binaries"
ddir=$binaries/Plane/$hdate/PX4 ddir=$binaries/Plane/$hdate/PX4
checkout ArduPlane $tag PX4 || { checkout ArduPlane $tag PX4 || {
@ -165,7 +164,6 @@ build_arduplane() {
copyit px4io-v2.elf $binaries/PX4IO/$hdate/PX4IO $tag copyit px4io-v2.elf $binaries/PX4IO/$hdate/PX4IO $tag
fi fi
} }
}
checkout ArduPlane "latest" "" checkout ArduPlane "latest" ""
popd popd
} }
@ -176,7 +174,6 @@ build_arducopter() {
echo "Building ArduCopter $tag binaries from $(pwd)" echo "Building ArduCopter $tag binaries from $(pwd)"
pushd ArduCopter pushd ArduCopter
frames="quad tri hexa y6 octa octa-quad heli" frames="quad tri hexa y6 octa octa-quad heli"
test -n "$PX4_ROOT" && {
checkout ArduCopter $tag PX4 || { checkout ArduCopter $tag PX4 || {
echo "Failed checkout of ArduCopter PX4 $tag" echo "Failed checkout of ArduCopter PX4 $tag"
error_count=$((error_count+1)) error_count=$((error_count+1))
@ -197,7 +194,6 @@ build_arducopter() {
copyit ArduCopter-v1.px4 $ddir $tag && copyit ArduCopter-v1.px4 $ddir $tag &&
copyit ArduCopter-v2.px4 $ddir $tag copyit ArduCopter-v2.px4 $ddir $tag
done done
}
checkout ArduCopter "latest" "" checkout ArduCopter "latest" ""
popd popd
} }
@ -221,7 +217,6 @@ build_rover() {
copyit $TMPDIR/APMrover2.build/APMrover2.hex $ddir $tag copyit $TMPDIR/APMrover2.build/APMrover2.hex $ddir $tag
touch $binaries/Rover/$tag touch $binaries/Rover/$tag
done done
test -n "$PX4_ROOT" && {
echo "Building APMrover2 PX4 binaries" echo "Building APMrover2 PX4 binaries"
ddir=$binaries/Rover/$hdate/PX4 ddir=$binaries/Rover/$hdate/PX4
checkout APMrover2 $tag PX4 || { checkout APMrover2 $tag PX4 || {
@ -240,7 +235,6 @@ build_rover() {
copyit APMrover2-v1.px4 $binaries/Rover/$hdate/PX4 $tag && copyit APMrover2-v1.px4 $binaries/Rover/$hdate/PX4 $tag &&
copyit APMrover2-v2.px4 $binaries/Rover/$hdate/PX4 $tag copyit APMrover2-v2.px4 $binaries/Rover/$hdate/PX4 $tag
} }
}
checkout APMrover2 "latest" "" checkout APMrover2 "latest" ""
popd popd
} }
@ -264,7 +258,6 @@ build_antennatracker() {
copyit $TMPDIR/AntennaTracker.build/AntennaTracker.hex $ddir $tag copyit $TMPDIR/AntennaTracker.build/AntennaTracker.hex $ddir $tag
touch $binaries/AntennaTracker/$tag touch $binaries/AntennaTracker/$tag
done done
test -n "$PX4_ROOT" && {
echo "Building AntennaTracker PX4 binaries" echo "Building AntennaTracker PX4 binaries"
ddir=$binaries/AntennaTracker/$hdate/PX4 ddir=$binaries/AntennaTracker/$hdate/PX4
checkout AntennaTracker $tag PX4 || { checkout AntennaTracker $tag PX4 || {
@ -283,7 +276,6 @@ build_antennatracker() {
copyit AntennaTracker-v1.px4 $binaries/AntennaTracker/$hdate/PX4 $tag && copyit AntennaTracker-v1.px4 $binaries/AntennaTracker/$hdate/PX4 $tag &&
copyit AntennaTracker-v2.px4 $binaries/AntennaTracker/$hdate/PX4 $tag copyit AntennaTracker-v2.px4 $binaries/AntennaTracker/$hdate/PX4 $tag
} }
}
checkout AntennaTracker "latest" "" checkout AntennaTracker "latest" ""
popd popd
} }