Commit Graph

786 Commits (f2378fc8d8afd9e97d2b51b0b09e62c70eb8b39b)

Author SHA1 Message Date
Vincent Liu 81966cbcbf
[LYN-5564] Update AWSNativeSDK revision (#3686)
Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
santorac 7a8eb8eda5 Added a new PngImage utility class that wraps libpng. This replaces the use of OpenImageIO in O3DE (although OpenImageIO is still a build dependency for now).
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Esteban Papp 860b28c10b more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c805d443d2 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/IConsole.h
#	Code/Legacy/CrySystem/LocalizedStringManager.h
#	Code/Legacy/CrySystem/XConsole.h
#	Code/Legacy/CrySystem/XConsoleVariable.h
#	Code/Legacy/CrySystem/XML/XmlUtils.cpp
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
4 years ago
Esteban Papp 9e0ff8e55d disabling external headers for analyzer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp d814662810
Fixes renderdoc define
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 6b13e8bfc8 Enabling PreFast to find virtual/override issues, some better organization of files
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 46c6923bf7
Enabling warnings around format security
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Junbo Liang 8edcc504bd
Add AWSI automation tests to a new test suite and pipe (#3913)
Signed-off-by: junbo <junbo@amazon.com>
4 years ago
Esteban Papp 1d4487f4f8 Improvement suggestion from another PR
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp aad2c214a4 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8c51fc24f7 Adding clang warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a63954d6cf simplifying how PIX is passed
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e215dd4423 prevents 3rdParty that are not in the source tree from being installed
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e9dfa3f8dd Enabling warnings in MSVC
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 925bcee0db
Create Deploy Script that can copy a Project Game Release Layout to a standalone location
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e8495cf829 adds equivalent warnign for windows
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 522e4bff9e Merge branch 'development' into cmake/warn_format_security
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
4 years ago
rgba16f [Amazon] 64a561a948
update revision of lz4 package used by o3de (#3911)
* Update windows & android builtin lz4 package version

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update linux builtin packages to use the new lz4 vcpkg

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update Mac & iOS builtins to use the new lz4 vcpkg

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update MultiplayerCompression Gem LZ4Compressor to use the replacement for deprecated LZ4compressHC function

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
Esteban Papp bfdcf74ea0 PR comments/suggestions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 1aa7059d01 generates paks for release
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 9a6a1ba97a fixes monolithic release
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp dc4424b131 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
4 years ago
SJ daf901e809
Set target_file variable since it's still being used in Mac runtime dependencies cmake file (#3905)
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
Esteban Papp 188f54fee0
Fixes Ninja non-multi config generator and potentially other non-multi config generators (#3867)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 26d277cc14 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Lawson 043a2c65ff
Updates zlib to rev2 of the package, static only (#3725)
The previous version of the package was dynamic on some platforms,
and static on others.  This makes it static across the board and
also makes it compatible with other 3p libraries wanting to use
zlib.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 0ad2fe2294
Set enable gem variants feature (#3631)
* Implemented the RFC to allow projects to need to specify the Gems

Projects no longer need to specify CMake Targets to associate a Gem
variant with.

In order to associate a CMake Target with a gem variant a new
`ly_set_gem_variant_to_load` function has been added that maps CMake
Targets -> Gem Variants.

This allows CMake Targets to self describe which gem variants they
desire to build and load

This implementation is backwards compatible:
The `ly_enable_gems` function still accepts the TARGETS and VARIANTS
arguments which it will forward to the new `ly_set_gem_variant_to_load`
function to allow the input Targets to be associated with input Gem
Variants

This changes fixes the issue with gems that are required by an
Application regardless of the Project in use, not replicating it's
"requiredness" to the SDK layout

Fixes #3430

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

* Added an LY_PROJECT_NAME property to the Launcher targets

The `ly_enable_gems_delayed` now command queries the LY_PROJECT_NAME property
associated with each target to determine if the gems being enabled are
match the project the target is associated with.
In this case the target only adds dependencies if the gems is being enabled
without a specific project or if the gems is being enabled for the
matching project.

If the LY_PROJECT_NAME property is not set for target, it indicates the
gems for each project can be added as dependencies to the target.

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

* The INSTALL step now forwards the LY_PROJECT_NAME property for a target

The Install_common.cmake has been updated to support configuring
TARGET_PROPERTIES into the generated CMakeLists.txt for install targets.

Furthermore the indentation of the generated CMakeLists.txt has been
normalized to help with readability

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

* Updating the Atom_Bootstrap CMakeLists.txt to enable the Atom_Bootstrap Gem


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

* Added a deprecation message to ly_enable_gems when supplying TARGETS and
VARIANTS

Added a define_property call for the LY_PROJECT_NAME target property
Removed the .Builders alias for the PrefabBuilder and renamed the
GEM_MODULE target o PrefabBuilder.Builders.

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

* Removed superflous space from AutomatedTesting Gem CMakeLists.txt

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 404d6864fd proper set of CMAKE_INSTALL_PREFIX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-phist f0fc906510
Misc fixes for Linux SDK (#3764)
* Fix rpath for lrelease binary

This fixes the rpath for lrelease which is used to compile the qt translation file.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix a LocalFileIO path casing issue

LocalFileIO was lowercasing the entire path after substituting aliases.
This caused files to not be found and many failures in AP.
Fixed to only lowercase the trailing relative path after the substitution.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removed a message line

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp 2d2a7f4623
XCode doesnt support files per configuration, using the old method (#3789)
- some warn fixes
- fixed release linking issue

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp af9fbc9ae9 this fixes it, but we need to be able to set it properly with a cache variable instead
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 553cf52c86 some install fixes, now I dont see the INSTALL target on projects using the prebuilt-SDK
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 185e7ffbfc get the Platform files for 3rdparty also copied
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac 675af8692d WIP switching from OpenImageIO to libpng.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Esteban Papp 39cf45e544
Setting /permissive- to make MSVC more "standard" (#3701)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp afbc449562
Enabling several warnings in Clang that required just small fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
moraaar fe6238bbb8
Update Blast gem to use newer version of Blast 3p package, which fixes Blast gem on monolithic builds. (#3754)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
AMZN-AlexOteiza 9752fb009a
Added pdbs for python windows in order to allow python/c++ debugging on VS (#3661)
* Added pdbs for python windows in order to allow python/c++ debugging on VS

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Modified other places where rev1 was used

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
4 years ago
Esteban Papp 319f770a64 enabling warns
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0df55c3a7f enabling warn format security and some fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e8fa1dca58
Improves runtime dependencies input dependency (#3665)
Changes how runtime dependencies are hooked as dependencies to create depenedencies to the inputs
This makes it that if an input to the runtime dependencies changes, it gets re-copied (e.g. a 3rdParty changes or a file added through ly_add_target_files)

Closes Issue #3391

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Qing Tao 9fac26e6a6
Update o3de to use new packages of ISPCTexComp and squish-ccr (#3556)
Update package name and hash
Add compressor names.
Update ImageProcessingAtom unit tests.
Removed some unused test assets under ImageProcessingAtom
Enalbe ISPC to all the platforms.
Better error message with compression/decompression
Add temp folder to git ignore
added ispccompressor for all platform. valid it with linux
Update windows package hashes.
Removed AZ_TRAIT_IMAGEPROCESSING_USE_ISPC_TEXTURE_COMPRESSOR
Minor refactor with image processing unit tests.

Signed-off-by: qingtao <qingtao@amazon.com>
4 years ago
Esteban Papp 906ace3d03 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
bosnichd 040b75c02c
Fix PAL.cmake logic, thanks to lumberyard-employee-dm! (#3516)
* Fix PAL.cmake logic, thanks to lumberyard-employee-dm!

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Lowercase the platform name to address review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
Esteban Papp ae4cfc3bd3 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
4 years ago
Esteban Papp b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have 4 years ago
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
4 years ago
amzn-phist 9f6434fc68
Fix an issue with project-centric ninja builds [Linux] (#3429)
* Fix an issue with project-centric ninja builds

Normalizes relative paths when adding engine.json as a cmake configure dependency.
It should match the dependency added later which uses absolute path.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix typo

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp b1246dcc08
CMakeLists.txt frrom templates are not being installed (#3456)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
4 years ago
Esteban Papp f22ecc7830 of course, was disabling/enabling the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f94043dc83
Adds functions so targets can define install directories/files 4 years ago
Esteban Papp d7fda783a8 improves comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0f3381a7a7 required warning to disable until we get to the right MSVC version
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h
4 years ago
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
Esteban Papp dc8b48601c PR comments/improvements
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b609d5e2cb supporting multiple directories
automatically excluding obvious things
cleanup and verification

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-phist c66dcc7413
Fix rpaths during o3de sdk install on Linux (#3370)
* Fix rpaths during o3de sdk install on Linux

Adds install code that modifies ly_copy commands to fix rpaths for things like qt plugins.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Add newline at end of file

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update to use bracket argument

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Minor edit

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Move the string configure call to inside override

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp 8c526eeeb6 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac b23a70ff42
Merge pull request #3338 from aws-lumberyard-dev/santorac/RapidJSON_3rdParty
Moved RapidJSON to 3p-package-source
4 years ago
Esteban Papp 2dbac8fe25 addressing comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 45dcbb96ba enable more warnings for MSVC
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp fb75e35700 enabling MSVC warning to match clang warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false 4 years ago
Esteban Papp 8bc9ed3d01
removing some rad leftovers (#3366)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac 47758ab7a6 Updated RapidJSON package name and hashes.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac dad24fb927 Updated the RapidJSON hashes again due to iteration on my 3p-package-source changes.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
rgba16f [Amazon] e889bba963
Remove unused hdf5 3rdParty package from the known packages list (#3295)
* Remove unused hdf5 3rdParty package from the known packages list

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
rgba16f [Amazon] 983f187121
update used dxc package to revision 3 (#3317)
* Update Mac build to use rev3 of dxc package

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update linux DXC package version requested

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update windows DXC package revision requested

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
Esteban Papp a97bccbf38 some fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac ab516904e6 Merge branch 'development' into santorac/RapidJSON_3rdParty 4 years ago
Esteban Papp 61f7fe5dc5 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac 1d3f8a5f55 Update RapidJSON package hash after adding readme.txt to the package.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Esteban Papp 68b04fa6c1 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/LegacyAllocator.h
4 years ago
santorac a1edb9e036 Updated build scripts to use new 3rdParty package for RapidJSON.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
Esteban Papp a1b59e5e5e install reorg/cleanup
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
Profiler spring cleaning
4 years ago
John e0b2027b42 Erase existing artifacts before generation.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Jeremy Ong ec6e9407f6 Remove RAD (pending future interface for external profiler registration)
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong a5f072f7a9 Remove statistics profiler
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong d15d40fec6 Add Windows PIX runtime support
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp 1e136a02b0 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/Crcfix/crcfix.cpp
4 years ago
Junbo Liang 401d0c1ad5
Update the AWSNativeSDK version and hash for Mac (#3259) 4 years ago
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
4 years ago
Esteban Papp fb05beffe3
Change LY_UNITY_BUILD default to "ON" (#3244)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 964c2401df Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 230e0c6976 remove disabling of some warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste f99a21e733 last one!
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 58f8b563d0 fix them all
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste e648dbcf08 enabling the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
jonawals 5925bd22f6
Further subdivide TIAF data by suite. (#3128)
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
4 years ago
Steve Pham 87ae7e8653
Fix android gradle scripts to prevent cmake_dependencies.<game>.<game>_gamelauncher from being wiped out of the APK
Update gradle script generation to correct task dependencies (#3120)
- copyNativeArtifacts must run after syncLYLayoutMode
- syncLYLayoutMode must must after externalNativeBuild

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Esteban Papp b4f6dc5bff fixes after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f7da64a518 Allowing to build with ASan enabled
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Esteban Papp c484e685d1
SPEC-2513 Fixing w4018 4 years ago
Esteban Papp 181998f810
Fixes a nightly build and a CMake warning (#2941)
* Addressing CMake warning and removing timeouts that are the same as the default

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* missed this one

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Making it an error so developers stops putting timeouts longer than the allowed one since it causes AR issues

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixing warning from the nightly build

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* disabling test that is triggering a timeout

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Scott Romero 8d0f9f4114
[development] updated file regex when uploading latest tagged installer (#2987)
The "Latest" tagged installer uploads were failing the file filter because the upload script now collects files as full path before performing the regex.

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
4 years ago
hultonha 01ed06c7e1
Implement TIAF sequence reporting for MARS
Merge pull request #3010 from aws-lumberyard-dev/TIF/Runtime_merge
4 years ago
SJ 44b053df58
[Mac] Building and running game projects from an SDK (#2943)
* 1. Initial support for loading dylibs outside the bundle.
2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified).
3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep.
4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures.
With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove debug messages.
2. Fix license
3. Pass parent's environment variables to child processes by default(on Mac).

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some feedback from review

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
John c2a2d1c5c7 Add changes from TIF/Feature branch.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Nicholas Lawson cf7681df27
Updates the zlib that O3DE uses to the one in 3p-package-source (#2861)
* Updates o3de to use the new zlib packages.

Packages were uploaded for every supported platform.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
4 years ago
pappeste b4bf775647 enable the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
Scott Romero 96740ba74d
[development] installer work - added 'files in use' page and fixed toolset path propagation (#2855)
Enable files in use dialog in bootstrap installer to close running o3de tools during uninstall or repair
Fixed installer toolset path propagation after variable name change

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
Esteban Papp d03c2c9977
Copy jinja/py files to the install folder (#2643)
* Copy jinja/py files to the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* code review comment

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* moving AzAutoGen to cmake folder and removing the header-only project

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Ken Pruiksma da24323508 [SPEC-7794] Removing references to alembic in cmake & asset processor.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
4 years ago
Esteban Papp 902bdeb6d6
Create RUN target as helpers for the project-centric workflow (#2520) (#2635)
* Create RUN target as helpers for the project-centric workflow

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* typo fix

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* rename target as "<target>.Imported" and create "<target>" as the metatarget that is used for debugging and building in o3de

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f0cafd0e9d
Create RUN target as helpers for the project-centric workflow (#2520)
* Create RUN target as helpers for the project-centric workflow

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* typo fix

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* rename target as "<target>.Imported" and create "<target>" as the metatarget that is used for debugging and building in o3de

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 0040c7fd9b
Tweak test projects so the console window remains open (#2380)
* tweak test projects so the console window remains open

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* doing it for all test projects

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* newline at the end of the file to make devs happy

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 433aec4f34
Disabling this since the fast checkup in VS doesnt solve what this was hoping to solve, we need to emit and add as dependencies all the includes involved in autogen (#2383)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 2560e2392f enable the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-phist 7b7adb8573
Don't require a specific version of Wwise SDK, allow for later versions to be used (#2484)
* Updates the Wwise SDK detection in CMake

Parses AkWwiseSDKVersion.h to obtain the version instead of requiring an
exact version to be installed.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates readme.md information about Wwise

Rewrite some of the setup info about Wwise, mention the two ways in
which Wwise can be found via CMake and that users can install later
versions than the one specified.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove unnecessary parts of Wwise version detect

Don't need to parse the file contents, it was only being used to print a
message to CMake.  Simplify the validation to just checking that the SDK
version header exists.  Maybe in the future we can reinstate better
version checking to make sure the version falls within a range.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates capitalization of Audiokinetic name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp a20588952e
disable vcpkg for every project (#2507)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp da474357f3
Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* handling case where a parameter can be empty

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Steve Pham e81f59d1e1
Create XCB Connection mechanism for WSISurface implementation for Linux (#2400)
- Add new Linux Trait to determine which display driver client API to use (only xcb supported for now)
- Add support for xcb connections (initial) for Linux/Vulkan
- Fix minor assertion caused by wrong use of sizeof
- Fix casing issue in a couple of material files (Linux is case sensitive)
4 years ago
Royal OBrien a12defcb30
Merge pull request #2364 from AMZN-scspaldi/scspaldi_LyTTTestsforLinux
Made LyTT Tests check if they are disabled for the platform.
4 years ago
Esteban Papp 70c9ed93f8
Make locations for LY_PACKAGE_DOWNLOAD_CACHE_LOCATION and LY_PACKAGE_UNPACK_LOCATION relative to LY_3RDPARTY_PATH across configurations (#2360)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
scspaldi 2de3a5e6d7 Made LyTT Tests check if they are disabled for the platform.
Signed-off-by: scspaldi <scspaldi@amazon.com>
4 years ago
Esteban Papp a007f1a462
Issues/2126 PhysX Gem can't be used as build dependency in engine SDK Part (#2337) (#2340)
* Applying GENEX_EVAL to 2 cases where the genex can produce another genex

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Missing case when the folder is an external one to the engine/project (e.g. external gems)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Steve Pham 4d5a985276
Enable AZSLc and Shader Compilation on Linux (#2338)
* Enable Shader Compilation support for Linux
* Add azslc package 3P definition for download
* Add AzslcGeader.azsli nad PlatformHeader.hlsli for Linux/Null and Linux/Vulkan (Copy of Android/Vulkan)
* Enable trait PAL_TRAIT_BUILD_ATOM_ASSET_SHADER_SUPPORTED for Linux
* Add platform builder file dependencies
* Updated AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC to use new 3P linux version of azslc
* Add AtomShaderCapabilities.json, PlatformLimits.azasset for Linux (Copy from Android)
* Fix paths/values for Vulkan_Traits_Linux.h
* Enable trait PAL_TRAIT_BUILD_ATOM_ASSET_SHADER_SUPPORTED for Linux
* Enabled AZ_TRAIT_ATOM_VULKAN_LAYER_LUNARG_STD_VALIDATION_SUPPORT for Linux/Vulkan
* Added AzslcHeader.azsli, PlatformHeader.hlsli dependencies for Linux/Null and Linux/Vulkan in the platform builders for windows and mac for consistency

Signed-off-by: spham-amzn <spham@amazon.com>
4 years ago
Esteban Papp fc1ccb9e85
Issues/2126 PhysX Gem can't be used as build dependency in engine SDK Part (#2337)
* Applying GENEX_EVAL to 2 cases where the genex can produce another genex

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Missing case when the folder is an external one to the engine/project (e.g. external gems)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
L4stR1t3s cf2effc58c
Ninja compile and link pool CMake settings (#2334)
* Ninja compile and link pool CMake settings

Signed-off-by: L4stR1t3s <69721170+L4stR1t3s@users.noreply.github.com>

* Added CMake cached variables for Ninja compile/link pool settings

Signed-off-by: L4stR1t3s <69721170+L4stR1t3s@users.noreply.github.com>
4 years ago
lumberyard-employee-dm c6054cd03a
Merge pull request #2307 from aws-lumberyard-dev/fix_cmake_python_local
Fixed cmake Python so it correctly reinstalls a local python package if its setup.py changes
4 years ago
Garcia Ruiz 54cfd26b6c Fixed cmake Python so it correctly reinstalls a local python package if its setup.py changes
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>
4 years ago
lumberyard-employee-dm 69bd0e8519
Merge pull request #2290 from aws-lumberyard-dev/cherry-pick-Issue2282-hxx-pattern
Cherry-Pick: Add missing `*.hxx` pattern
4 years ago
Esteban Papp 00f50f2a90
Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Axel Nana abce54b3cd Add missing `*.hxx` pattern
Signed-off-by: Axel Nana <axel.nana@aliens-group.com>
4 years ago
Scott Romero afb57c9cf6
[stabliziation/2106] update 3rd party license file name to be pulled into the installer package (#2281)
License file name was changed in #2267

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Axel Nana c333c453c6
Add missing `*.hxx` pattern
Signed-off-by: Axel Nana <axel.nana@aliens-group.com>
4 years ago
Chris Burel ebfaf269f6 Remove special compiler flags for unsupported VS2017 compiler
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel da02d47069 Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Terry Michaels d9ec159f0e
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
4 years ago
Steve Pham 38261d0800
Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Steve Pham 18611a95eb
Update qt package hash for Linux
Update to pull in fixed Linux QT Package to resolve missing runtime dependencies
Signed-off-by: spham-amzn <spham@amazon.com>
4 years ago
AMZN-ScottR ae60bd0167 [installer/2106-font] revert back to default install bootstrapper font
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Danilo Aimini bf8897551f Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_210716_o3de 4 years ago
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
4 years ago
Steve Pham 6909968ffb
Add SPIRVCross for Linux
Signed-off-by: spham-amzn <spham@amazon.com>
4 years ago
lumberyard-employee-dm 67c37762a3
Fixed iteration of the gem_assets_paths variable in the (#2222)
Install_common.cmake to make sure the the Gem assets are copied to the
install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 4 years ago
SJ 7eeaf7dad5
Generate install layout for Mac (#2144)
* 1. Move call to install(TARGETS...) to its own function to create a platform specific implementation for Mac.
2. Add linker-signed flag to work around cmake install issue.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add newline

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Rename function to ly_install_target_override and only call it if it has been implemented.
2. Pass in runtime, archive, and library directory paths as params to clean it up a bit.

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
lumberyard-employee-dm fcef9333a7
Fixed creation of paths in the install layout for external source paths (#2152)
* Fixed creation of paths in the install layout for external source paths

Any source path that is not within the engine root is now copied to an
External directory within the engine root

Updated the gem copy regex to include the preview.png file and Editor/Scripts directory

Added an ly_add_install_paths function for installing a list of paths to
the install layout

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

* Moved the ly_get_last_path_segment_concat_sha256 and
ly_get_engine_relative_source_dir functions to cmake/FileUtil.cmake

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
hultonha 9939913c8d update MSVC to use new lambda processing
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
lumberyard-employee-dm 158e25bd23
ly_create_alias() now adds the directory it was called from to the (#2120)
LY_ALL_TARGET_DIRECTORIES property if that directory has not already
been added

This addresses an issue where if a CMakeLists.txt contains a call to
ly_create_alias(), but NOT a call to ly_add_target, it would not be
added to the generated CMakeLists.txt for the install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Scott Romero b7723ad0ea
[stabilization/2106] Auto generate installer 3rd party license URL from version string (#2111)
3rd party license URL is now auto generated from the version string (which should be synchronized with the GitHub release tags) and pulled directly from the source repo it originated from, but only when the version is non-zero.  This also fixes an issue where configure would fail when the previous 3rd party URL wasn't supplied
Fixed an issue where CrashHandler required version strings to be 4 components

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Esteban Papp afe661cacd
Add support for VS2022 (#2065)
* Add generation code for VS, cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Remove unused code and fixed comments of what is supported

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Code review comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-ScottR 585caabd95 [installer/2106-3p-license-fix] replaced 3rd party license url arg with auto generated one from version string
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Esteban Papp f83439e6c4
Add Vcpkg settings to map configs to what vcpkg expects (this prevents a message from being issue when vcpkg is installed) (#2063)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a8435ec982
Issues/2045 3rdParty runtime dependencies copied multiple times (#2058)
* 3rdParty runtime dependencies copied multiple times

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* 3rdParty to update timestamps when uncompressing to provoke copy of runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* typo fix

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Scott Romero 61d5d5afa2
[stabilization/2106] upload a copy of the bootstrap installer to the 'latest' folder for tagged builds (#2046)
A build tag file with the commit info is included in the 'latest' upload
Silenced output of upload script

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Scott Romero a67ec5cb5e
[stabilization/2106] update desktop shortcuts created by the installer (#2037)
Changed the existing desktop shortcut for Project Manager to include tool name and dropped version number for consistent branding
Added desktop shortcut for the Editor

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
AMZN-ScottR 9b72b71aa0 [installer/2106-latest-upload] also upload a copy of the boostrapper to the 'latest' folder for tagged builds
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Esteban Papp 4f628cfb77
Fix for alias not understood in generation expressions that query properties (#2034)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-ScottR 3e7f99812a [installer/2106-desktop-shortcuts] update desktop shortcuts created by the installer
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Steve Pham 4826f1b653
Fix RPATH issues for qt/plugin binaries (#2018)
- Add special handling for shared objects copied from qt/plugins to correct the RPATH to reflect destination folder

Signed-off-by: spham-amzn <spham@amazon.com>
4 years ago
lumberyard-employee-dm e06ec2caa9
Fixed cmake configuring when using an External Gem (#2020)
The ly_get_absolute_pal_filename method has been refactored to no longer
use regular expressions to determine how to split a PAL directory, but
instead Path operations are used

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 097dc25424
Fixed the discovery of the dependencies of gem variant aliases which (#2013)
alias INTERFACE LIBRARY targets.

This was causing the dependent Atom_AtomBridge sub gems from not being
found when generating the cmake_dependencies.*.setreg file containing
the list of gem modules to load

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp d7c8c0192f
SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742)
* copy frameworks to output for loose file case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* patching lrelease

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for python in loose files and bundles

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* found what the problem is, setting a version just in case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Trying to ignore other files to solve Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix some qt stuff for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of cstemp files to prevent signature failures

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Jeongseok Lee ec026963b8
Create 3rd-party directory if not exists (#1877)
Signed-off-by: Jeongseok Lee <jeoslee@amazon.com>
5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
John 17fde4e228 Move source of truth logic from TIAF to job 5 years ago
amzn-hdoke 1dfe65a3ef
Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
5 years ago
lumberyard-employee-dm d73a98aa2f
Added detection of gems which are not directly under an external subdirectory root (#1841)
* Added proper detection of the list of Gems in the Project Templates
enabled_gems.cmake file

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

* Added a CMake alias target for the Atom Gem and the AtomLyIntegration

Both of those targets just aliases the Atom_AtomBridge gem
Therefore they turn on Atom

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

* Replacing the Atom_AtomBridge gem in the project template with the Atom gem

The Atom gem is just an alias to the Atom_AtomBridge gem

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

* Updated the manifest.py gem gathering logic to recurse through the external subdirecotories locating gem.json files to discover all gems in a subdirectory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Mike Chang 497059bea7
Update 3p CDN to https (#1807)
* Update CDN address to https

Signed-off-by: changml <changml@amazon.com>
5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
SJ 5eb0b79417
Increment AWS native SDK Android package version number. This fixes curl library not being copied into APK. (#1728) 5 years ago
Mike Chang 1cf6e6dd10
Change 3p default CDN endpoint (#1749)
Signed-off-by: changml <changml@amazon.com>
5 years ago
amzn-hdoke d365ff51d6
[AWS][Gems] Fix for Linux Release Monolithic Builds (#1739)
* Add missing 3rd party deps to Metrics gem

Signed-off-by: dhrudesh <dhrudesh@amazon.com>

* Set AWSNativeSDK-linux revision to 5

Signed-off-by: dhrudesh <dhrudesh@amazon.com>
5 years ago
lumberyard-employee-dm 2478c60793
Fixed several o3de python package and install layout issues (#1714)
* Updated the CrashLog directory path to save to the project user
directory instead of the engine-root directory

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

* Removing the custom OUTPUT_NAME for the Multiplayer Gem Builder target

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

* Changed the default value for the LY_3RDPARTY_PATH cache variable to be
~/.o3de/3rdParty

This simplifies the first time user experience when running cmake

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

* Fixed Windows only issue where using creating a VS Solution for an O3DE project on a different drive resulted in an unloaded "<drive letter>:" entry appearing in the solution explorer

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

* Refactored install layout logic for External Subdirectories

Instead of performing a regular expression over the Gems/* directory, now the each external subdirectory including the project (external) directory is recursied over and scanned for any folders that aren't excluded.
By default those folders are the [Cc]ache, [Bb]uild and [Uu]ser directories

Afterwards the list files to copy over are then split into a directory list and a file list that is filtered by an include regex
Next the directory list is iterated over and the directories are copied to the install layout
Finally the file list is iterated and the list of files are also copied to the install layout

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

* Fixed the o3de.bat script changing the working directory before running the o3de.py script

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

* Fixed exception in engine-template.py script when the create-gem command
is invoked with the --template-name parameter that does not correspond
to a registered Template

Updated the create-project command to register the project with the
o3de_manifest.json and the engine with the project as the final step

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

* Fixed register.py over-registration of non-engine directories when then
--this-engine parameter is supplied.
All the projects, gems and templates inside of the default o3de_manifest
folder locations were being registered with the engine that was being
registered

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

* Fixed register.py register_project_path() method to return 0 when the
project path is successfully registered.

This issue was that the save_o3de_manifest method "return" value was
being checked and that method doesn't actually return a value

Added question mark to the engine_template.py to correct text around
notifying the user if the project was registered

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

* Added doc comment on the new cmke ly_get_vs_folder_directory function()

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

* Added clarifying comment to the ly_setup_others() command logic to copy over directories and files from any external subdirectories(Gems) that are registered with the engine at the time of install

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

* Fixed infinite recursion when trying to create a template with the
source directory used to seed the template

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
5 years ago
AMZN-ScottR 60f38b0c30 [cpack/2106-install-path] update default install path and provide warning about 'Program Files'
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Scott Romero 0b3884985e
[stabilization/2106] generalize progress screen text and split out download/execution progress (#1654) 5 years ago
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
AMZN-ScottR 73c0efbd90 [cpack/2106-progress-screen] generalize progress screen text and split out download/execution progress
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
John c145a9a74a Add missing files from addressing PR comments
Signed-off-by: John <jonawals@amazon.com>
5 years ago
AMZN-stankowi 0095e5aa6a
Updated AssImp to rev11, latest build for all platforms (#1563) 5 years ago
John 478ffeeac6 Remove PythonCoverage runtime component
Signed-off-by: John <jonawals@amazon.com>
5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
scottr 1f68d58213 [cpack/2106-launch-opt] add option to launch the project manager after install 5 years ago
Scott Romero 46a82a84fb
[stabilization/2106] enable higher compression of installer artifacts (#1575)
Increasing the cab file compression lowers the total windows installer size by another 0.4 GB in its current form at the traded cost of on a few extra minutes (~5 vs ~10 min on an i7-4790k) to generate them.

Additionally, upping the max pre-compression cab file size to 350 MB (from 200 MB) lowers the total number of files by nearly half while still maintaining a reasonable per-cab files size post-compression.
5 years ago
scottr 75dc5be724 [cpack/2106-compression] enable higher compression of installer artifacts 5 years ago
Esteban Papp 7cc4cb270f
SPEC-7488 Build failure copying 3rdparty Qt files (#1544)
* changing lock

* making the lock smaller
5 years ago
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>
5 years ago
galibzon 01b2079790
[ATOM-15801] AZSLc NoMSAA translation needs to initialize the third (#1529)
argument of GetDimensions() to 1

azslc v1.7.23

Signed-off-by: garrieta <garrieta@amazon.com>
5 years ago
scottr 335d5dc7ed Merge branch 'stabilization/2106' into cpack/2106-upload-fix 5 years ago
Scott Romero 2480dedcd9
[stabilization/2106] Inclusion of 3rd party license manifest file in installer package (#1483) 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
scottr 46c40d4bfa [cpack/2106-upload-fix] provide bucket owner permissions in upload command 5 years ago
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.
5 years ago
scottr b3591fbeb8 Merge branch 'stabilization/2106' into cpack/2106-3p-manifest 5 years ago
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
5 years ago
scottr 46c07055f8 Merge branch 'stabilization/2106' into cpack/2106-3p-manifest 5 years ago
scottr 36929f59ae Merge branch 'stabilization/2106' into cpack/jenkins-main 5 years ago
scottr 72033a49d7 [cpack/2106-3p-manifest] add 3rd party SPDX license manifest file to package 5 years ago
SJ d5490ecf69
Update AWS android package version to rev4
Merge pull request #1461 from aws-lumberyard-dev/LYN-4593
5 years ago
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
5 years ago
scottr 64a960e428 Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main 5 years ago
scottr b089facc23 [cpack/jenkins-main] fixed bug where some resources were not embedded in the bootstrapper 5 years ago
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 5 years ago
scottr b3a5afe8a3 [cpack/jenkins-main] trailing new line in PackagingConfig.cmake 5 years ago
scottr 587aa58b87 [cpack/jenkins-main] fixed bug with implicit aws upload profile 5 years ago
scottr 25f99bce79 [cpack/jenkins-main] fixed incorrect host name comparison string for python script name 5 years ago
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 5 years ago
scottr 8b68aa9f5a [cpack/jenkins-main] rework build tagging to include git repo info in installer job 5 years ago
Scott Romero 4278013f06
[stabilization/2106] update installer vendor name (#1432) 5 years ago
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
5 years ago
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 5 years ago
amzn-sj 484339c4b8 Update AWS android package version to rev4 5 years ago
Esteban Papp c02345fd71
LYN-4657 OSX: Building AutomatedTesting project fails (#1436)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file
5 years ago
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
5 years ago
scottr 071ed777bd [cpack/stabilization/2106-jenkins] removed enforcement of aws profile for s3 upload installer artifacts 5 years ago
scottr 6e727e6ab0 [cpack/stabilization/2106-jenkins] various changes to shorten cpack install path on windows 5 years ago
scottr aa583243f6 [cpack/stabilization/2106-vendor-name] update installer vendor name 5 years ago
John e4d4f8555b Merge branch 'development' into TIF/Runtime 5 years ago
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
5 years ago
scottr 703c1856ec [cpack/stabilization/2106] updated start menu shortcuts generated by the installer 5 years ago
Esteban Papp 96da6c6438
LYN-3244 Remove ebp_sanity_smoke_no_gpu (#1386) 5 years ago
Esteban Papp 98767862af
LYN-4071 Mac compile times are excessive 5 years ago
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.
5 years ago
pappeste 808d31ea32 change the lock to avoid the "IS_NEWER_THAN" check from failing in race conditions 5 years ago
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
5 years ago
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>
5 years ago
Esteban Papp 5e64586030 Handle a bug where gp_resolve_item picks up a header file instead of the binary for qt frameworks 5 years ago
John 15bf2d20ed Merge branch 'development' into TIF/Runtime 5 years ago
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
5 years ago
AMZN-stankowi 1fd0886b70
Updated AssImp to v10 for Windows Invert PostRotation matrix in animation chains (#1340) 5 years ago
pappeste daacd25fc9 change STREQUAL to cmake_path(COMPARE 5 years ago
scottr 084430f0c9 [cpack/stabilization/2106] update xml strings to use cmake bracket argument 5 years ago
Esteban Papp 1121299efc Set policy to avoid warnings on runtime dependencies 5 years ago
scottr ba1979b6fc [cpack/stabilization/2106] fixed various text entries getting clipped after reinstalling the font 5 years ago
pappeste 3c10db99e0 Review cleanup 5 years ago
pappeste 6ea8017646 Update qt versions and add missing dependency 5 years ago
Esteban Papp 411bbc8e2f removed the copy of bundles since fixup_bundle does a better job 5 years ago
Esteban Papp 310f1b79dd plugins should be handled by fixup_bundle 5 years ago
Esteban Papp 02dd2138cb improving the check so it doesnt have to be "FALSE" (and can be 0/Off/etc) 5 years ago
Esteban Papp 6e2e187e31 improve incremental 5 years ago
Esteban Papp 4a53d79158 Fixup editor bundle working 5 years ago
Esteban Papp e7d8699293 passing plugin dirs 5 years ago
Esteban Papp b5c7a35442 working with fixup bundle and incrementals of 1s 5 years ago
pappeste 355c5ced1f fixing runtime dependencies for cases with multiple values 5 years ago