Added notes about Indigo being deprecated

MinXu · Nov 9, 2018 · 5db3b67 · 5db3b67
1 parent 9b2fbf0
commit 5db3b67
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 85 deletions.
diff --git a/docker/generic/README.md b/docker/generic/README.md
@@ -10,7 +10,7 @@ To use the Autoware Docker, first make sure the NVIDIA drivers, Docker and nvidi
 ```
 $ cd Autoware/docker/generic/
 
-# Ubuntu 14.04 (Indigo)
+# Ubuntu 14.04 (Indigo) ** Deprecated, use Kinetic instead **
 $ sh build.sh indigo
 
 # Ubuntu 16.04 (Kinetic)
@@ -19,7 +19,7 @@ $ sh build.sh kinetic
 
 ## How to Run
 ```
-# Ubuntu 14.04 (Indigo)
+# Ubuntu 14.04 (Indigo) ** Deprecated, use Kinetic instead **
 $ ./run.sh -t latest-indigo
 
 # Ubuntu 16.04 (Kinetic)

diff --git a/docker/generic/build.sh b/docker/generic/build.sh
@@ -1,10 +1,14 @@
 #!/bin/sh
 
 # Build Docker Image
-if [ "$1" = "kinetic" ] || [ "$1" = "indigo" ]
+if [ "$1" = "kinetic" ]
 then
     echo "Use $1"
     nvidia-docker build -t autoware-$1 -f Dockerfile.$1 ./../.. --no-cache
+elif [ "$1" = "indigo" ]
+then
+    echo "Indigo is deprecated and will be removed in a future release, please use Kinetic instead"
+    nvidia-docker build -t autoware-$1 -f Dockerfile.$1 ./../.. --no-cache
 else
     echo "Select distribution, kinetic|indigo"
 fi
diff --git a/ros/src/.config/quick_start/sample_lidar_camera/sensing.launch b/ros/src/.config/quick_start/sample_lidar_camera/sensing.launch
@@ -1,7 +1,7 @@
 <launch>
 
   <!-- calibration file path -->
-  <arg name="velodyne_calib" default="/opt/ros/indigo/share/velodyne_pointcloud/params/32db.yaml"/>
+  <arg name="velodyne_calib" default="/opt/ros/kinetic/share/velodyne_pointcloud/params/32db.yaml"/>
   <arg name="camera_calib" default="~/.autoware/data/calibration/camera_lidar_3d/prius/nic_150407.yml"/>
 
   <!-- HDL-32e -->

diff --git a/ros/src/.config/rviz/cmd.sh b/ros/src/.config/rviz/cmd.sh
@@ -28,8 +28,8 @@ else
   [ "$REMOTE_DISPLAY" = "-" ] && XOPT="-X"
 
   setsid ssh -tt $XOPT $KEYOPT $REMOTE <<EOF
-    [ -d /opt/ros/indigo ] && . /opt/ros/indigo/setup.bash
-    [ -d /opt/ros/jade ] && . /opt/ros/jade/setup.bash
+    [ -d /opt/ros/indigo ] && echo "Indigo is deprecated and will be removed in a future relase, please use Kinetic instead" && . /opt/ros/indigo/setup.bash
+    [ -d /opt/ros/kinetic ] && . /opt/ros/kinetic/setup.bash
     [ -d $DIR/../../../devel ] && . $DIR/../../../devel/setup.bash || \
       echo "$REMOTE:$DIR/../../../devel: no such directory"
     ROS_IP=\$(hostname -I)

diff --git a/...erception/detection/lidar_detector/packages/lidar_euclidean_cluster_detect/CMakeLists.txt b/...erception/detection/lidar_detector/packages/lidar_euclidean_cluster_detect/CMakeLists.txt
@@ -71,6 +71,7 @@ if (${CUDA_FOUND})
     message("Runtime: " ${CUDA_CUDART_LIBRARY})
     set(ROS_VERSION $ENV{ROS_DISTRO})
     if ("${ROS_VERSION}" MATCHES "(indigo)")
+        message(WARNING "Indigo is deprecated and will be removed in a future relase, please use Kinetic instead")
         set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-std=c++11)
     endif()
     target_compile_definitions(lidar_euclidean_cluster_detect PRIVATE

diff --git a/ros/src/sensing/drivers/gnss/packages/javad_navsat_driver/launch/javad_navsat.launch b/ros/src/sensing/drivers/gnss/packages/javad_navsat_driver/launch/javad_navsat.launch
@@ -1,5 +1,5 @@
 <!-- nmea_navsar_driver MUST be installed before -->
-<!-- sudo apt-get install ros-indigo-nmea-navsat-driver -->
+<!-- sudo apt-get install ros-kinetic-nmea-navsat-driver -->
 <!-- publishes fix, vel and time_reference -->
 <!-- For details: http://wiki.ros.org/nmea_navsat_driver-->
 <launch> 

diff --git a/ros/src/sensing/drivers/gnss/packages/nmea_navsat/scripts/README.md b/ros/src/sensing/drivers/gnss/packages/nmea_navsat/scripts/README.md
@@ -5,7 +5,7 @@ Serial port reader and parser for NMEA compatible GPS devices.
 ## Setup
 
 ```
-$ sudo apt-get install ros-indigo-nmea-navsat-driver
+$ sudo apt-get install ros-kinetic-nmea-navsat-driver
 ```
 
 ## ROS run

diff --git a/ros/src/sensing/drivers/gnss/packages/nmea_navsat/scripts/nmea_navsat.launch b/ros/src/sensing/drivers/gnss/packages/nmea_navsat/scripts/nmea_navsat.launch
@@ -1,5 +1,5 @@
 <!-- nmea_navsar_driver MUST be installed before -->
-<!-- sudo apt-get install ros-indigo-nmea-navsat-driver -->
+<!-- sudo apt-get install ros-kinetic-nmea-navsat-driver -->
 <!-- publishes fix, vel and time_reference -->
 <!-- For details: http://wiki.ros.org/nmea_navsat_driver-->
 <launch> 

diff --git a/ros/src/sensing/drivers/lidar/packages/sick/ldmrs/README.md b/ros/src/sensing/drivers/lidar/packages/sick/ldmrs/README.md
@@ -54,7 +54,7 @@ try any of the other scanners and run into trouble, please open an issue.
 Installation
 ------------
 
-In the following instructions, replace `<rosdistro>` with the name of your ROS distro (e.g., `indigo`).
+In the following instructions, replace `<rosdistro>` with the name of your ROS distro (e.g., `kinetic`).
 
 ### From binaries
 

diff --git a/ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt b/ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt
@@ -69,76 +69,70 @@ include_directories(
 )
 
 ## Declare a cpp library
-if ("${ROS_VERSION}" MATCHES "(indigo|jade|kinetic)")
-    add_library(calibrationtoolkit
-            CalibrationToolkit/calibrationtoolkit.cpp
-            CalibrationToolkit/calibrationtoolkit.h
-            CalibrationToolkit/selectionwidget.cpp
-            CalibrationToolkit/selectionwidget.h
-            )
-
-    target_link_libraries(calibrationtoolkit
-            ${catkin_LIBRARIES}
-            ${OpenCV_LIBS}
-            ${OPENGL_LIBRARIES}
-            ${GLUT_LIBRARY}
-            Qt5::Core
-            Qt5::Widgets
-            Qt5::OpenGL
-            nlopt
-            )
-
-endif ()
+add_library(calibrationtoolkit
+        CalibrationToolkit/calibrationtoolkit.cpp
+        CalibrationToolkit/calibrationtoolkit.h
+        CalibrationToolkit/selectionwidget.cpp
+        CalibrationToolkit/selectionwidget.h
+        )
+
+target_link_libraries(calibrationtoolkit
+        ${catkin_LIBRARIES}
+        ${OpenCV_LIBS}
+        ${OPENGL_LIBRARIES}
+        ${GLUT_LIBRARY}
+        Qt5::Core
+        Qt5::Widgets
+        Qt5::OpenGL
+        nlopt
+        )
 
 ## 2D
-if ("${ROS_VERSION}" MATCHES "(indigo|jade|kinetic)")
-    add_executable(calibration_test
-            nodes/calibration_test/chessboard.cpp
-            nodes/calibration_test/trans.cpp
-            nodes/calibration_test/scan_window.cpp
-            nodes/calibration_test/common_2d_calib.cpp
-            nodes/calibration_test/image_window.cpp
-            nodes/calibration_test/camera_lidar2d_offline_calib.cpp)
-
-    set(PARAM_YAML "${CMAKE_CURRENT_SOURCE_DIR}/param.yaml")
-    set(CAMERA_YAML "$ENV{HOME}/.ros/autoware/camera_lidar_2d.yaml")
-
-    set_target_properties(calibration_test
-            PROPERTIES COMPILE_FLAGS
-            "-DPARAM_YAML=${PARAM_YAML} -DCAMERA_YAML=${CAMERA_YAML}")
-
-    target_link_libraries(calibration_test
-            ${catkin_LIBRARIES} ${OpenCV_LIBS} xml2 ${OPENGL_LIBRARIES})
-endif ()
+add_executable(calibration_test
+        nodes/calibration_test/chessboard.cpp
+        nodes/calibration_test/trans.cpp
+        nodes/calibration_test/scan_window.cpp
+        nodes/calibration_test/common_2d_calib.cpp
+        nodes/calibration_test/image_window.cpp
+        nodes/calibration_test/camera_lidar2d_offline_calib.cpp)
+
+set(PARAM_YAML "${CMAKE_CURRENT_SOURCE_DIR}/param.yaml")
+set(CAMERA_YAML "$ENV{HOME}/.ros/autoware/camera_lidar_2d.yaml")
+
+set_target_properties(calibration_test
+        PROPERTIES COMPILE_FLAGS
+        "-DPARAM_YAML=${PARAM_YAML} -DCAMERA_YAML=${CAMERA_YAML}")
+
+target_link_libraries(calibration_test
+        ${catkin_LIBRARIES} ${OpenCV_LIBS} xml2 ${OPENGL_LIBRARIES})
+
 ## 3D
-if ("${ROS_VERSION}" MATCHES "(indigo|jade|kinetic)")
-
-    qt5_wrap_ui(calibration_toolkit_ui_mainwindow nodes/calibration_toolkit/mainwindow.ui)
-
-    add_executable(calibration_toolkit
-            nodes/calibration_toolkit/main.cpp
-            nodes/calibration_toolkit/mainwindow.cpp
-            nodes/calibration_toolkit/mainwindow.h
-            ${calibration_toolkit_ui_mainwindow}
-            )
-
-    set_target_properties(calibration_toolkit
-            PROPERTIES COMPILE_FLAGS "-fPIC"
-            )
-
-    ## Specify libraries to link a library or executable target against
-    target_link_libraries(calibration_toolkit
-            ${catkin_LIBRARIES}
-            ${OpenCV_LIBS}
-            calibrationtoolkit
-            ${GLUT_LIBRARIES}
-            ${OPENGL_LIBRARIES}
-            nlopt
-            Qt5::Core
-            Qt5::Widgets
-            Qt5::OpenGL
-            )
-endif ()
+qt5_wrap_ui(calibration_toolkit_ui_mainwindow nodes/calibration_toolkit/mainwindow.ui)
+
+add_executable(calibration_toolkit
+        nodes/calibration_toolkit/main.cpp
+        nodes/calibration_toolkit/mainwindow.cpp
+        nodes/calibration_toolkit/mainwindow.h
+        ${calibration_toolkit_ui_mainwindow}
+        )
+
+set_target_properties(calibration_toolkit
+        PROPERTIES COMPILE_FLAGS "-fPIC"
+        )
+
+## Specify libraries to link a library or executable target against
+target_link_libraries(calibration_toolkit
+        ${catkin_LIBRARIES}
+        ${OpenCV_LIBS}
+        calibrationtoolkit
+        ${GLUT_LIBRARIES}
+        ${OPENGL_LIBRARIES}
+        nlopt
+        Qt5::Core
+        Qt5::Widgets
+        Qt5::OpenGL
+        )
+
 # calibration_publisher
 add_executable(calibration_publisher
         nodes/calibration_publisher/calibration_publisher.cpp
@@ -152,13 +146,11 @@ target_link_libraries(calibration_publisher
         ${catkin_LIBRARIES}
         )
 
-if(TARGET calibration_toolkit)
-        install(TARGETS calibration_toolkit
-                ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-                LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-                RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-                )
-endif()
+install(TARGETS calibration_toolkit
+        ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+        )
 
 install(TARGETS calibration_publisher
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}

diff --git a/ros/src/system/gazebo/catvehicle/src/joy2cmdvel.py b/ros/src/system/gazebo/catvehicle/src/joy2cmdvel.py
@@ -30,7 +30,7 @@
 from sensor_msgs.msg import Joy
 import sys, getopt
 
-# requires the ros-indigo-joysticks
+# requires the ros-kinetic-joysticks
 
 class joy2cmdvel: