Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msg: remove gencpp and genmsg submodules; remove gencpp imports #13572

Merged
merged 31 commits into from
Jan 13, 2020
Merged

msg: remove gencpp and genmsg submodules; remove gencpp imports #13572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f03c938
msg: remove gencpp and genmsh submodules; remove gencpp imports
TSC21 Nov 22, 2019
e62e175
bump Docker container tags to 2019-11-22
TSC21 Nov 23, 2019
8ff5046
Use Python 3 everywhere
julianoes Aug 26, 2019
7adff20
msg: generation and parsing scripts: add Python3 support
TSC21 Nov 23, 2019
61500bf
px_generate_uorb_topic_files.py: update import error recommendation m…
TSC21 Nov 25, 2019
b9b0aa1
bump Docker container tags to 2019-11-25
TSC21 Nov 29, 2019
ff880dc
appveyor: switch to toolchain version 0.8
MaEtUgR Nov 29, 2019
797736e
Jenkins: updated all docker tags
julianoes Dec 18, 2019
88a570e
Jenkins: update all docker tags
julianoes Dec 19, 2019
676d2e0
Tools: update sitl_gazebo submodule
julianoes Dec 24, 2019
f9756b7
fix rebase issue
TSC21 Jan 5, 2020
1c68ef5
workflows: update docker tag
julianoes Jan 6, 2020
473ccf8
Jenkins: bump docker tags
julianoes Jan 10, 2020
374ad73
circleci: update to latest docker tag
julianoes Jan 10, 2020
8f805ef
mission_test: let's try to run this with Python 3
julianoes Jan 10, 2020
22ce22a
Tools: use Python 3 in validate_yaml.py
julianoes Jan 10, 2020
5c79a94
Tools: use Python3 for upload_log.py
julianoes Jan 10, 2020
a9235a9
if building with catkin, don't specifically look for Python 3
TSC21 Jan 10, 2020
245961b
CI: update all docker tags
julianoes Jan 13, 2020
ac9fde1
Update Snapdragon docker tag
julianoes Jan 13, 2020
db928b5
beaglebone: treat robotcontrol as system include
julianoes Jan 13, 2020
aadc744
rostests: add PYTHONPATH export path so to find Python 2 packages
TSC21 Jan 13, 2020
74a8d95
Jenkins: update snapdragon container tag
TSC21 Jan 13, 2020
8cde9f3
run mission_test over python2
TSC21 Jan 13, 2020
8608c48
don't specifically export PYTHONPATH
TSC21 Jan 13, 2020
e1b239b
Jenkins: export PYTHONPATH before Catkin build
TSC21 Jan 13, 2020
bcf557d
update submodule sitl_gazebo
TSC21 Jan 13, 2020
413d3b9
px4modulesdoc: move to Python3
TSC21 Jan 13, 2020
877b158
mission_test: fix px4tools func import
TSC21 Jan 13, 2020
59b0c75
Jenkins: reactivate ROS2-related deployment
TSC21 Jan 13, 2020
2478e47
Merge branch 'master' into cleanup/remove_genmsg_gencpp_submodules
TSC21 Jan 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile-SITL_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
stage('Build') {
agent {
docker {
image 'px4io/px4-dev-ros-melodic:2019-10-24'
image 'px4io/px4-dev-ros-melodic:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -130,7 +130,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-melodic:2020-01-13").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
def test_ok = true
Expand Down
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile-SITL_tests_ASan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
stage('Build') {
agent {
docker {
image 'px4io/px4-dev-ros-melodic:2019-10-24'
image 'px4io/px4-dev-ros-melodic:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -131,7 +131,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-melodic:2020-01-13").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
def test_ok = true
Expand Down
6 changes: 3 additions & 3 deletions .ci/Jenkinsfile-SITL_tests_coverage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pipeline {
stage('code coverage (python)') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-10-24'
image 'px4io/px4-dev-base-bionic:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -99,7 +99,7 @@ pipeline {
stage('unit tests') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-10-24'
image 'px4io/px4-dev-base-bionic:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-melodic:2020-01-13").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def test_ok = true
sh('export')
Expand Down
12 changes: 6 additions & 6 deletions .ci/Jenkinsfile-compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
armhf: "px4io/px4-dev-armhf:2019-10-24",
base: "px4io/px4-dev-base-bionic:2019-10-24",
nuttx: "px4io/px4-dev-nuttx:2019-10-24",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
armhf: "px4io/px4-dev-armhf:2020-01-13",
base: "px4io/px4-dev-base-bionic:2020-01-13",
nuttx: "px4io/px4-dev-nuttx:2020-01-13",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-01-13"
]

def armhf_builds = [
Expand Down Expand Up @@ -70,7 +70,7 @@ pipeline {
// TODO: actually upload artifacts to S3
// stage('S3 Upload') {
// agent {
// docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
// docker { image 'px4io/px4-dev-base-bionic:2020-01-13' }
// }
// options {
// skipDefaultCheckout()
Expand Down Expand Up @@ -104,7 +104,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) {

// TODO: fix the snapdragon image
bypass_entrypoint = ''
if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2018-09-12') {
if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-01-13') {
bypass_entrypoint = ' --entrypoint=""'
}

Expand Down
18 changes: 9 additions & 9 deletions .ci/Jenkinsfile-hardware
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pipeline {
stage("build px4_fmu-v2_test") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -76,7 +76,7 @@ pipeline {
stage("build px4_fmu-v3_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -149,7 +149,7 @@ pipeline {
stage("build px4_fmu-v4_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -222,7 +222,7 @@ pipeline {
stage("build px4_fmu-v4pro_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -295,7 +295,7 @@ pipeline {
stage("build px4_fmu-v5_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -368,7 +368,7 @@ pipeline {
stage("build modalai_fc-v1_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -441,7 +441,7 @@ pipeline {
stage("build holybro_durandal-v1_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -515,7 +515,7 @@ pipeline {
stage("build holybro_durandal-v1_stackcheck") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -602,7 +602,7 @@ pipeline {
stage("build nxp_fmuk66-v3_default") {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-10-24'
image 'px4io/px4-dev-nuttx:2020-01-13'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: px4io/px4-dev-nuttx:2019-10-24
- image: px4io/px4-dev-nuttx:2020-01-13
steps:
- checkout
- run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
container: px4io/px4-dev-base-bionic:2019-10-24
container: px4io/px4-dev-base-bionic:2020-01-13
steps:
- uses: actions/checkout@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
container: px4io/px4-dev-base-bionic:2019-10-24
container: px4io/px4-dev-base-bionic:2020-01-13
steps:
- uses: actions/checkout@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_nuttx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx:2019-10-24
container: px4io/px4-dev-nuttx:2020-01-13
strategy:
matrix:
config: [
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/sitl_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
container: px4io/px4-dev-simulation-bionic:2019-12-18
container: px4io/px4-dev-simulation-bionic:2020-01-13
steps:
- uses: actions/checkout@v1
with:
token: ${{ secrets.ACCESS_TOKEN }}
- name: Set Python 3 as default
run: update-alternatives --install /usr/bin/python python /usr/bin/python3 10
- name: Install psutil
run: pip3 install psutil
- name: Build PX4 in SITL integration test mode
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/sitl_tests_coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
container: px4io/px4-dev-simulation-bionic:2019-12-18
container: px4io/px4-dev-simulation-bionic:2020-01-13
steps:
- uses: actions/checkout@v1
with:
token: ${{ secrets.ACCESS_TOKEN }}
- name: Set Python 3 as default
run: update-alternatives --install /usr/bin/python python /usr/bin/python3 10
- name: Install psutil
run: pip3 install psutil
# TODO: disabled 2019-01-09 due to failures
Expand Down
8 changes: 0 additions & 8 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
path = src/drivers/uavcan/libuavcan
url = https://github.com/PX4/uavcan.git
branch = px4
[submodule "msg/tools/genmsg"]
path = msg/tools/genmsg
url = https://github.com/PX4/genmsg.git
branch = px4
[submodule "msg/tools/gencpp"]
path = msg/tools/gencpp
url = https://github.com/PX4/gencpp.git
branch = px4
[submodule "Tools/jMAVSim"]
path = Tools/jMAVSim
url = https://github.com/PX4/jMAVSim.git
Expand Down
8 changes: 7 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,14 @@ if (CATKIN_DEVEL_PREFIX)
endif()

# python
# If using catkin, Python 2 is found since it points
# to the Python libs installed with the ROS distro
include(px4_find_python_module)
find_package(PythonInterp REQUIRED)
if (NOT CATKIN_DEVEL_PREFIX)
find_package(PythonInterp 3 REQUIRED)
else()
find_package(PythonInterp REQUIRED)
endif()

option(PYTHON_COVERAGE "Python code coverage" OFF)
if(PYTHON_COVERAGE)
Expand Down
Loading