Commit Graph

166 Commits

Author SHA1 Message Date
Scott Romero e765a43eda [main] fixes #871 - external project configure failure
Merge pull request #895 from aws-lumberyard-dev/ext_project_packaging_fix
2021-05-25 09:26:21 -07:00
AMZN-stankowi b37be6cdbf New AssImp build, just for Windows. This has the crash fix with bones. (#875) 2021-05-24 10:41:19 -07:00
scottr 26c55514d5 [ext_project_packaging_fix] replaced incorrect usage of CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR in cmake packaging scripts 2021-05-24 09:27:03 -07:00
moudgils aeaa3a9c55 Merge pull request #884 from aws-lumberyard-dev/SpirvCrossUpdate
Spirv cross update
2021-05-24 09:17:27 -07:00
Alex Peterson d112ae403b Engine settings UX update and basic functionality 2021-05-21 22:47:41 -07:00
moudgils a1cb7cd593 Add windows package 2021-05-21 15:36:06 -07:00
moudgils 2146d9982a Update SpirvCross package 2021-05-21 09:59:07 -07:00
scottr 8a594a14de Merge branch 'main' into cpack_installer 2021-05-20 15:12:34 -07:00
moudgils 5a149a4594 Merge branch 'main' into DxcExperiment 2021-05-20 11:56:35 -07:00
scottr 134c8f10c6 Merge branch 'main' into cpack_installer 2021-05-20 07:09:43 -07:00
galibzon 256df54575 [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System (#749)
* [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System.

Added ShaderAssetBuilder2 & ShaderVariantAssetBuilder2.

Added ShaderAsset2, ShaderVariantAsset2.

Eventually they will be the only builders. AzslBuilder &
SrgLayoutBuilder will be removed.
ShaderResourceGroupAsset will be removed. ShaderAssetBuilder &
ShaderVariantAssetBuilder will be replaced.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-05-20 04:53:16 -05:00
scottr d83d9c9bff [cpack_installer] fixed issue with applying default installer GUIDs when seed property changes 2021-05-19 20:26:27 -07:00
scottr e0cb0fec9b [cpack_installer] add desktop and start menu shortcuts 2021-05-19 19:39:52 -07:00
scottr 3d4d63ab1d [cpack_installer] installer product icons 2021-05-19 14:08:38 -07:00
scottr 9788caa6cb [cpack_installer] move non-cmake packaging resources into their own folder 2021-05-19 13:48:02 -07:00
moudgils aa79dfbf95 Update hash for 3rdParty cmake file 2021-05-18 21:29:23 -07:00
moudgils a4a22a2cfa Merge branch 'DxcExperiment' of https://github.com/aws-lumberyard-dev/o3de into DxcExperiment 2021-05-18 20:43:07 -07:00
moudgils 1ebb7c405f Merge branch 'main' into DxcExperiment 2021-05-18 20:24:52 -07:00
moudgils 0a2c95cc20 Add Mac's dxc package 2021-05-18 17:42:41 -07:00
scottr b91fc8648d Merge branch 'main' into cpack_installer 2021-05-18 11:51:58 -07:00
scottr 54dc47eb91 [cpack_installer] fixed typo in help string 2021-05-18 11:50:01 -07:00
Steve Pham fed56805f5 Fix issue with layout tool and symlinks on Mac (#791)
* - Fix reversed symlink logic for Non-Windows file systems
- Add additional logic to clear existing symlink if it exists before re-applying

* Update to remove pre-existing reference regardless if its a symlink or not
2021-05-18 10:09:09 -07:00
scottr b45d01919d [cpack_installer] simplify guid generation by using existing project props instead of timestamp in seed value. add bootstrapper specific guids. 2021-05-18 00:22:17 -07:00
scottr 66ad040102 [cpack_installer] some minor comment cleanup 2021-05-17 22:51:48 -07:00
scottr 78d6909bda Merge branch 'main' into cpack_installer 2021-05-17 21:53:11 -07:00
scottr efbb0077b5 [cpack_installer] configure install to be per machine 2021-05-17 21:43:46 -07:00
scottr 37b2ac797d [cpack_installer] bootstrap installer is copied to root of build directory. uploads directory is cleaned before copied to. 2021-05-17 20:52:06 -07:00
moudgils 83f29f4a34 Updated to one Dxc package 2021-05-17 20:39:39 -07:00
scottr 2ddbd36f9a [cpack_installer] add option to specify license url. replicate online artifacts copy 2021-05-17 16:34:24 -07:00
scottr b19779e491 [cpack_installer] cpack variable usage cleanup 2021-05-17 15:28:32 -07:00
Alex Peterson 2d54275cc6 Initial project creation logic
* Add GetProjects, GetProjectTemplates, GetGems
* Redirect python output to AZ_TracePrintf
* Allow creating projects in empty folders
* Enable project creation
2021-05-17 15:07:20 -07:00
Steve Pham 8601ffa27b Set MCPP 3rd Party Package to new OS-specific packages including Linux
- Add MCPP 3PP definition for Linux
- Update mcpp 3PP definition from -multiplatform to -windows on windows
- Update mcpp 3PP definition from -multiplatform to -mac on mac
2021-05-17 14:17:42 -07:00
scottr b3b930d716 Merge branch 'main' into cpack_installer 2021-05-17 08:06:04 -07:00
SJ 2a6938bdf5 Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files 2021-05-14 13:54:17 -07:00
moudgils 9c071c46ac Merge branch 'main' into DxcExperiment 2021-05-14 12:13:53 -07:00
scottr f6b1fac139 [cpack_installer] initial bootstrap installer generation, this bootstrapper is what downloads the artifacts 2021-05-14 12:03:20 -07:00
amzn-sj f759f471bf Remove unused code 2021-05-14 11:15:52 -07:00
lumberyard-employee-dm 8b8a582f02 External Project Build Path Support using SDK Binaries (#690)
* Updated the DynamicModuleHandle code to search within the
SettingsRegistry for the FilePathKey_ProjectBuildPath setting in order
to determine the binary directory for the Project.

This is used to locate shared libraries and executables built by the
project when running and Engine SDK binary from within the Engine SDK

* Added a generation step within the Projects.cmake file to generate a
.setreg file containing the CMake build directory root.
The file is output to the <project-root>/user/Registry/build_path.setreg
file.
This occurs only on non-host platforms when configuring for
non-Monolithic builds, since the Build Directory is used to located the
project binary directory in order to located the project's generated
${CMAKE_BINARY_DIR}/bin/$<CONFIG>/Registry directory containing the
cmake_dependencies.<project-name>.<application-name>.setreg file
containing the list of gem modules to load for a given application

Updated the SettingsRegistryMergeUtils AddRuntimeFilePaths function to
be read in the new "/Amazon/Project/Settings/Build/project_build_path"
and use that to form an absolute path to the project build directory by
appending it to the FilePathKey_ProjectPath key.
That key is set in the 'FilePathKey_ProjectBuildPath' constant
Next updated the SettingsRegistryMergeUtils
MergeSettingsToRegistry_TargetBuildDependencyRegistry function to look
within the project build directory to locate the
cmake_dependencies.*.setreg file to load

Tweaked the Settings Registry merge order of the ComponentApplication,
GameApplication and Settings Registry builder to merge the command line
after merging the global user registry and after merging the project
user registry.
Moved the call to MergeSettingsToRegistry_TargetBuildDependencyRegistry
to occur after the above calls to make sure the properly overriden
projects' user registry was merged in order for the correct project
build path to be stored in the SettingsRegistry

* Added a ProjectConfigurationBinPath key which contains the path to the <build-dir>/bin/$<CONFIG> directory for a project which is used to load gem dlls and the Registry/cmake_dependencies.*.setreg files when using an pre-built Editor/AssetProcessor on an external project

* Fixed variable reference to fileNamePath variable

* Removing the default Project Build Path from the Settings Registry
Runtime Filepaths.

Any paths would have to be set explicitly via .setreg/.setregpatch file
or the --project-build-path parameter

Updated the setting of the project build path and project binary
directory to perform existance checks on the paths before setting the
keys of /Amazon/AzCore/Runtime/FilePaths/ProjectBuildPath and
/Amazon/AzCore/Runtime/FilePaths/ProjectConfigurationBinPath

Added a backup project binary path of
<project-build-path>/bin/$<PLATFORM>/$<CONFIG> which is used if the path
of <project-build-path>/bin/$<CONFIG> has not been found

Fixed compile error in DynamicModuleHandle_Apple.cpp

* UnixLike Platform Build fix for the DynamicModuleHandle code
2021-05-14 13:01:11 -05:00
amzn-sj 05fec17ebd Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files 2021-05-14 10:35:50 -07:00
scottr 6d7f7547ec [cpack_installer] fix incorrect caching type of installer download url and add configure of download info 2021-05-14 08:20:59 -07:00
moudgils b225dcfa79 Update cmake to use the new Dxc binaries for windows 2021-05-12 19:37:44 -07:00
scottr c8d5d45020 Merge branch 'main' into cpack_installer 2021-05-11 18:22:41 -07:00
scottr c777e2e353 [cpack_installer] some cpack cleanup and prep for online installer support (pre/post build steps) 2021-05-11 18:07:19 -07:00
Eric Phister ab8738b7c3 Updating to support Wwise SDK 2021.1.1.X (#686)
* Code updates for Wwise 2021.1.X support.

* [WIP] CMake updates for Wwise 2021.1.X support.

* Updates FindWwise.cmake to search for a Wwise install or let user set it as cache variable.

* Makes Wwise SDK optional, and the AudioEngineWwise Gem will revert to a 'stub' build if no SDK found.

* Adding a .gitignore for Wwise project files.

* Updates a .wcmdline file for integration into Wwise projects.

* Updates the cmake messaging regarding Wwise SDK and smooths out some of configuration scenarios.

* Updates the Wwise project for AutomatedTesting to ver 2021.1.1.7601 and rebuilds banks.
2021-05-11 15:16:32 -05:00
bosnichd 3defbce31b Remove legacy serialization and QPropertyTree (#684)
Remove:
- CryCommon/CryExtension/*
- CryCommon/Serialization/*
- Sandbox/Plugins/EditorCommon/QPropertyTree/*
- All related CryCommon interfaces
- All CrySystem implementations
- Various related Editor classes
2021-05-11 09:31:02 -06:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00
AMZN-stankowi e22debec54 ATOM-15465: Helios rollback AssImp SDK version, this fixes the rotation bug (#608) (#641)
ATOM-15465: Fix issue with incorrect rotation on models.

* Revert "{LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545)"

This reverts commit 06d2050ac4fe6b9d0d0c52e759cf73a9a3f7d3eb.

* bumping version to force assets to reprocess
2021-05-07 10:37:29 -07:00
scottr ff437aadf1 [cpack_installer] windows installer product GUID handling 2021-05-06 17:24:57 -07:00
scottr efe6d24d51 [cpack_installer] new windows installer basic implementation 2021-05-06 15:51:20 -07:00
AMZN-stankowi a7224b6379 Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 (#391) (#560)
Removing FBX SDK, LYN-1045. If you have an issues please reach out to the Helios team.
2021-05-05 09:29:12 -07:00