fixed package names

mraditya01 · Apr 15, 2024 · 9d5a718 · 9d5a718
1 parent fc751af
commit 9d5a718
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 3 deletions.
diff --git a/...LA_Autoware/carla_autoware/CMakeLists.txt → simulator/carla_autoware/CMakeLists.txt b/...LA_Autoware/carla_autoware/CMakeLists.txt → simulator/carla_autoware/CMakeLists.txt
diff --git a/...e/CARLA_Autoware/carla_autoware/README.md → simulator/carla_autoware/README.md b/...e/CARLA_Autoware/carla_autoware/README.md → 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/...toware/carla_autoware/config/objects.json → simulator/carla_autoware/config/objects.json b/...toware/carla_autoware/config/objects.json → simulator/carla_autoware/config/objects.json
diff --git a/...autoware/launch/carla_autoware.launch.xml → ...autoware/launch/carla_autoware.launch.xml b/...autoware/launch/carla_autoware.launch.xml → ...autoware/launch/carla_autoware.launch.xml
diff --git a/...arla_autoware/launch/carla_ros.launch.xml → ...arla_autoware/launch/carla_ros.launch.xml b/...arla_autoware/launch/carla_ros.launch.xml → ...arla_autoware/launch/carla_ros.launch.xml
diff --git a/...CARLA_Autoware/carla_autoware/package.xml → simulator/carla_autoware/package.xml b/...CARLA_Autoware/carla_autoware/package.xml → simulator/carla_autoware/package.xml
diff --git a/...re/carla_autoware/resource/carla_autoware → ...or/carla_autoware/resource/carla_autoware b/...re/carla_autoware/resource/carla_autoware → ...or/carla_autoware/resource/carla_autoware
diff --git a/...e/CARLA_Autoware/carla_autoware/setup.cfg → simulator/carla_autoware/setup.cfg b/...e/CARLA_Autoware/carla_autoware/setup.cfg → simulator/carla_autoware/setup.cfg
diff --git a/...re/CARLA_Autoware/carla_autoware/setup.py → simulator/carla_autoware/setup.py b/...re/CARLA_Autoware/carla_autoware/setup.py → 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/...ware/src/carla_autoware/carla_autoware.py → ...ware/src/carla_autoware/carla_autoware.py b/...ware/src/carla_autoware/carla_autoware.py → ...ware/src/carla_autoware/carla_autoware.py