Commit Graph

369 Commits

Author SHA1 Message Date
Esteban Papp 7cc4cb270f SPEC-7488 Build failure copying 3rdparty Qt files (#1544)
* changing lock

* making the lock smaller
2021-06-24 12:38:27 -07:00
Esteban Papp 7d891edb9a LYN-4780 CMake generation fails on a prebuilt (SDK) engine (#1541)
* fix for some install generation issues around ly_enable_gems

* setting the right SettingsRegistry path for imported targets

* missing "include" in the exported target

* Fixed issue with the GEM_FILE argument being specified in replicated ly_enable_gems call

If the original call to `ly_enable_gems` supplied an argument for GEM_FILE, then in the replicated `ly_enable_gems` call in the install layout CMakeLists.txt, supplied both the GEMS and GEM_FILE argument which are mutually exclusive, due to the `ly_enable_gems` function populating the `ly_enable_gems_GEMS` variable from the content of the `ly_enable_gems_GEM_FILE` file.

Furthermore the install layout does not copy over the file that was parsed by the GEM_FILE argument, so it would point to a non-existent file the install layout.

* Fixed comment

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-23 19:45:32 -07:00
scottr 335d5dc7ed Merge branch 'stabilization/2106' into cpack/2106-upload-fix 2021-06-23 15:16:33 -07:00
Scott Romero 2480dedcd9 [stabilization/2106] Inclusion of 3rd party license manifest file in installer package (#1483) 2021-06-23 14:07:02 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
scottr 46c40d4bfa [cpack/2106-upload-fix] provide bucket owner permissions in upload command 2021-06-22 17:06:43 -07:00
SJ cb2d64b205 Add parameters to specify custom native build path and enable unity build in Android gradle builds (#1494)
* Add parameters to specify custom native build path and enable unity build in Android gradle builds

* Enable unity build for gradle to shorten the path to the generated object files which fixes build failures on Jenkins due to paths exceeding limit. This also speeds up builds.
2021-06-22 15:31:52 -07:00
scottr b3591fbeb8 Merge branch 'stabilization/2106' into cpack/2106-3p-manifest 2021-06-22 14:06:53 -07:00
scottr 46c07055f8 Merge branch 'stabilization/2106' into cpack/2106-3p-manifest 2021-06-22 09:57:11 -07:00
scottr 36929f59ae Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-22 09:52:14 -07:00
scottr 72033a49d7 [cpack/2106-3p-manifest] add 3rd party SPDX license manifest file to package 2021-06-22 09:44:08 -07:00
SJ d5490ecf69 Update AWS android package version to rev4
Merge pull request #1461 from aws-lumberyard-dev/LYN-4593
2021-06-22 09:39:20 -07:00
Esteban Papp bfd266db8f LYN-4659 OSX: Prebuilt Editor and Asset Processor fail to launch (#1446)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file

* fixing lrelease patching in mac/windows

* reverting change and disabling warning, the intention of the test is to compare to unitialized values

* Fix for dxc

* no need to disable the warning, just remove the const

* missing dependency to EditorCommon
2021-06-21 18:24:29 -07:00
scottr 64a960e428 Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main 2021-06-20 20:21:48 -07:00
scottr b089facc23 [cpack/jenkins-main] fixed bug where some resources were not embedded in the bootstrapper 2021-06-20 20:00:23 -07:00
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-20 17:49:23 -07:00
scottr b3a5afe8a3 [cpack/jenkins-main] trailing new line in PackagingConfig.cmake 2021-06-20 17:20:57 -07:00
scottr 587aa58b87 [cpack/jenkins-main] fixed bug with implicit aws upload profile 2021-06-20 15:16:18 -07:00
scottr 25f99bce79 [cpack/jenkins-main] fixed incorrect host name comparison string for python script name 2021-06-20 14:48:48 -07:00
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 2021-06-20 14:31:10 -07:00
scottr 8b68aa9f5a [cpack/jenkins-main] rework build tagging to include git repo info in installer job 2021-06-18 16:55:22 -07:00
Scott Romero 4278013f06 [stabilization/2106] update installer vendor name (#1432) 2021-06-18 15:57:33 -07:00
Scott Romero d66e8d7c06 [stabilization/2106] updated start menu shortcuts generated by the installer (#1421)
Added start menu shortcuts for the Editor and Material Editor
Renamed original "O3DE" start menu shortcut to "O3DE Project Manager"
Updated start menu folder name to include the "[Developer Preview]" tag
2021-06-18 13:36:28 -07:00
amzn-sj 484339c4b8 Update AWS android package version to rev4 2021-06-18 12:56:29 -07:00
Esteban Papp c02345fd71 LYN-4657 OSX: Building AutomatedTesting project fails (#1436)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file
2021-06-18 11:57:37 -07:00
Chris Burel 7486488b60 Update to PhysX 4.1.2.29882248 (#1411)
* Update to PhysX-4.1.2.29882248

* Add maybe_unused attribute for variable not used in the release config
2021-06-18 09:53:22 -07:00
scottr 071ed777bd [cpack/stabilization/2106-jenkins] removed enforcement of aws profile for s3 upload installer artifacts 2021-06-18 08:33:48 -07:00
scottr 6e727e6ab0 [cpack/stabilization/2106-jenkins] various changes to shorten cpack install path on windows 2021-06-18 08:25:03 -07:00
scottr aa583243f6 [cpack/stabilization/2106-vendor-name] update installer vendor name 2021-06-18 07:53:29 -07:00
Esteban Papp 2fa6883455 SPEC-6663 add file(READ files to tracking (#1416)
* adding property to track files read by file(READ

* code review comments

* adding newline
2021-06-17 16:16:10 -07:00
scottr 703c1856ec [cpack/stabilization/2106] updated start menu shortcuts generated by the installer 2021-06-17 15:16:20 -07:00
Esteban Papp 98767862af LYN-4071 Mac compile times are excessive 2021-06-17 13:41:36 -07:00
Eric Phister 35568d97e5 Fixes an issue configuring with external project (#1408)
With engine-centric builds where LY_PROJECTS has paths that sit outside
the engine, there was an erroneous fatal message that would occur.
2021-06-17 15:31:49 -05:00
pappeste 808d31ea32 change the lock to avoid the "IS_NEWER_THAN" check from failing in race conditions 2021-06-17 12:44:49 -07:00
lumberyard-employee-dm 7dabe8b6e9 Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)
* Fixed organization of the AssetProcessor SourceAssetBrowser

Assets within the Engine Root were grouped under a '/' entry.
That has been fixed to use the relative path within the engine root for
those assets
Assets outside of the Engine Root, but on the same drive were using
absolute paths before. Now there are child entries that navigate up the
directory hierarchy to those asset locations

* Added ly_enable_gems call to Atom gems targets that are required

The DefaultLevel.prefab contains several Atom components, that require
the Atom RHI, RPI, Common_Feature, ShaderBuilder and AtomLyIntegration CommonFeatures
gems to be enabled in order to successfully process in the
AssetProcessor.

* Added ly_enable_gems call to make the Camera gem required in Tools,
Builders and Clients.

This is needed as the DefaultLevel.prefab contains an Editor Camera
Component

* Adding the ly_enable_gem call to make the Maestro gem required

CrySystem currently requires Maestro to be enabled in order to
initialize

* Added ly_enable_gems call to the SceneProcessing gem to make it required

The SceneCore and SceneData libraries that are part of the core engine
Code folder requires the SceneProcessing gem to be enabled in order to
invoke the InitializeDynamicModule hooks in DllMain.cpp in order to
initialize those libraries.

* Fixed bad argument in comment for Prefab CMakeLists.txt

* Fixed Assert in Asset Builders due to the Atom RPI Builder

The Atom RPI Builder was enabling the Asset Catalog for the ScriptAsset a second time

The Atom Feature Common EditorSystemCommonComponent.cpp which also loads
in the AssetBuilder is enabling the Asset Catalog for the ScriptAsset

Added BehaviorContext reflection to the OutputDeviceTransformType enum
to fix the BehaviorContext errors about reflecting a method that returns
such an enum

* Added TypeId output to the JsonDeserializer report message about missing
ClassData

Previously the report callback would indicate that the target type was
missing Serialization class data, but didn't indicate the TypeId of the
target type

* Added support to the ly_enable_gems function to be able to support
0 gems being enabled.

Updated the Install step for CMake to propagate any ly_enable_gems
within a CMakeLists.txt for a target into the generated CMakeLists.txt
that is made for each installed IMPORTED target

* Adding newline to the end of the Camera Gem CMakeLists.txt

* Fixing target TYPE parameter for actual Gem Modules to use the GEM_MODULE tag instead of MODULE

* Reverting change to the DESTINATION directory for the installed CMakeLists.txt to use the relative path to the installed directory

* Adding the Atom_Bootstrap gem as a required gem

The Client and GameLaunchers required the Atom_Bootstrap gem in order to create the NativeWindow
Added Atom_Feature_Common client module as a runtime dependency of the AtomLyIntegration CommonsFeature client module

* Fixed register.py --all-projects-path and --all-gems-path arguments to
NOT register projects or gems that are within a template folder
Fixed reading of old pre-1.0 o3de_manifest.json files where the
"engines" key was a json array

* Changed how the relative target source directory is calculated when that source directroy resides outside of the engine root.
The final dirname component is used with a unique SHA256 has to form a <dirname>-<8 char SHA256> folder for installing files into

* Adding newline to the end of Atom_Bootstrap CMakeLists.txt

* Moving ly_enable_gems variants for Tools and Builders inside of PAL_TRAIT_BUILD_HOST_TOOLS block

* Adding a comment to AWSCore.ResourceMappingTool target to indicate that it is not a GEM_MODULE.
Furthermore it cannot be loaded with the Gem system because the library is in a different directory the executable
2021-06-17 13:58:20 -05:00
Eric Phister c0d9db6739 Fixes for SDK include directory structure (#1319)
* Updates the install of SDK includes

Needs some fixes so that public include paths that were going up
directories or had multiple path components would resolve to correct
destination paths during install.

* Updates the logic to fix AutoGen includes

AutoGen headers were a special case because matching relative paths
failed due to the headers existing under the build path.

* Removes trailling slashes from inc dirs

This addresses a quirk in CMake where installing a directory with a
trailing slash has different behavior than one without.  The include
paths being processed had a wide mix of slash or not.

* Update cmake/Platform/Common/Install_common.cmake

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixes fatal errors in the last change

The call to cmake_path IS_PREFIX was ill-formed.  Also the trailing
directory separator was being removed from the DESTINATION but really
needed to be removed from the DIRECTORY.

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-17 10:29:28 -05:00
Esteban Papp 5e64586030 Handle a bug where gp_resolve_item picks up a header file instead of the binary for qt frameworks 2021-06-16 13:39:31 -07:00
Scott Romero 00ebaad9db [stabilization/2106] legal and UX requested changes to installer (#1351)
Updated window size and re-organized elements
Updated product name to include [Developer Preview]
Replaced font type with correct one
Replaced square O3DE logo with full name logo
Reworded and removed checkbox for EULA acceptance
2021-06-16 08:58:15 -07:00
AMZN-stankowi 1fd0886b70 Updated AssImp to v10 for Windows Invert PostRotation matrix in animation chains (#1340) 2021-06-16 08:32:47 -07:00
pappeste daacd25fc9 change STREQUAL to cmake_path(COMPARE 2021-06-15 19:24:13 -07:00
scottr 084430f0c9 [cpack/stabilization/2106] update xml strings to use cmake bracket argument 2021-06-15 19:17:51 -07:00
Esteban Papp 1121299efc Set policy to avoid warnings on runtime dependencies 2021-06-15 18:58:23 -07:00
scottr ba1979b6fc [cpack/stabilization/2106] fixed various text entries getting clipped after reinstalling the font 2021-06-15 18:42:21 -07:00
pappeste 3c10db99e0 Review cleanup 2021-06-15 17:45:29 -07:00
pappeste 6ea8017646 Update qt versions and add missing dependency 2021-06-15 17:33:34 -07:00
Esteban Papp 411bbc8e2f removed the copy of bundles since fixup_bundle does a better job 2021-06-15 17:33:33 -07:00
Esteban Papp 310f1b79dd plugins should be handled by fixup_bundle 2021-06-15 17:33:31 -07:00
Esteban Papp 02dd2138cb improving the check so it doesnt have to be "FALSE" (and can be 0/Off/etc) 2021-06-15 17:33:30 -07:00
Esteban Papp 6e2e187e31 improve incremental 2021-06-15 17:33:28 -07:00
Esteban Papp 4a53d79158 Fixup editor bundle working 2021-06-15 17:33:26 -07:00