소스 검색

Update ROS2 links to reflect move to o3de-extras

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 년 전
부모
커밋
13598c8ab5
4개의 변경된 파일29개의 추가작업 그리고 29개의 파일을 삭제
  1. 23 23
      Project/project.json
  2. 3 3
      docker/Dockerfile
  3. 1 1
      docs/ImportingURDF/URDF_import_guide.md
  4. 2 2
      kraken_nav/README.md

+ 23 - 23
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"
+    ]
+}

+ 3 - 3
docker/Dockerfile

@@ -100,10 +100,10 @@ RUN git clone https://github.com/o3de/o3de.git -b development \
     && git lfs pull \
     && git lfs pull \
     && python/get_python.sh
     && 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 \
 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 register -pp ./ROSConDemo/Project \
     && ./o3de/scripts/o3de.sh enable-gem -gn ROS2 -pp ./ROSConDemo/Project \
     && ./o3de/scripts/o3de.sh enable-gem -gn ROS2 -pp ./ROSConDemo/Project \
     && cat /root/.o3de/o3de_manifest.json
     && cat /root/.o3de/o3de_manifest.json
@@ -112,7 +112,7 @@ WORKDIR $WORKDIR/ROSConDemo/Project
 
 
 RUN git lfs pull \
 RUN git lfs pull \
     && . /opt/ros/humble/setup.sh \
     && . /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 \
 RUN . /opt/ros/humble/setup.sh \
     && cmake --build build/linux --config profile --target ROSConDemo Editor AssetProcessor
     && cmake --build build/linux --config profile --target ROSConDemo Editor AssetProcessor

+ 1 - 1
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)
 ![](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:
 After the `Installation` part run the O3DE simulation (`ctrl-g`), switch to terminal and run the following commands:
 
 
 ```bash
 ```bash

+ 2 - 2
kraken_nav/README.md

@@ -32,7 +32,7 @@ export RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
 
 
 ### Packages
 ### 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.
 In addition to the required packages for the ROS2 gem, you will also need some additional ROS2 packages.
 
 
@@ -77,7 +77,7 @@ pip install python-statemachine
 ## Installation ##
 ## Installation ##
 
 
 - Use the [development](https://github.com/o3de/o3de/tree/development) branch of the `O3DE`.
 - 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 the [development](https://github.com/o3de/o3de-extras/tree/development) branch of the `o3de-extras`.
 - Use the [main](https://github.com/aws-lumberyard/ROSConDemo) branch of the `ROSConDemo`.
 - Use the [main](https://github.com/aws-lumberyard/ROSConDemo) branch of the `ROSConDemo`.
 
 
 1. Source ROS2 (assumed `humble`)
 1. Source ROS2 (assumed `humble`)