Commit Graph

92 Commits

Author SHA1 Message Date
lumberyard-employee-dm 3dec5d3b71 LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00
Esteban Papp ea61f9324c SPEC-6564 Cleanup _HEADERS now that CMake fixed the issue (#397) 2021-04-28 14:50:08 -07:00
Esteban Papp 01f9d7bdc1 SPEC-6565 Cleanup paths to Tools/Python 2021-04-28 13:33:37 -07:00
Alex Peterson 7aeb9614de Remove remaining libav references 2021-04-27 16:27:10 -07:00
amzn-sj 0c90990462 Merge branch 'main' into LYN-3280 2021-04-27 13:29:04 -07:00
Junbo Liang 83f3cbd4a1 Merge pull request #151 from aws-lumberyard-dev/SPEC-6072
[SPEC-6072] [Crashpad] Migrate crash reporting tool to use Crashpad from 3rdParty
2021-04-27 12:13:21 -07:00
amzn-sj 5c75415714 Merge branch 'main' into LYN-3280 2021-04-27 11:07:51 -07:00
junbo 0b8299ba0b Remove the existing crashpad package and update the package hash 2021-04-27 09:50:20 -07:00
junbo eb0758f63a [SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows 2021-04-27 09:48:50 -07:00
spham 5452b5d876 - Update Lua for mac to rev6 (Fix missing debug libs) 2021-04-27 08:09:07 -07:00
amzn-sj 745d5585e1 Only try to remove symlink or delete the directory is the path exists(it will not exist when build for the first time) 2021-04-26 15:57:47 -07:00
Chris Burel e468a93a13 Convert OpenSSL to the new 3p package system (#213) 2021-04-26 08:35:40 -07:00
Esteban Papp 5d13ad963a SPEC-6437 Dlls should go to bin instead of profile (#287)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed

* putting dlls/exe in the right place, with the right output subdirectory

* setting runtime dependencies for the dlls that we link against

* singular target location

* code review comments/fixes

* Fixing identation
2021-04-23 14:41:18 -07:00
AMZN-tpeng 0071e783a4 Merge pull request #259 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15175
Atom/tonypeng/atom 15175
2021-04-23 14:09:06 -07:00
Peng 176f7fdef2 ATOM-15175 put back include vkvalidation cmake file again 2021-04-23 11:37:09 -07:00
Scott Romero 59ccaa9495 LYN-2421: Initial CPackIFW support for Windows
Merge pull request #224 from aws-lumberyard-dev/cpack_installer
2021-04-23 10:48:09 -07:00
Esteban Papp 1c13b301fe SPEC-5070 Move ctest_scripts to scripts/ctest
* removing unused function and moving ctest_scripts to scripts/ctest

* Re-adding ebp-test

* Fixing typo that is making this test run in parallel with other tests

* Fixing hang when parameters are passed

* passing absolute path as a project

* small tweak to not print out during Python execution

* Moving the timeout to be in the build step

* Disable ebo_sanity_smoke_no_gpu

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-04-23 09:43:11 -07:00
Peng e15146a409 Merge branch 'main' into ATOM/tonypeng/ATOM-15175 2021-04-23 09:08:18 -07:00
scottr c5475af235 Merge branch 'main' into cpack_installer 2021-04-22 17:52:26 -07:00
scottr df251de400 [cpack_installer] few small fixes based on feedback 2021-04-22 17:51:41 -07:00
scottr bb1a7580f5 [cpack_installer] missed some new install() entries after a merge that need component tagging 2021-04-22 16:37:15 -07:00
Peng b2755e5eaa Merge branch 'main' into ATOM/tonypeng/ATOM-15175 2021-04-22 14:46:26 -07:00
Peng 13ef98f1f9 [ATOM][RHI][Vulkan][Android] Fix VkValidation copy for new 3rd party system
JIRA: https://jira.agscollab.com/browse/ATOM-15175
2021-04-22 14:31:29 -07:00
scottr 15d253ac49 Merge branch 'main' into cpack_installer 2021-04-22 14:25:35 -07:00
evanchia e7db0a64d6 Merge branch 'main' into hydra_util_package 2021-04-22 13:26:34 -07:00
Eric Phister 38f0203546 Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
2021-04-22 14:32:14 -05:00
scottr db7689bf49 [cpack_installer] addressed feedback regarding install error checking and default property values for cpack 2021-04-22 12:23:33 -07:00
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 2021-04-22 11:42:58 -05:00
scottr 8c76e193e9 [cpack_installer] removed INSTALL_COMPONENT as public argument from ly_add_target and cleaned up internal usage 2021-04-22 08:22:29 -07:00
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 2021-04-22 10:06:40 -05:00
spham 2fc1901d8f Update AWSNativeSDK on Linux to rev4 to fix dependency issue with aws-cpp-sdk-event-stream 2021-04-21 21:55:02 -07:00
phistere f36bfd9db5 LYN-2524: Adding more files to CMake install to help AP run from SDK. Fixes an issue configuring an external project. 2021-04-21 19:53:07 -05:00
scottr 6c1e617d49 [cpack_installer] added another missing trailing newline to a modified file 2021-04-21 16:39:54 -07:00
scottr 11b2141a37 [cpack_installer] added missing trailing newline to select modified files 2021-04-21 16:36:22 -07:00
scottr 56dfaca6cf [cpack_installer] re-applying install component support after merge. added some missing doc comments. 2021-04-21 14:41:18 -07:00
scottr 22f34d953a Merge branch 'main' into cpack_installer 2021-04-21 14:26:03 -07:00
Olex Lozitskiy 2063b0ba9a Merge pull request #145 from aws-lumberyard-dev/Atom/olexl/ATOM-15275
ATOM-15275 RedCode legacy version of DirectXShaderCompiler
2021-04-21 16:54:58 -04:00
scottr ca47e6dbbb [cpack_installer] added PAL trait to define if CPack is supported for a platform 2021-04-21 13:53:00 -07:00
Steve Pham 97fd0df098 Merge pull request #205 from aws-lumberyard-dev/SPEC-5833-main
Update Lua package revs and hashes to use new re-built Lua packages that pass scrubbing validation
2021-04-21 13:13:37 -07:00
Aristo7 9e874ae2ed Merged main in 2021-04-21 15:34:29 -04:00
Vincent Liu 626f7c00fe [SPEC-1856] Convert AWSGameLiftServerSDK to new 3rdparty system (#198)
Remove old 3rdparty reference in code, and replace with new target.
Lib has been promoted to prod bucket (https://jira.agscollab.com/browse/SPEC-6469)
2021-04-21 12:07:34 -07:00
spham 5906731cd1 Update Lua package revs and hashes to use new re-built Lua packages that pass scrubbing validation 2021-04-21 11:30:00 -07:00
Esteban Papp 92c77dca11 LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
2021-04-21 11:16:27 -07:00
scottr e9d7f335af [cpack_installer] added Qt IFW loose path validation so cmake does not hard fail when it is missing 2021-04-21 11:10:14 -07:00
evanchia 015dc12dc3 Merge branch 'main' into hydra_util_package 2021-04-21 10:58:21 -07:00
Olex Lozitskiy e3b48c16bd Merge pull request #170 from aws-lumberyard-dev/Atom/olexl/openimageio_3p_update
Updated OpenImageIO 3p package to rev2
2021-04-21 13:21:19 -04:00
scottr d9af12ace6 Merge branch 'main' into cpack_installer 2021-04-21 09:05:04 -07:00
Scott Romero 8e67ff55c0 Adding option to override inclusion of test targets in build
Merge pull request #180 from aws-lumberyard-dev/SPEC-6436
2021-04-21 08:20:34 -07:00
Aaron Ruiz Mora 5524668f61 Updating O3DE to use 3rdParty PhysX package rev2 on iOS (#189) 2021-04-21 15:35:53 +01:00
Alex Peterson 707f5a07b2 Converted Civetweb to 3p package 2021-04-20 17:25:31 -07:00