Merge branch 'release/1.10.0' into release/1.10.0_back_to_develop

autowarefoundation · Jan 18, 2019 · 64a2bdf · 64a2bdf
2 parents a94a61b + 5c46036
commit 64a2bdf
Show file tree

Hide file tree

Showing 106 changed files with 123 additions and 183 deletions.
diff --git a/README.md b/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
 

diff --git a/docker/generic/Dockerfile.kinetic b/docker/generic/Dockerfile.kinetic
@@ -3,41 +3,22 @@ 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,25 +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
-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
@@ -87,42 +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
-ENV AW_PATH /home/$USERNAME/Autoware 
-RUN cd && mkdir $AW_PATH
-COPY --chown=autoware ./ $AW_PATH
-
-# Use catkin_make_release for now until we migrate entirely to colcon
-
-RUN cd $AW_PATH/ros/src \ 
-	&& git submodule update --init --recursive \
-	&& rm -rf CMakeLists.txt
-
-RUN cd $AW_PATH/ros \
-	&& rm -rf devel/ build/
-
-RUN /bin/bash -c 'source /opt/ros/kinetic/setup.bash; rosdep install -y --from-paths $AW_PATH/ros/src --ignore-src --rosdistro kinetic'
-
-RUN /bin/bash -c 'source /opt/ros/kinetic/setup.bash; cd $AW_PATH/ros; catkin_make -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs'
-
-#RUN /bin/bash -c 'source /opt/ros/kinetic/setup.bash; cd /home/$USERNAME/Autoware/ros/src; git submodule update --init --recursive; rm -rf CMakeLists.txt; catkin_init_workspace; cd ../; rm -rf devel/ build/; rosdep install -y --from-paths src --ignore-src --rosdistro kinetic; catkin_make'
-
+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; 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
@@ -138,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"]
diff --git a/ros/src/actuation/vehicles/packages/as/package.xml b/ros/src/actuation/vehicles/packages/as/package.xml
@@ -4,7 +4,7 @@
   <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>
 

diff --git a/ros/src/actuation/vehicles/packages/ymc/package.xml b/ros/src/actuation/vehicles/packages/ymc/package.xml
@@ -4,7 +4,7 @@
   <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>
 

diff --git a/ros/src/common/cmake/autoware_build_flags/package.xml b/ros/src/common/cmake/autoware_build_flags/package.xml
@@ -7,7 +7,7 @@
   <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>
 

diff --git a/ros/src/common/libs/amathutils_lib/package.xml b/ros/src/common/libs/amathutils_lib/package.xml
@@ -4,7 +4,7 @@
   <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>

diff --git a/ros/src/common/libs/diagnostics_lib/diag_lib/package.xml b/ros/src/common/libs/diagnostics_lib/diag_lib/package.xml
@@ -5,7 +5,7 @@
 
   <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>
 

diff --git a/ros/src/common/libs/diagnostics_lib/diag_msgs/package.xml b/ros/src/common/libs/diagnostics_lib/diag_msgs/package.xml
@@ -4,7 +4,7 @@
   <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>

diff --git a/ros/src/common/libs/diagnostics_lib/fake_autoware_nodes/package.xml b/ros/src/common/libs/diagnostics_lib/fake_autoware_nodes/package.xml
@@ -5,7 +5,7 @@
 
   <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>
 

diff --git a/ros/src/common/libs/state_machine_lib/package.xml b/ros/src/common/libs/state_machine_lib/package.xml
@@ -5,7 +5,7 @@
   <description>The libstate 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>

diff --git a/ros/src/common/libvectormap/package.xml b/ros/src/common/libvectormap/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>Common Library to Read Vector Map</description>
     <maintainer email="sujiwo@ertl.jp">sujiwo</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/ros/src/computing/perception/detection/fusion_tools/packages/pixel_cloud_fusion/package.xml b/ros/src/computing/perception/detection/fusion_tools/packages/pixel_cloud_fusion/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>Pixel/Point Cloud fusion node</description>
     <maintainer email="abraham.monrroy@tier4.jp">Abraham Monrroy</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/ros/src/computing/perception/detection/fusion_tools/packages/range_vision_fusion/package.xml b/ros/src/computing/perception/detection/fusion_tools/packages/range_vision_fusion/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>Range-Vision fusion node</description>
     <maintainer email="abraham.monrroy@tier4.jp">Abraham Monrroy</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/...g/perception/detection/lidar_detector/packages/lidar_euclidean_cluster_detect/package.xml b/...g/perception/detection/lidar_detector/packages/lidar_euclidean_cluster_detect/package.xml
@@ -5,7 +5,7 @@
     <description>The lidar_euclidean_cluster_detect package</description>
 
     <maintainer email="abrahammonrroy@yahoo.com">amc</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
 
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/.../computing/perception/detection/lidar_detector/packages/lidar_fake_perception/package.xml b/.../computing/perception/detection/lidar_detector/packages/lidar_fake_perception/package.xml
@@ -6,7 +6,7 @@
 
   <maintainer email="aohsato@gmail.com">Akihito Ohsato</maintainer>
 
-  <license>BSD</license>
+  <license>Apache 2</license>
 
   <author email="aohsato@gmail.com">Akihito Ohsato</author>
 

diff --git a/...uting/perception/detection/lidar_detector/packages/lidar_naive_l_shape_detect/package.xml b/...uting/perception/detection/lidar_detector/packages/lidar_naive_l_shape_detect/package.xml
@@ -5,7 +5,7 @@
     <description>lidar_naive_l_shape_detect package</description>
 
     <maintainer email="cirpue49@yahoo.co.jp">Kosuke Murakami</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
 
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/...computing/perception/detection/lidar_tracker/packages/lidar_imm_ukf_pda_track/package.xml b/...computing/perception/detection/lidar_tracker/packages/lidar_imm_ukf_pda_track/package.xml
@@ -5,7 +5,7 @@
   <description>imm_ukf_pda_track package</description>
 
   <maintainer email="cirpue49@yahoo.co.jp">Kosuke Murakami</maintainer>
-  <license>BSD</license>
+  <license>Apache 2</license>
 
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/.../computing/perception/detection/lidar_tracker/packages/lidar_kf_contour_track/package.xml b/.../computing/perception/detection/lidar_tracker/packages/lidar_kf_contour_track/package.xml
@@ -5,7 +5,7 @@
     <description>lidar_kf_contour_track package</description>
 
     <maintainer email="abrahammonrroy@yahoo.com">amc</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
 
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/ros/src/computing/perception/detection/trafficlight_recognizer/package.xml b/ros/src/computing/perception/detection/trafficlight_recognizer/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>The trafficlight_recognizer package</description>
     <maintainer email="hirabayashi@ertl.jp">Manato HIRABAYASHI</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
     <build_depend>cmake_modules</build_depend>

diff --git a/ros/src/computing/perception/detection/vision_detector/libs/dpm_ttic/package.xml b/ros/src/computing/perception/detection/vision_detector/libs/dpm_ttic/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>The dpm_ttic package</description>
     <maintainer email="syoshida@axe.bz">Syohei YOSHIDA</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/...computing/perception/detection/vision_detector/packages/vision_darknet_detect/package.xml b/...computing/perception/detection/vision_detector/packages/vision_darknet_detect/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>darknet image detector</description>
     <maintainer email="abrahammonrroy@yahoo.com">Abraham Monrroy</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/...omputing/perception/detection/vision_detector/packages/vision_dpm_ttic_detect/package.xml b/...omputing/perception/detection/vision_detector/packages/vision_dpm_ttic_detect/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>The vision_dpm_ttic_detect package</description>
     <maintainer email="abrahammonrroy@yahoo.com">amc</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
 
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/...rc/computing/perception/detection/vision_detector/packages/vision_lane_detect/package.xml b/...rc/computing/perception/detection/vision_detector/packages/vision_lane_detect/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>The vision_lane_detect package</description>
     <maintainer email="syoshida@axe.bz">Syoeh YOSHIDA</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
 
     <build_depend>roscpp</build_depend>

diff --git a/...ting/perception/detection/vision_detector/packages/vision_segment_enet_detect/package.xml b/...ting/perception/detection/vision_detector/packages/vision_segment_enet_detect/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>Image Segmentation</description>
     <maintainer email="abrahammonrroy@yahoo.com">Abraham Monrroy</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/...src/computing/perception/detection/vision_detector/packages/vision_ssd_detect/package.xml b/...src/computing/perception/detection/vision_detector/packages/vision_ssd_detect/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>The vision_ssd_detect package</description>
     <maintainer email="abrahammonrroy@yahoo.com">amc</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
 
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/...rc/computing/perception/detection/vision_tracker/packages/vision_beyond_track/package.xml b/...rc/computing/perception/detection/vision_tracker/packages/vision_beyond_track/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>object tracker based on beyond pixel</description>
     <maintainer email="yukitsuji020832@gmail.com">Yuki Tsuji</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>
 

diff --git a/ros/src/computing/perception/detection/visualizers/packages/integrated_viewer/package.xml b/ros/src/computing/perception/detection/visualizers/packages/integrated_viewer/package.xml
@@ -6,7 +6,7 @@
 
     <maintainer email="hirabayashi@ertl.jp">hirabayashi</maintainer>
 
-    <license>BSD</license>
+    <license>Apache 2</license>
 
     <buildtool_depend>catkin</buildtool_depend>
     <buildtool_depend>autoware_build_flags</buildtool_depend>

diff --git a/ros/src/computing/perception/localization/lib/gnss/package.xml b/ros/src/computing/perception/localization/lib/gnss/package.xml
@@ -4,7 +4,7 @@
     <version>1.10.0</version>
     <description>The gnss package</description>
     <maintainer email="tomo@axe.bz">Tomomi HORII</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
 
     <build_depend>roscpp</build_depend>

diff --git a/ros/src/computing/perception/localization/lib/ndt_cpu/package.xml b/ros/src/computing/perception/localization/lib/ndt_cpu/package.xml
@@ -5,7 +5,7 @@
     <description>The ndt_cpu package</description>
     <maintainer email="yuki@ertl.jp">Yuki Kitsukawa</maintainer>
     <maintainer email="anh@ertl.jp">Anh Viet Nguyen</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
 
     <build_depend>libpcl-all-dev</build_depend>

diff --git a/ros/src/computing/perception/localization/lib/ndt_gpu/package.xml b/ros/src/computing/perception/localization/lib/ndt_gpu/package.xml
@@ -5,7 +5,7 @@
     <description>The ndt_gpu package</description>
     <maintainer email="yuki@ertl.jp">Yuki Kitsukawa</maintainer>
     <maintainer email="anh@ertl.jp">Anh Viet Nguyen</maintainer>
-    <license>BSD</license>
+    <license>Apache 2</license>
     <buildtool_depend>catkin</buildtool_depend>
 
     <build_depend>libpcl-all-dev</build_depend>