aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: allow build_parameters.sh to work from either APM directory or above

Browse Source
This commit is contained in:
Andrew Tridgell 2013-05-30 12:19:50 +10:00
parent 7eb40d151c
commit 96df6d6f7c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/scripts/build_autotest.sh
View File

@ -116,7 +116,7 @@ mkdir -p "buildlogs/history/$hdate"
(cd buildlogs && cp -f *.txt *.flashlog *.tlog *.km[lz] *.gpx *.html *.png "history/$hdate/") (cd buildlogs && cp -f *.txt *.flashlog *.tlog *.km[lz] *.gpx *.html *.png "history/$hdate/")
echo $githash > "buildlogs/history/$hdate/githash.txt" echo $githash > "buildlogs/history/$hdate/githash.txt"
APM/Tools/scripts/build_parameters.sh (cd APM && Tools/scripts/build_parameters.sh)
timelimit 4700 APM/Tools/autotest/autotest.py --timeout=4500 > buildlogs/autotest-output.txt 2>&1 timelimit 4700 APM/Tools/autotest/autotest.py --timeout=4500 > buildlogs/autotest-output.txt 2>&1

4
Tools/scripts/build_parameters.sh
View File

@ -2,7 +2,9 @@
set -e set -e
cd APM # work from either APM directory or above
[ -d ArduPlane ] || cd APM
./Tools/autotest/param_metadata/param_parse.py > param.out || exit 1 ./Tools/autotest/param_metadata/param_parse.py > param.out || exit 1
/bin/mkdir -p ../buildlogs/Parameters /bin/mkdir -p ../buildlogs/Parameters
/bin/cp Parameters.wiki Parameters.html *.pdef.xml ../buildlogs/Parameters/ /bin/cp Parameters.wiki Parameters.html *.pdef.xml ../buildlogs/Parameters/