Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
293eca7d
Commit
293eca7d
authored
7 years ago
by
Daniel Agar
Browse files
Options
Downloads
Patches
Plain Diff
Makefile add px4_metadata for airframes and parameters
parent
93d4f487
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+2
-0
2 additions, 0 deletions
.gitignore
.travis.yml
+4
-4
4 additions, 4 deletions
.travis.yml
Makefile
+14
-10
14 additions, 10 deletions
Makefile
with
20 additions
and
14 deletions
.gitignore
+
2
−
0
View file @
293eca7d
...
...
@@ -89,3 +89,5 @@ coverage.info
posix-configs/SITL/init/test/*_generated
parameters.md
airframes.md
airframes.xml
This diff is collapsed.
Click to expand it.
.travis.yml
+
4
−
4
View file @
293eca7d
...
...
@@ -33,7 +33,7 @@ matrix:
sudo
:
required
services
:
-
docker
env
:
BUILD_TARGET=p
arameters_markdown
env
:
BUILD_TARGET=p
x4_metadata
-
os
:
osx
sudo
:
true
osx_image
:
xcode8
...
...
@@ -64,8 +64,8 @@ script:
./Tools/docker_run.sh 'make check_format';
elif [[ "${BUILD_TARGET}" = "tests_linux" ]]; then
./Tools/docker_run.sh 'make tests';
elif [[ "${BUILD_TARGET}" = "p
arameters_markdown
" ]]; then
./Tools/docker_run.sh 'make p
arameters_markdown
';
elif [[ "${BUILD_TARGET}" = "p
x4_metadata
" ]]; then
./Tools/docker_run.sh 'make p
x4_metadata
';
elif [[ "${BUILD_TARGET}" = "clang-tidy" ]]; then
PX4_DOCKER_REPO=px4io/px4-dev-clang:2017-04-22 ./Tools/docker_run.sh 'make clang-tidy-parallel';
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
...
...
@@ -78,7 +78,7 @@ after_success:
./Tools/docker_run.sh 'make s3put_firmware AWS_S3_BUCKET="px4-travis/archives/Firmware/${TRAVIS_BRANCH}/${TRAVIS_BUILD_ID}"'
&& ./Tools/docker_run.sh 'make s3put_qgc_firmware AWS_S3_BUCKET="px4-travis/Firmware/${TRAVIS_BRANCH}"';
fi
-
if [[ "${BUILD_TARGET}" = "p
arameters_markdown
" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
-
if [[ "${BUILD_TARGET}" = "p
x4_metadata
" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
./Tools/docker_run.sh 'make s3put_parameters_markdown AWS_S3_BUCKET="px4-travis/Firmware/${TRAVIS_BRANCH}"';
fi
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
14
−
10
View file @
293eca7d
...
...
@@ -182,8 +182,9 @@ excelsior_legacy_default: posix_excelsior_legacy qurt_excelsior_legacy
# QGroundControl flashable NuttX firmware
qgc_firmware
:
\
check_a
uav-x21
_default
\
check_a
erocore2
_default
\
check_aerofc-v1_default
\
check_auav-x21_default
\
check_crazyflie_default
\
check_mindpx-v2_default
\
check_px4fmu-v1_default
\
...
...
@@ -192,7 +193,6 @@ qgc_firmware: \
check_px4fmu-v3_default
\
check_px4fmu-v4_default
\
check_tap-v1_default
\
check_aerocore2_default
\
check_sizes
# Other NuttX firmware
...
...
@@ -222,7 +222,6 @@ uavcan_firmware:
@
BOARD
=
s2740vc_1_0 make
--silent
--no-print-directory
@
BOARD
=
px4esc_1_6 make
--silent
--no-print-directory
&&
$(
SRC_DIR
)
/Tools/uavcan_copy.sh
)
sizes
:
@
-find
build_
*
-name
firmware_nuttx
-type
f | xargs size 2> /dev/null
||
:
...
...
@@ -240,11 +239,17 @@ check_%:
# Documentation
# --------------------------------------------------------------------
.PHONY
:
parameters_m
arkdown
.PHONY
:
parameters_m
etadata airframe_metadata px4_metadata
parameters_m
arkdown
:
posix_sitl_default
parameters_m
etadata
:
posix_sitl_default
@
python
$(
SRC_DIR
)
/Tools/px_process_params.py
-s
$(
SRC_DIR
)
/src
--markdown
airframe_metadata
:
@
python
${
SRC_DIR
}
/Tools/px_process_airframes.py
-v
-a
${
SRC_DIR
}
/ROMFS/px4fmu_common/init.d
--markdown
@
python
${
SRC_DIR
}
/Tools/px_process_airframes.py
-v
-a
${
SRC_DIR
}
/ROMFS/px4fmu_common/init.d
--xml
px4_metadata
:
parameters_metadata airframe_metadata
# S3 upload helpers
# --------------------------------------------------------------------
# s3cmd uses these ENV variables
...
...
@@ -261,11 +266,12 @@ s3put_firmware: Firmware.zip
$(
SRC_DIR
)
/Tools/s3put.sh Firmware.zip
s3put_qgc_firmware
:
qgc_firmware
@$(
SRC_DIR
)
/Tools/s3put.sh
$(
SRC_DIR
)
/build_px4fmu-v3_default/airframes.xml
@$(
SRC_DIR
)
/Tools/s3put.sh
$(
SRC_DIR
)
/build_px4fmu-v3_default/parameters.xml
@
find
$(
SRC_DIR
)
/build_
*
-name
"*.px4"
-exec
$(
SRC_DIR
)
/Tools/s3put.sh
"{}"
\;
s3put_parameters_markdown
:
parameters_markdown
s3put_metadata
:
px4_metadata
@$(
SRC_DIR
)
/Tools/s3put.sh airframes.md
@$(
SRC_DIR
)
/Tools/s3put.sh airframes.xml
@$(
SRC_DIR
)
/Tools/s3put.sh build_posix_sitl_default/parameters.xml
@$(
SRC_DIR
)
/Tools/s3put.sh parameters.md
# Astyle
...
...
@@ -304,8 +310,6 @@ tests_coverage:
@
genhtml
--legend
--show-details
--function-coverage
--quiet
--output-directory
coverage-html coverage.info
@$(
MAKE
)
--no-print-directory
posix_sitl_default test_results_junit
# Clang analyzers
# --------------------------------------------------------------------
.PHONY
:
scan-build clang-check clang-tidy
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment