Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-03 22:48:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: build_binaries: fix generation of firmware-version.txt

Browse Source 
For waf builds we build from root directory.
This commit is contained in:
Lucas De Marchi 2016-08-11 23:24:31 -03:00
parent cd333cb43a
commit 46be2cf026
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tools/scripts/build_binaries.sh
View File

@ -150,8 +150,9 @@ skip_build() {
addfwversion() { addfwversion() {
destdir="$1" destdir="$1"
src="$2"
git log -1 > "$destdir/git-version.txt" git log -1 > "$destdir/git-version.txt"
[ -f "version.h" ] && { [ -f "$src/version.h" ] && {
shopt -s nullglob shopt -s nullglob
version=$(grep 'define.THISFIRMWARE' version.h 2> /dev/null | cut -d'"' -f2) version=$(grep 'define.THISFIRMWARE' version.h 2> /dev/null | cut -d'"' -f2)
echo >> "$destdir/git-version.txt" echo >> "$destdir/git-version.txt"
@ -165,16 +166,17 @@ copyit() {
file="$1" file="$1"
dir="$2" dir="$2"
tag="$3" tag="$3"
src="${4:-.}"
bname=$(basename $dir) bname=$(basename $dir)
tdir=$(dirname $(dirname $(dirname $dir)))/$tag/$bname tdir=$(dirname $(dirname $(dirname $dir)))/$tag/$bname
if [ "$tag" = "latest" ]; then if [ "$tag" = "latest" ]; then
mkdir -p "$dir" mkdir -p "$dir"
/bin/cp "$file" "$dir" /bin/cp "$file" "$dir"
addfwversion "$dir" addfwversion "$dir" "$src"
fi fi
echo "Copying $file to $tdir" echo "Copying $file to $tdir"
mkdir -p "$tdir" mkdir -p "$tdir"
addfwversion "$tdir" addfwversion "$tdir" "$src"
rsync "$file" "$tdir" rsync "$file" "$tdir"
} }
@ -232,7 +234,7 @@ build_arduplane() {
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue
} }
copyit $BUILDROOT/$b/bin/arduplane $ddir $tag copyit $BUILDROOT/$b/bin/arduplane $ddir $tag "ArduPlane"
touch $binaries/Plane/$tag touch $binaries/Plane/$tag
done done
pushd ArduPlane pushd ArduPlane
@ -291,7 +293,7 @@ build_arducopter() {
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue
} }
copyit $BUILDROOT/$b/bin/arducopter-$f $ddir $tag copyit $BUILDROOT/$b/bin/arducopter-$f $ddir $tag "ArduCopter"
touch $binaries/Copter/$tag touch $binaries/Copter/$tag
done done
done done
@ -354,7 +356,7 @@ build_rover() {
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue
} }
copyit $BUILDROOT/$b/bin/ardurover $ddir $tag copyit $BUILDROOT/$b/bin/ardurover $ddir $tag "APMRover2"
touch $binaries/Rover/$tag touch $binaries/Rover/$tag
done done
pushd APMrover2 pushd APMrover2
@ -418,7 +420,7 @@ build_antennatracker() {
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue
} }
copyit $BUILDROOT/$b/bin/antennatracker $ddir $tag copyit $BUILDROOT/$b/bin/antennatracker $ddir $tag "AntennaTracker"
touch $binaries/AntennaTracker/$tag touch $binaries/AntennaTracker/$tag
done done
pushd AntennaTracker pushd AntennaTracker