Skip to content

Commit 20019a1

Browse files
committed
Removed redundant files and dependencies
1 parent 36f934e commit 20019a1

File tree

6 files changed

+5
-219
lines changed

6 files changed

+5
-219
lines changed

simulator/carla_autoware/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ find_package(autoware_cmake REQUIRED)
55
autoware_package()
66

77
find_package(
8-
catkin REQUIRED COMPONENTS rospy std_msgs
9-
carla_msgs)
8+
catkin REQUIRED COMPONENTS std_msgs)
109

1110

1211
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1312
add_compile_options(-Wall -Wextra -Wpedantic)
1413
endif()
1514

16-
ament_export_dependencies(rclpy rospy)
15+
ament_export_dependencies(rclpy)
1716

1817
find_package(ros_environment REQUIRED)
1918
set(ROS_VERSION $ENV{ROS_VERSION})

simulator/carla_autoware/LICENSE

-201
This file was deleted.

simulator/carla_autoware/package.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33
<name>carla_autoware</name>
44
<version>0.0.0</version>
55
<description>The carla autoware bridge package</description>
6-
<maintainer email="mradityagio@gmail.com">Muhammad Raditya Giovanni</maintainer>
6+
<maintainer email="mradityagio@gmail.com">Muhammad Raditya GIOVANNI</maintainer>
77
<maintainer email="maxime.clement@tier4.jp">Maxime CLEMENT</maintainer>
88
<license>Apache License 2.0</license>
99

10-
<exec_depend>ros2launch</exec_depend>
11-
<exec_depend>ros_compatibility</exec_depend>
1210
<exec_depend>std_msgs</exec_depend>
1311
<depend>autoware_auto_control_msgs</depend>
1412
<depend>autoware_auto_vehicle_msgs</depend>
15-
<depend>carla_msgs</depend>
1613
<depend>geometry_msgs</depend>
17-
<depend>nav_msgs</depend>
1814
<depend>rclpy</depend>
1915
<depend>sensor_msgs</depend>
2016
<depend>sensor_msgs_py</depend>

simulator/carla_autoware/resource/carla_autoware

Whitespace-only changes.

simulator/carla_autoware/setup.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
version="0.0.0",
1313
packages=[package_name],
1414
data_files=[
15-
("share/ament_index/resource_index/packages", ["resource/" + package_name]),
1615
("share/" + package_name, glob("config/objects.json")),
1716
("share/" + package_name, ["package.xml"]),
1817
(os.path.join("share", package_name), glob("launch/carla_autoware.launch.xml")),
1918
],
2019
install_requires=["setuptools"],
2120
zip_safe=True,
22-
maintainer="mradityagio",
23-
maintainer_email="mradityagio@gmail.com",
21+
maintainer="Muhammad Raditya GIOVANNI, Maxime CLEMENT",
22+
maintainer_email="mradityagio@gmail.com, maxime.clement@tier4.jp",
2423
description="CARLA ROS2 bridge for AUTOWARE",
2524
license="Apache License 2.0",
2625
tests_require=["pytest"],

simulator/carla_autoware/src/carla_autoware/modules/carla_data_provider.py

-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.sr/bin/env python
1414

15-
##############################################################
16-
# Copyright (c) 2018-2020 Intel Corporation
17-
#
18-
# This work is licensed under the terms of the MIT license.
19-
# For a copy, see <https://opensource.org/licenses/MIT>.
20-
##############################################################
21-
2215
"""Modified CARLA Data Provider from CARLA scenario runner."""
2316

2417
from __future__ import print_function

0 commit comments

Comments
 (0)