[Release] 1.10.0 merged back to develop

README.md

@@ -69,7 +69,7 @@ You may create 3D map data through Tier IV's [Map Tools](https://maptools.tier4.
 
 ## License
 
-Autoware is provided under the [New BSD License](https://github.com/CPFL/Autoware/blob/master/LICENSE).
+Autoware is provided under the [Apache 2 License](https://github.com/CPFL/Autoware/blob/master/LICENSE).
 
 ## Contact
 

docker/generic/Dockerfile.kinetic

@@ -1,43 +1,24 @@
-FROM nvidia/cuda:8.0-devel-ubuntu16.04
+FROM nvidia/cuda:9.0-devel-ubuntu16.04
 MAINTAINER Yuki Iida <yuki.iida@tier4.jp>
 
 # Develop
 RUN apt-get update && apt-get install -y \
-        cmake \
-        cmake-curses-gui \
-        curl \
-        git \
+        software-properties-common \
+        wget curl git cmake cmake-curses-gui \
         libboost-all-dev \
-        libeigen3-dev \
         libflann-dev \
-        libgoogle-perftools-dev \
         libgsl0-dev \
-        software-properties-common \
-        wget
+        libgoogle-perftools-dev \
+        libeigen3-dev
 
 # Intall some basic GUI and sound libs
 RUN apt-get update && apt-get install -y \
-        dbus-x11 \
-        dmz-cursor-theme \
-        file \
-        fonts-dejavu \
-        fonts-liberation \
-        hicolor-icon-theme \
-        language-pack-en \
-        libasound2 \
-        libcanberra-gtk-module \
-        libcanberra-gtk3-0 \
-        libcanberra-gtk3-module \
-        libdbus-glib-1-2 \
-        libexif12 \
-        libgl1-mesa-dri \
-        libgl1-mesa-glx \
-        libgtk2.0-0 \
-        libxt6 \
-        locales \
-        pulseaudio \
-        xz-utils
-RUN update-locale LANG=en_US.UTF-8 LC_MESSAGES=POSIX
+        xz-utils file locales dbus-x11 pulseaudio dmz-cursor-theme \
+        fonts-dejavu fonts-liberation hicolor-icon-theme \
+        libcanberra-gtk3-0 libcanberra-gtk-module libcanberra-gtk3-module \
+        libasound2 libgtk2.0-0 libdbus-glib-1-2 libxt6 libexif12 \
+        libgl1-mesa-glx libgl1-mesa-dri language-pack-en \
+        && update-locale LANG=en_US.UTF-8 LC_MESSAGES=POSIX
 
 # Intall some basic GUI tools
 RUN apt-get update && apt-get install -y \
@@ -47,38 +28,9 @@ RUN apt-get update && apt-get install -y \
 # Intall ROS
 RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
 RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
-RUN apt-get update && apt-get install -y \
-        ros-kinetic-desktop-full \
-        ros-kinetic-gps-common \
-        ros-kinetic-grid-map \
-        ros-kinetic-jsk-visualization \
-        ros-kinetic-nmea-msgs \
-        ros-kinetic-nmea-navsat-driver \
-        ros-kinetic-sound-play
-RUN apt-get update && apt-get install -y \
-        ros-kinetic-automotive-platform-msgs \
-        ros-kinetic-controller-manager \
-        ros-kinetic-gazebo-ros-control \
-        ros-kinetic-joystick-drivers \
-        ros-kinetic-ros-control \
-        ros-kinetic-ros-controllers
-RUN apt-get update && apt-get install -y \
-        freeglut3-dev \
-        gksu \
-        libarmadillo-dev \
-        libgl1-mesa-dev \
-        libglew-dev \
-        libmosquitto-dev \
-        libnlopt-dev \
-        libpcap-dev \
-        libqt5opengl5-dev \
-        libssh2-1-dev \
-        libyaml-cpp-dev \
-        python-flask \
-        python-requests \
-        python-wxgtk3.0 \
-        qtbase5-dev \
-        software-properties-common
+RUN apt-get update && apt-get install -y ros-kinetic-desktop-full ros-kinetic-nmea-msgs ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play ros-kinetic-jsk-visualization ros-kinetic-grid-map ros-kinetic-gps-common
+RUN apt-get update && apt-get install -y ros-kinetic-controller-manager ros-kinetic-ros-control ros-kinetic-ros-controllers ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers
+RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests
 
 # Add basic user
 ENV USERNAME autoware
@@ -100,26 +52,17 @@ RUN echo "source /opt/ros/kinetic/setup.bash" >> /home/$USERNAME/.bashrc && \
         # cd to home on login
         echo "cd" >> /home/$USERNAME/.bashrc
 
-# Install colcon
-RUN apt-get install -y python3-pip python3-setuptools
-RUN pip3 install -U setuptools
-RUN apt-get install -y python3-colcon-common-extensions
-
 # Change user
 USER autoware
 
 RUN sudo rosdep init \
         && rosdep update \
         && echo "source /opt/ros/kinetic/setup.bash" >> ~/.bashrc
 
-# Setting
-RUN sudo ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1
-ENV LD_LIBRARY_PATH="/usr/local/cuda/lib64/stubs/:$LD_LIBRARY_PATH"
-
 # Install Autoware
 RUN cd && mkdir /home/$USERNAME/Autoware
 COPY --chown=autoware ./ /home/$USERNAME/Autoware/
-RUN /bin/bash -c 'source /opt/ros/kinetic/setup.bash; cd /home/$USERNAME/Autoware/ros/src; git submodule update --init --recursive; cd ../; ./colcon_release'
+RUN /bin/bash -c 'source /opt/ros/kinetic/setup.bash; cd /home/$USERNAME/Autoware/ros/src; git submodule update --init --recursive; catkin_init_workspace; cd ../; rosdep install -y --from-paths /home/$USERNAME/Autoware/ros/src --ignore-src --rosdistro kinetic; ./catkin_make_release'
 RUN echo "source /home/$USERNAME/Autoware/ros/devel/setup.bash" >> /home/$USERNAME/.bashrc
 
 # Setting
@@ -135,4 +78,4 @@ RUN gconftool-2 --set "/apps/gnome-terminal/profiles/Default/use_theme_colors" -
 RUN gconftool-2 --set "/apps/gnome-terminal/profiles/Default/background_color" --type string "#000000"
 
 # Default CMD
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]

ros/src/actuation/vehicles/packages/as/CHANGELOG.rst

@@ -2,6 +2,29 @@
 Changelog for package as
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+* Switch to Apache 2 license (develop branch) (`#1741 <https://github.com/kfunaoka/Autoware/issues/1741>`_)
+  * Switch to Apache 2
+  * Replace BSD-3 license header with Apache 2 and reassign copyright to the
+  Autoware Foundation.
+  * Update license on Python files
+  * Update copyright years
+  * Add #ifndef/define _POINTS_IMAGE_H\_
+  * Updated license comment
+* Use colcon as the build tool (`#1704 <https://github.com/kfunaoka/Autoware/issues/1704>`_)
+  * Switch to colcon as the build tool instead of catkin
+  * Added cmake-target
+  * Added note about the second colcon call
+  * Added warning about catkin* scripts being deprecated
+  * Fix COLCON_OPTS
+  * Added install targets
+  * Update Docker image tags
+  * Message packages fixes
+  * Fix missing dependency
+* Replace module_comm_msgs with automotive_platform_msgs
+* Contributors: Esteve Fernandez
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/actuation/vehicles/packages/as/package.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <package>
   <name>as</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>The pacmod interface package</description>
   <maintainer email="antm678@ertl.jp">T.Ando</maintainer>
-  <license>BSD</license>
+  <license>Apache 2</license>
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>autoware_build_flags</buildtool_depend>
 

ros/src/actuation/vehicles/packages/ymc/CHANGELOG.rst

@@ -2,6 +2,33 @@
 Changelog for package ymc
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+* Fixes for catkin_make
+* Switch to Apache 2 license (develop branch) (`#1741 <https://github.com/kfunaoka/Autoware/issues/1741>`_)
+  * Switch to Apache 2
+  * Replace BSD-3 license header with Apache 2 and reassign copyright to the
+  Autoware Foundation.
+  * Update license on Python files
+  * Update copyright years
+  * Add #ifndef/define _POINTS_IMAGE_H\_
+  * Updated license comment
+* Use colcon as the build tool (`#1704 <https://github.com/kfunaoka/Autoware/issues/1704>`_)
+  * Switch to colcon as the build tool instead of catkin
+  * Added cmake-target
+  * Added note about the second colcon call
+  * Added warning about catkin* scripts being deprecated
+  * Fix COLCON_OPTS
+  * Added install targets
+  * Update Docker image tags
+  * Message packages fixes
+  * Fix missing dependency
+* Add steering offset parameter
+* Add catkin dependency
+* Apply clang-format
+* Replace twist_cmd -> vehicle_cmd on ymc interface
+* Contributors: Akihito Ohsato, Esteve Fernandez, amc-nu
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt

@@ -12,6 +12,7 @@ find_package(
   roscpp
   geometry_msgs
   rosconsole
+  autoware_msgs
 )
 
 catkin_package(

ros/src/actuation/vehicles/packages/ymc/package.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <package>
   <name>ymc</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>The ymc package</description>
   <maintainer email="antm678@ertl.jp">T.Ando</maintainer>
-  <license>BSD</license>
+  <license>Apache 2</license>
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>autoware_build_flags</buildtool_depend>
 

ros/src/common/cmake/autoware_build_flags/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package autoware_build_flags
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/common/cmake/autoware_build_flags/package.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <package>
   <name>autoware_build_flags</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>Common build flags for Autoware.</description>
 
   <author email="esteve@apache.org">Esteve Fernandez</author>
   <maintainer email="esteve@apache.org">Esteve Fernandez</maintainer>
 
-  <license>BSD</license>
+  <license>Apache 2</license>
 
   <buildtool_depend>catkin</buildtool_depend>
 

ros/src/common/libs/amathutils_lib/CHANGELOG.rst

@@ -2,6 +2,22 @@
 Changelog for package amathutils
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+* Fixes for catkin_make
+* Use colcon as the build tool (`#1704 <https://github.com/kfunaoka/Autoware/issues/1704>`_)
+  * Switch to colcon as the build tool instead of catkin
+  * Added cmake-target
+  * Added note about the second colcon call
+  * Added warning about catkin* scripts being deprecated
+  * Fix COLCON_OPTS
+  * Added install targets
+  * Update Docker image tags
+  * Message packages fixes
+  * Fix missing dependency
+* Added missing function declaration to amathutils_lib.hpp
+* Contributors: Esteve Fernandez, Servando German, amc-nu
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/common/libs/amathutils_lib/CMakeLists.txt

@@ -6,6 +6,7 @@ find_package(autoware_build_flags REQUIRED)
 find_package(autoware_msgs REQUIRED)
 find_package(catkin REQUIRED COMPONENTS
         roscpp
+        autoware_msgs
         )
 
 set(CMAKE_CXX_FLAGS "-O2 -Wall ${CMAKE_CXX_FLAGS}")

ros/src/common/libs/amathutils_lib/package.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <package>
   <name>amathutils_lib</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>The libamathutils package</description>
   <maintainer email="yusuke.fujii@tier4.jp">Yusuke FUJII</maintainer>
-  <license>BSD</license>
+  <license>Apache 2</license>
   <author email="yusuke.fujii@tier4.jp">Yusuke FUJII</author>
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>autoware_build_flags</buildtool_depend>

ros/src/common/libs/diagnostics_lib/diag_lib/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package diag_lib
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/common/libs/diagnostics_lib/diag_lib/package.xml

@@ -1,11 +1,11 @@
 <package format="2">
   <name>diag_lib</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>The diag_lib package</description>
 
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
 
-  <license>BSD</license>
+  <license>Apache 2</license>
 
   <author email="masaya.kataoka@tier4.jp">Masaya Kataoka</author>
 

ros/src/common/libs/diagnostics_lib/diag_msgs/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package state
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/common/libs/diagnostics_lib/diag_msgs/package.xml

@@ -1,10 +1,10 @@
 <package>
   <name>diag_msgs</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>The libdiag package</description>
 
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
-  <license>BSD</license>
+  <license>Apache 2</license>
   <author email="yusuke.fujii@tier4.jp">Yusuke FUJII</author>
   <author email="masaya.kataoka@tier4.jp">Masaya Kataoka</author>
   <buildtool_depend>catkin</buildtool_depend>

ros/src/common/libs/diagnostics_lib/fake_autoware_nodes/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package fake_autoware_nodes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.10.0 (2019-01-17)
+-------------------
+
 1.9.1 (2018-11-06)
 ------------------
 

ros/src/common/libs/diagnostics_lib/fake_autoware_nodes/package.xml

@@ -1,11 +1,11 @@
 <package format="2">
   <name>fake_autoware_nodes</name>
-  <version>1.9.1</version>
+  <version>1.10.0</version>
   <description>The fake_autoware_nodes package</description>
 
   <maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
 
-  <license>BSD</license>
+  <license>Apache 2</license>
 
   <author email="masaya.kataoka@tier4.jp">Masaya Kataoka</author>