Merge branch 'melodic-devel' into seanyen/windows

ros-perception · Sep 30, 2021 · 25e662f · 25e662f
2 parents f00ea1f + ee1e33b
commit 25e662f
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 52 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,49 @@
+
+# this is .traivs.yml written by -
+
+# https://github.com/ros-infrastructure/ros_buildfarm/blob/master/doc/jobs/devel_jobs.rst
+# https://github.com/ros-infrastructure/ros_buildfarm/blob/master/doc/jobs/prerelease_jobs.rst
+# while this doesn't require sudo we don't want to run within a Docker container
+sudo: true
+dist: trusty
+language: python
+python:
+  - "3.6"
+env:
+  global:
+    - JOB_PATH=/tmp/devel_job
+    - ABORT_ON_TEST_FAILURE=1
+  matrix:
+    - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
+    - ROS_DISTRO_NAME=melodic OS_NAME=ubuntu OS_CODE_NAME=bionic ARCH=amd64
+    - ROS_DISTRO_NAME=noetic  OS_NAME=ubuntu OS_CODE_NAME=focal  ARCH=amd64
+#   matrix:
+#     allow_failures:
+#       - env: ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
+install:
+  # either install the latest released version of ros_buildfarm
+  # - pip install ros_buildfarm
+  # or checkout a specific branch
+  #- git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
+  # use rosdep_update_options (https://github.com/ros-infrastructure/ros_buildfarm/pull/890)
+  - git clone -b fix_674 https://github.com/k-okada/ros_buildfarm /tmp/ros_buildfarm
+  - pip install /tmp/ros_buildfarm
+  # checkout catkin for catkin_test_results script
+  - git clone https://github.com/ros/catkin /tmp/catkin
+  # run devel job for a ROS repository with the same name as this repo
+  - export REPOSITORY_NAME=`basename $TRAVIS_BUILD_DIR`
+  # use the code already checked out by Travis
+  - mkdir -p $JOB_PATH/ws/src
+  - cp -R $TRAVIS_BUILD_DIR $JOB_PATH/ws/src/
+  # download slam_gmapping to run rostest
+  - git clone https://github.com/ros-perception/slam_gmapping $JOB_PATH/ws/src/slam_gmapping
+  # generate the script to run a pre-release job for that target and repo
+  - generate_prerelease_script.py https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH  --output-dir $JOB_PATH --custom-rosdep-update-options=--include-eol-distros
+  # run the actual job which involves Docker
+  - cd $JOB_PATH; sh ./prerelease.sh -y
+script:
+  # get summary of test results
+  - /tmp/catkin/bin/catkin_test_results $JOB_PATH/ws/test_results --all
+notifications:
+  email: false
+
diff --git a/carmenwrapper/carmenwrapper.cpp b/carmenwrapper/carmenwrapper.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/configfile/configfile.cpp b/configfile/configfile.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/configfile/configfile_test.cpp b/configfile/configfile_test.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/gfs-carmen/gfs-carmen.cpp b/gfs-carmen/gfs-carmen.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/gui/gfs_logplayer.cpp b/gui/gfs_logplayer.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/gui/gfs_nogui.cpp b/gui/gfs_nogui.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 
@@ -30,8 +29,8 @@ using namespace GMapping;
 
 int  main (int argc, char ** argv){
   cerr << "GMAPPING copyright 2004 by Giorgio Grisetti, Cyrill Stachniss," << endl ;
-  cerr << "and Wolfram Burgard. To be published under the CreativeCommons license," << endl ;
-  cerr << "see: http://creativecommons.org/licenses/by-nc-sa/2.0/" << endl << endl;
+  cerr << "and Wolfram Burgard. Published under the 3-Clause BSD License," << endl ;
+  cerr << "see: https://opensource.org/licenses/BSD-3-Clause" << endl << endl;
 
 
 	GridSlamProcessorThread* gsp=  new GridSlamProcessorThread;

diff --git a/gui/gfs_simplegui.cpp b/gui/gfs_simplegui.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 
@@ -70,8 +69,8 @@ class GFSMainWindow: public QMainWindow{
 
 int  main (int argc, char ** argv){
   cerr << "GMAPPING copyright 2004 by Giorgio Grisetti, Cyrill Stachniss," << endl ;
-  cerr << "and Wolfram Burgard. To be published under the CreativeCommons license," << endl;
-  cerr << "see: http://creativecommons.org/licenses/by-nc-sa/2.0/" << endl << endl;
+  cerr << "and Wolfram Burgard. Published under the 3-Clause BSD License," << endl;
+  cerr << "see: https://opensource.org/licenses/BSD-3-Clause" << endl << endl;
 
 
   GridSlamProcessorThread* gsp=  new GridSlamProcessorThread;

diff --git a/gui/gsp_thread.cpp b/gui/gsp_thread.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/gui/qgraphpainter.cpp b/gui/qgraphpainter.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/gui/qparticleviewer.cpp b/gui/qparticleviewer.cpp
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/include/gmapping/carmenwrapper/carmenwrapper.h b/include/gmapping/carmenwrapper/carmenwrapper.h
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/include/gmapping/configfile/configfile.h b/include/gmapping/configfile/configfile.h
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/include/gmapping/gui/gsp_thread.h b/include/gmapping/gui/gsp_thread.h
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/include/gmapping/gui/qgraphpainter.h b/include/gmapping/gui/qgraphpainter.h
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/include/gmapping/gui/qparticleviewer.h b/include/gmapping/gui/qparticleviewer.h
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied 

diff --git a/include/gmapping/utils/commandline.h b/include/gmapping/utils/commandline.h
@@ -5,13 +5,12 @@
  * GMAPPING Copyright (c) 2004 Giorgio Grisetti, 
  * Cyrill Stachniss, and Wolfram Burgard
  *
- * This software is licensed under the "Creative Commons 
- * License (Attribution-NonCommercial-ShareAlike 2.0)" 
+ * This software is licensed under the 3-Clause BSD License
  * and is copyrighted by Giorgio Grisetti, Cyrill Stachniss, 
  * and Wolfram Burgard.
  * 
  * Further information on this license can be found at:
- * http://creativecommons.org/licenses/by-nc-sa/2.0/
+ * https://opensource.org/licenses/BSD-3-Clause
  * 
  * GMAPPING is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied