From 9d5a7185be3ff8e04691ff857e17cda0032f140b Mon Sep 17 00:00:00 2001 From: mraditya01 Date: Mon, 15 Apr 2024 15:03:04 +0900 Subject: [PATCH] fixed package names --- .../CARLA_Autoware => }/carla_autoware/CMakeLists.txt | 0 .../CARLA_Autoware => }/carla_autoware/README.md | 2 +- .../CARLA_Autoware => }/carla_autoware/config/objects.json | 0 .../carla_autoware/launch/carla_autoware.launch.xml | 0 .../carla_autoware/launch/carla_ros.launch.xml | 0 .../CARLA_Autoware => }/carla_autoware/package.xml | 0 .../carla_autoware/resource/carla_autoware | 0 .../CARLA_Autoware => }/carla_autoware/setup.cfg | 0 .../CARLA_Autoware => }/carla_autoware/setup.py | 5 +++-- .../carla_autoware/src/carla_autoware/carla_autoware.py | 0 10 files changed, 4 insertions(+), 3 deletions(-) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/CMakeLists.txt (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/README.md (96%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/config/objects.json (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/launch/carla_autoware.launch.xml (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/launch/carla_ros.launch.xml (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/package.xml (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/resource/carla_autoware (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/setup.cfg (100%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/setup.py (81%) rename simulator/{CARLA_Autoware/CARLA_Autoware => }/carla_autoware/src/carla_autoware/carla_autoware.py (100%) diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/CMakeLists.txt b/simulator/carla_autoware/CMakeLists.txt similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/CMakeLists.txt rename to simulator/carla_autoware/CMakeLists.txt diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/README.md b/simulator/carla_autoware/README.md similarity index 96% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/README.md rename to simulator/carla_autoware/README.md index 8e5abd137c67c..6691bc6517410 100644 --- a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/README.md +++ b/simulator/carla_autoware/README.md @@ -21,7 +21,7 @@ This ros package enables autonomous driving using Autoware in addition to the ba - [Autoware.Universe](https://autowarefoundation.github.io/autoware-documentation/galactic/installation/autoware/source-installation/) - [CARLA Installation](https://carla.readthedocs.io/en/latest/start_quickstart/) -- [Carla Maps](https://bitbucket.org/carla-simulator/autoware-contents/src/master/maps/) +- [Carla Lanelet2 Maps](https://bitbucket.org/carla-simulator/autoware-contents/src/master/maps/) - [Carla Sensor Kit](https://github.com/mraditya01/carla_sensor_kit_launch) - [Autoware Individual params (forked with CARLA Sensor Kit params)](https://github.com/mraditya01/autoware_individual_params) 1. Download maps (y-axis inverted version) to arbitaly location diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/config/objects.json b/simulator/carla_autoware/config/objects.json similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/config/objects.json rename to simulator/carla_autoware/config/objects.json diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/launch/carla_autoware.launch.xml b/simulator/carla_autoware/launch/carla_autoware.launch.xml similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/launch/carla_autoware.launch.xml rename to simulator/carla_autoware/launch/carla_autoware.launch.xml diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/launch/carla_ros.launch.xml b/simulator/carla_autoware/launch/carla_ros.launch.xml similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/launch/carla_ros.launch.xml rename to simulator/carla_autoware/launch/carla_ros.launch.xml diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/package.xml b/simulator/carla_autoware/package.xml similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/package.xml rename to simulator/carla_autoware/package.xml diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/resource/carla_autoware b/simulator/carla_autoware/resource/carla_autoware similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/resource/carla_autoware rename to simulator/carla_autoware/resource/carla_autoware diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/setup.cfg b/simulator/carla_autoware/setup.cfg similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/setup.cfg rename to simulator/carla_autoware/setup.cfg diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/setup.py b/simulator/carla_autoware/setup.py similarity index 81% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/setup.py rename to simulator/carla_autoware/setup.py index 75676e9485abb..82dfb6581d776 100644 --- a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/setup.py +++ b/simulator/carla_autoware/setup.py @@ -23,9 +23,10 @@ packages=[package_name], data_files=[ ("share/ament_index/resource_index/packages", ["resource/" + package_name]), - ("share/" + package_name, glob("config/*.json")), + ("share/" + package_name, glob("config/objects.json")), ("share/" + package_name, ["package.xml"]), - (os.path.join("share", package_name), glob("launch/*.launch.xml")), + (os.path.join("share", package_name), glob("launch/carla_autoware.launch.xml")), + (os.path.join("share", package_name), glob("launch/carla_ros.launch.xml")), ], install_requires=["setuptools"], zip_safe=True, diff --git a/simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/src/carla_autoware/carla_autoware.py b/simulator/carla_autoware/src/carla_autoware/carla_autoware.py similarity index 100% rename from simulator/CARLA_Autoware/CARLA_Autoware/carla_autoware/src/carla_autoware/carla_autoware.py rename to simulator/carla_autoware/src/carla_autoware/carla_autoware.py