Skip to content

Commit c778606

Browse files
byrcolinbyrcolin
authored
Templates restricted (o3de#6498)
* Templates/Restricted upgrade/fixes: Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used. Upgraded all templates to new standard Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent Restricted now operates at the object level and makes no assumptions about parent Restricted templates can now be combined and seperated on creation ly_get_list_relative_filename has been deprecated for o3de_pal_dir All Gems/Projects/Templates updated to use new code Signed-off-by: byrcolin <byrcolin@amazon.com>
1 parent f87e1f6 commit c778606

324 files changed

Lines changed: 2357 additions & 2434 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AutomatedTesting/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ else()
2727

2828
set_property(GLOBAL APPEND PROPERTY LY_PROJECTS_TARGET_NAME ${project_target_name})
2929

30-
add_subdirectory(Gem)
3130
endif()

‎AutomatedTesting/Gem/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#
77
#
88

9+
set(gem_path ${CMAKE_CURRENT_LIST_DIR})
10+
set(gem_json ${gem_path}/gem.json)
11+
o3de_restricted_path(${gem_json} gem_restricted_path gem_parent_relative_path)
12+
913
add_subdirectory(Code)
10-
add_subdirectory(PythonTests)
11-
add_subdirectory(PythonCoverage)
14+
add_subdirectory(PythonTests)

‎AutomatedTesting/Gem/Code/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
#
88

9-
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
9+
o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${gem_restricted_path} ${gem_path} ${gem_parent_relative_path})
1010

1111
ly_add_target(
1212
NAME AutomatedTesting ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}

‎AutomatedTesting/Gem/PythonCoverage/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66
#
77
#
88

9+
set(gem_path ${CMAKE_CURRENT_LIST_DIR})
10+
set(gem_json ${gem_path}/gem.json)
11+
o3de_restricted_path(${gem_json} gem_restricted_path gem_parent_relative_path)
12+
913
add_subdirectory(Code)

‎AutomatedTesting/Gem/PythonCoverage/Code/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
#
88

9-
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${o3de_gem_restricted_path} ${o3de_gem_path} ${o3de_gem_name})
9+
o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${gem_restricted_path} ${gem_path} ${gem_parent_relative_path})
1010
include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
1111

1212
if(PAL_TRAIT_PYTHONCOVERAGE_SUPPORTED)

‎AutomatedTesting/Gem/PythonCoverage/gem.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"license": "Apache-2.0 Or MIT",
55
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
66
"origin": "Open 3D Engine - o3de.org",
7+
"origin_url": "https://github.com/o3de/o3de",
78
"type": "Tool",
89
"summary": "A tool for generating gem coverage for Python tests.",
910
"canonical_tags": [
@@ -13,5 +14,8 @@
1314
"PythonCoverage"
1415
],
1516
"icon_path": "preview.png",
16-
"requirements": ""
17+
"requirements": "",
18+
"documentation_url": "",
19+
"dependencies": [
20+
]
1721
}

‎AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
#
88

9-
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
9+
o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${gem_restricted_path} ${gem_path} ${gem_parent_relative_path})
1010

1111
include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) # for PAL_TRAIT_BLAST Traits
1212

‎AutomatedTesting/Gem/PythonTests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Automated Tests
1111
################################################################################
1212

13-
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
13+
o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${gem_restricted_path} ${gem_path} ${gem_parent_relative_path})
1414

1515
include(${pal_dir}/PAL_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
1616

‎AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
#
88

9-
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
9+
o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${gem_restricted_path} ${gem_path} ${gem_parent_relative_path})
1010

1111
include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) # for PAL_TRAIT_WHITEBOX Traits
1212

‎AutomatedTesting/Gem/Sponza/gem.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44
"license": "Apache-2.0 Or MIT",
55
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
66
"origin": "Open 3D Engine - o3de.org",
7+
"origin_url": "https://github.com/o3de/o3de",
78
"type": "Asset",
89
"summary": "A standard test scene for Global Illumination (forked from crytek sponza scene)",
910
"canonical_tags": [
10-
"Gem"
11+
"Gem",
12+
"Asset"
1113
],
1214
"user_tags": [
13-
"Assets"
15+
"Sponza"
1416
],
17+
"icon_path": "preview.png",
1518
"requirements": "",
16-
"dependencies": []
19+
"documentation_url": "",
20+
"dependencies": [
21+
]
1722
}

0 commit comments

Comments
 (0)