yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 09:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

NuttX upgrade default compiler to GCC 7

Browse Source
This commit is contained in:
Daniel Agar
2018-01-01 10:26:04 -05:00
parent cd296c5f88
commit 9b5ae1ef7a
4 changed files with 8 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Jenkinsfile vendored
View File

@@ -15,7 +15,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-10-23').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') { docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "make distclean" sh "make distclean"
@@ -38,7 +38,7 @@ pipeline {
builds["px4fmu-v2"] = { builds["px4fmu-v2"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-10-23').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') { docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "make distclean" sh "make distclean"
@@ -66,7 +66,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-10-23').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') { docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "make distclean" sh "make distclean"
@@ -91,7 +91,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-10-23').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') { docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "make distclean" sh "make distclean"
@@ -218,27 +218,6 @@ pipeline {
} }
} }
// GCC7 nuttx
for (def option in ["px4fmu-v5_default"]) {
def node_name = "${option}"
builds["${node_name} (GCC7)"] = {
node {
stage("Build Test ${node_name} (GCC7)") {
docker.image('px4io/px4-dev-base-archlinux:2017-12-08').inside('-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw') {
stage("${node_name}") {
checkout scm
sh "make distclean"
sh "ccache -z"
sh "make nuttx_${node_name}"
sh "ccache -s"
}
}
}
}
}
}
parallel builds parallel builds
} }
} }
@@ -598,29 +577,6 @@ pipeline {
} }
} }
// temporarily disabled until stable
//stage('tests coverage') {
// agent {
// docker {
// image 'px4io/px4-dev-base:2017-12-30'
// args '-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw'
// }
// }
// steps {
// sh 'make distclean'
// sh 'make tests_coverage'
// // publish html
// publishHTML target: [
// allowMissing: false,
// alwaysLinkToLastBuild: false,
// keepAll: true,
// reportDir: 'build/posix_sitl_default/coverage-html',
// reportFiles: '*',
// reportName: 'Coverage Report'
// ]
// }
//}
} }
} }

4
Tools/docker_run.sh
View File

@@ -4,7 +4,7 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input"; echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then if [[ $@ =~ .*px4fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-10-23" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-12-30"
elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-raspi:2017-12-30"
@@ -30,7 +30,7 @@ fi
# otherwise default to nuttx # otherwise default to nuttx
if [ -z ${PX4_DOCKER_REPO+x} ]; then if [ -z ${PX4_DOCKER_REPO+x} ]; then
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-10-23" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-12-30"
fi fi
# docker hygiene # docker hygiene

2
cmake/common/px4_base.cmake
View File

@@ -332,6 +332,8 @@ function(px4_add_common_flags)
-Wunknown-pragmas -Wunknown-pragmas
-Wunused-variable -Wunused-variable
-Wno-implicit-fallthrough # set appropriate level and update
-Wno-unused-parameter -Wno-unused-parameter
) )

1
msg/templates/urtps/microRTPS_transport.h
View File

@@ -32,7 +32,6 @@
#pragma once #pragma once
#include <string>
#include <cstring> #include <cstring>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <poll.h> #include <poll.h>