Merge pull request #217 from o3de/spham_amzn/update_ros2_docker_links

Update ROS2 links to reflect move to o3de-extras

Project/project.json

@@ -1,23 +1,23 @@
-{
-    "project_name": "ROSConDemo",
-    "project_id": "{A871E69A-15DA-4A3B-9A47-EC994B37FD3C}",
-    "origin": "The primary repo for ROSConDemo goes here: i.e. http://www.mydomain.com",
-    "license": "What license ROSConDemo uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
-    "display_name": "ROSConDemo",
-    "summary": "A short description of ROSConDemo.",
-    "canonical_tags": [
-        "Project"
-    ],
-    "user_tags": [
-        "ROSConDemo"
-    ],
-    "icon_path": "preview.png",
-    "engine": "o3de",
-    "external_subdirectories": [
-        "Gem"
-    ],
-    "restricted": "ROSConDemo",
-    "gem_names": [
-        "ROS2"
-    ]
-}
+{
+    "project_name": "ROSConDemo",
+    "project_id": "{A871E69A-15DA-4A3B-9A47-EC994B37FD3C}",
+    "origin": "The primary repo for ROSConDemo goes here: i.e. http://www.mydomain.com",
+    "license": "What license ROSConDemo uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
+    "display_name": "ROSConDemo",
+    "summary": "A short description of ROSConDemo.",
+    "canonical_tags": [
+        "Project"
+    ],
+    "user_tags": [
+        "ROSConDemo"
+    ],
+    "icon_path": "preview.png",
+    "engine": "o3de",
+    "external_subdirectories": [
+        "Gem"
+    ],
+    "restricted": "ROSConDemo",
+    "gem_names": [
+        "ROS2"
+    ]
+}

README.md

@@ -1,7 +1,7 @@
 # Apple Kraken Demo Project
 
 This project demonstrates an example application of [O3DE](https://www.o3de.org/) working with ROS 2.
-The integration is realized through [ROS 2 Gem for O3DE](https://github.com/RobotecAI/o3de-ros2-gem).
+The integration is realized through [ROS 2 Gem](https://github.com/o3de/o3de-extras/blob/development/Gems/ROS2).
 
 ## How does it look like
 
@@ -70,9 +70,9 @@ The following commands should prepare O3DE:
 
 ## ROS 2 Gem
 
-This project uses the [ROS 2 Gem](https://github.com/RobotecAI/o3de-ros2-gem).
+This project uses the [ROS 2 Gem](https://github.com/o3de/o3de-extras/blob/development/Gems/ROS2).
 Please make sure to follow the installation guide
-in [README.md](https://github.com/RobotecAI/o3de-ros2-gem/blob/development/README.md) file.
+in [README.md](https://github.com/o3de/o3de-extras/blob/development/Gems/ROS2/README.md) file.
 To learn more about how the Gem works check out
 the [ROS 2 Gem user guide](https://github.com/RobotecAI/o3de-ros2-gem/blob/development/docs/guides/ros2-gem.md).
 

docker/Dockerfile

@@ -100,10 +100,10 @@ RUN git clone https://github.com/o3de/o3de.git -b development \
     && git lfs pull \
     && python/get_python.sh
 
-RUN git clone https://github.com/RobotecAI/o3de-ros2-gem.git
+RUN git clone https://github.com/o3de/o3de-extras.git -b development
 
 RUN ./o3de/scripts/o3de.sh register --this-engine \
-    && ./o3de/scripts/o3de.sh register --gem-path ./o3de-ros2-gem \
+    && ./o3de/scripts/o3de.sh register --gem-path ./o3de-extras/Gems/ROS2 \
     && ./o3de/scripts/o3de.sh register -pp ./ROSConDemo/Project \
     && ./o3de/scripts/o3de.sh enable-gem -gn ROS2 -pp ./ROSConDemo/Project \
     && cat /root/.o3de/o3de_manifest.json
@@ -112,7 +112,7 @@ WORKDIR $WORKDIR/ROSConDemo/Project
 
 RUN git lfs pull \
     && . /opt/ros/humble/setup.sh \
-    && cmake -B build/linux -S . -G "Ninja Multi-Config" -DLY_STRIP_DEBUG_SYMBOLS=ON
+    && cmake -B build/linux -S . -G "Ninja Multi-Config" -DLY_DISABLE_TEST_MODULES=ON -DLY_STRIP_DEBUG_SYMBOLS=ON
 
 RUN . /opt/ros/humble/setup.sh \
     && cmake --build build/linux --config profile --target ROSConDemo Editor AssetProcessor

docs/ImportingURDF/URDF_import_guide.md

@@ -117,7 +117,7 @@ This step ensures that our namespace is the same as if the robot was spawned and
 
 ![](static/images/URDF_tutorial_base_link_name.png)
 
-Follow instructions in the [o3de_kraken_nav](https://github.com/RobotecAI/o3de_kraken_nav) to install the navigation stack.
+Follow instructions in the [o3de_kraken_nav](https://github.com/o3de/ROSConDemo/blob/development/kraken_nav/README.md) to install the navigation stack.
 After the `Installation` part run the O3DE simulation (`ctrl-g`), switch to terminal and run the following commands:
 
 ```bash

kraken_nav/README.md

@@ -32,7 +32,7 @@ export RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
 
 ### Packages
 
-You will need to install the appropriate ROS2 package. Refer to setup requirements for the [ROS2 Gem](https://github.com/RobotecAI/o3de-ros2-gem/blob/development/README.md)
+You will need to install the appropriate ROS2 package. Refer to setup requirements for the [ROS2 Gem](https://github.com/o3de/o3de-extras/blob/development/Gems/ROS2/README.md)
 
 In addition to the required packages for the ROS2 gem, you will also need some additional ROS2 packages.
 
@@ -77,8 +77,8 @@ pip install python-statemachine
 ## Installation ##
 
 - Use the [development](https://github.com/o3de/o3de/tree/development) branch of the `O3DE`.
-- Use the the [development](https://github.com/RobotecAI/o3de-ros2-gem/tree/development) branch of the `o3de-ros-gem`.
-- Use the [main](https://github.com/aws-lumberyard/ROSConDemo) branch of the `ROSConDemo`.
+- Use the the [development](https://github.com/o3de/o3de-extras/tree/development) branch of the `o3de-extras`.
+- Use the [development](https://github.com/o3de/ROSConDemo) branch of the `ROSConDemo`.
 
 1. Source ROS2 (assumed `humble`)