Skip to content

Commit b5be871

Browse files
jhanca-robotecaijhanca-robotecai
authored
Merge branch 'o3de:development' into development
2 parents 5da5649 + 2f9a8a7 commit b5be871

34 files changed

+2786
-301
lines changed

‎Gems/ProteusRobot/gem.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"gem_name": "ProteusRobot",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"display_name": "Proteus Robot",
55
"license": "Apache-2.0 or MIT",
66
"license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -21,14 +21,14 @@
2121
"requirements": "Requires ROS 2 Gem",
2222
"documentation_url": "https://www.o3de.org/docs/user-guide/interactivity/robotics/project-configuration/#ros-2-project-templates",
2323
"dependencies": [
24-
"ROS2==3.0.0"
24+
"ROS2>=3.1.0"
2525
],
2626
"repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
2727
"compatible_engines": [
28-
"o3de-sdk>=1.2.0",
29-
"o3de>=1.2.0"
28+
"o3de-sdk>=4.1.0",
29+
"o3de>=4.1.0"
3030
],
3131
"engine_api_dependencies": [],
3232
"restricted": "ProteusRobot",
33-
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/proteusrobot-1.0.0-gem.zip"
34-
}
33+
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/proteusrobot-1.1.0-gem.zip"
34+
}

‎Gems/ROS2/Code/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ly_add_target(
6565
Gem::Atom_Feature_Common.Static
6666
Gem::Atom_Component_DebugCamera.Static
6767
Gem::StartingPointInput
68-
Gem::PhysX.Static
68+
Gem::PhysX5.Static
6969
Gem::LmbrCentral.API
7070
)
7171

@@ -132,7 +132,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
132132
AZ::AzToolsFramework
133133
Gem::CommonFeaturesAtom.Editor.Static
134134
Gem::LmbrCentral.API
135-
Gem::PhysX.Editor.Static
135+
Gem::PhysX5.Editor.Static
136136
Gem::${gem_name}.Static
137137
PRIVATE
138138
AZ::AssetBuilderSDK
@@ -214,7 +214,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
214214
AZ::AzManipulatorTestFramework.Static
215215
Gem::ROS2.Static
216216
RUNTIME_DEPENDENCIES
217-
Gem::PhysX.Editor
217+
Gem::PhysX5.Editor
218218
)
219219

220220
ly_add_googletest(

‎Gems/ROS2/gem.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"gem_name": "ROS2",
3-
"version": "3.0.0",
3+
"version": "3.1.0",
44
"platforms": [
55
"Linux"
66
],
@@ -18,8 +18,8 @@
1818
"ROS2"
1919
],
2020
"compatible_engines": [
21-
"o3de-sdk>=3.1.0",
22-
"o3de>=3.1.0"
21+
"o3de-sdk>=4.1.0",
22+
"o3de>=4.1.0"
2323
],
2424
"icon_path": "preview.png",
2525
"requirements": "Requires ROS 2 installation (supported distributions: Humble). Source your workspace before building the Gem",
@@ -29,12 +29,11 @@
2929
"Atom_Feature_Common",
3030
"Atom_Component_DebugCamera",
3131
"CommonFeaturesAtom",
32-
"PhysX",
32+
"PhysX5",
3333
"PrimitiveAssets",
3434
"StartingPointInput"
35-
3635
],
3736
"restricted": "ROS2",
3837
"repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
39-
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2-2.0.0-gem.zip"
38+
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2-3.1.0-gem.zip"
4039
}

‎Gems/RosRobotSample/gem.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"gem_name": "RosRobotSample",
3+
"version": "1.1.0",
34
"display_name": "ROS Robot Sample",
45
"license": "Apache-2.0 or MIT",
56
"license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -20,14 +21,13 @@
2021
"requirements": "Requires ROS 2 Gem",
2122
"documentation_url": "",
2223
"dependencies": [
23-
"ROS2==3.0.0"
24+
"ROS2>=3.1.0"
2425
],
2526
"compatible_engines": [
26-
"o3de-sdk>=1.2.0",
27-
"o3de>=1.2.0"
27+
"o3de-sdk>=4.1.0",
28+
"o3de>=4.1.0"
2829
],
2930
"repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
3031
"restricted": "",
31-
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/rosrobotsample-1.0.0-gem.zip",
32-
"version": "1.0.0"
33-
}
32+
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/rosrobotsample-1.1.0-gem.zip"
33+
}

‎Gems/WarehouseAutomation/Code/CMakeLists.txt‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ly_add_target(
5555
AZ::AzCore
5656
AZ::AzFramework
5757
Gem::CommonFeaturesAtom.Static
58-
Gem::PhysX.Static
58+
Gem::PhysX5.Static
5959
)
6060

6161
# Here add ${gem_name} target, it depends on the Private Object library and Public API interface
@@ -110,27 +110,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
110110
AZ::AzToolsFramework
111111
)
112112

113-
# The ${gem_name}.Editor.Private.Object target is an internal target
114-
# which is only to be used by this gems CMakeLists.txt and any subdirectories
115-
# Other gems should not use this target
116-
ly_add_target(
117-
NAME ${gem_name}.Editor.Private.Object STATIC
118-
NAMESPACE Gem
119-
FILES_CMAKE
120-
warehouseautomation_editor_private_files.cmake
121-
TARGET_PROPERTIES
122-
O3DE_PRIVATE_TARGET TRUE
123-
INCLUDE_DIRECTORIES
124-
PRIVATE
125-
Include
126-
Source
127-
BUILD_DEPENDENCIES
128-
PUBLIC
129-
AZ::AzToolsFramework
130-
Gem::PhysX.Editor.Static
131-
$<TARGET_OBJECTS:Gem::${gem_name}.Private.Object>
132-
)
133-
134113
ly_add_target(
135114
NAME ${gem_name}.Editor GEM_MODULE
136115
NAMESPACE Gem
@@ -146,7 +125,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
146125
PUBLIC
147126
Gem::${gem_name}.Editor.API
148127
PRIVATE
149-
Gem::${gem_name}.Editor.Private.Object
128+
AZ::AzToolsFramework
129+
${gem_name}.Private.Object
150130
)
151131

152132
# By default, we will specify that the above target ${gem_name} would be used by
@@ -199,8 +179,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
199179
if(PAL_TRAIT_BUILD_HOST_TOOLS)
200180
# We are a host platform, see if Editor tests are supported on this platform
201181
if(PAL_TRAIT_WAREHOUSEAUTOMATION_EDITOR_TEST_SUPPORTED)
202-
# We support ${gem_name}.Editor.Tests on this platform, add ${gem_name}.Editor.Tests target which depends on
203-
# private ${gem_name}.Editor.Private.Object target
182+
# We support ${gem_name}.Editor.Tests on this platform
204183
ly_add_target(
205184
NAME ${gem_name}.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
206185
NAMESPACE Gem
@@ -214,7 +193,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
214193
BUILD_DEPENDENCIES
215194
PRIVATE
216195
AZ::AzTest
217-
Gem::${gem_name}.Editor.Private.Object
196+
AZ::AzToolsFramework
197+
Gem::PhysX5.Editor.Static
218198
)
219199

220200
# Add ${gem_name}.Editor.Tests to googletest

‎Gems/WarehouseAutomation/Code/Platform/Linux/PAL_linux.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
# SPDX-License-Identifier: Apache-2.0 OR MIT
55
set(PAL_TRAIT_WAREHOUSEAUTOMATION_SUPPORTED TRUE)
66
set(PAL_TRAIT_WAREHOUSEAUTOMATION_TEST_SUPPORTED TRUE)
7-
set(PAL_TRAIT_WAREHOUSEAUTOMATION_EDITOR_TEST_SUPPORTED TRUE)
7+
# Currently there are no tests defined for this project. Once tests are added, set the following trait to TRUE
8+
set(PAL_TRAIT_WAREHOUSEAUTOMATION_EDITOR_TEST_SUPPORTED FALSE)

‎Gems/WarehouseAutomation/Code/warehouseautomation_editor_private_files.cmake‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Gems/WarehouseAutomation/gem.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "1.0.0",
32
"gem_name": "WarehouseAutomation",
3+
"version": "1.1.0",
44
"display_name": "Warehouse Automation",
55
"license": "Apache-2.0",
66
"license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -15,18 +15,18 @@
1515
"WarehouseAutomation"
1616
],
1717
"compatible_engines": [
18-
"o3de-sdk>=1.2.0",
19-
"o3de>=1.2.0"
18+
"o3de-sdk>=4.1.0",
19+
"o3de>=4.1.0"
2020
],
2121
"platforms": [
2222
"Linux"
2323
],
2424
"icon_path": "preview.png",
25-
"requirements": "This gem requires ROS 2 gem and PhysX gem.",
25+
"requirements": "This gem requires ROS 2 gem and PhysX5 gem.",
2626
"dependencies": [
27-
"ROS2==3.0.0",
28-
"PhysX"
27+
"ROS2>=3.1.0"
2928
],
30-
"repo_uri": "https://github.com/o3de/o3de-extras",
31-
"restricted": "WarehouseAutomation"
32-
}
29+
"repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
30+
"restricted": "WarehouseAutomation",
31+
"download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseautomation-1.1.0-gem.zip"
32+
}

‎Templates/Ros2FleetRobotTemplate/Template/Gem/${Name}_files.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ set(FILES
1414
Include/${Name}/${Name}Bus.h
1515
Source/${Name}SystemComponent.cpp
1616
Source/${Name}SystemComponent.h
17-
enabled_gems.cmake
1817
)

‎Templates/Ros2FleetRobotTemplate/Template/Gem/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,3 @@ o3de_find_ancestor_project_root(project_path project_name "${CMAKE_CURRENT_SOURC
9898
if (NOT project_name)
9999
set(project_name ${Name})
100100
endif()
101-
102-
# Enable the specified list of gems from GEM_FILE or GEMS list for this specific project:
103-
ly_enable_gems(PROJECT_NAME ${project_name} GEM_FILE enabled_gems.cmake)

0 commit comments

Comments
 (0)