Commit Graph

453 Commits

Author SHA1 Message Date
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>
2021-07-22 10:16:17 -07:00
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>
2021-07-21 16:04:01 -07:00
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
2021-07-20 18:00:39 -05:00
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>
2021-07-20 23:16:09 +02:00
Esteban Papp 00f50f2a90 Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-20 09:00:08 -07:00
Axel Nana c333c453c6 Add missing *.hxx pattern
Signed-off-by: Axel Nana <axel.nana@aliens-group.com>
2021-07-20 01:05:09 +01:00
Chris Burel ebfaf269f6 Remove special compiler flags for unsupported VS2017 compiler
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-19 13:30:33 -07:00
Chris Burel da02d47069 Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-19 13:30:31 -07:00
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
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>
2021-07-16 15:25:48 -07:00
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>
2021-07-16 15:07:11 -07:00
Danilo Aimini bf8897551f Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_210716_o3de 2021-07-16 13:22:03 -07:00
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
2021-07-16 13:21:55 -07:00
Steve Pham 6909968ffb Add SPIRVCross for Linux
Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-16 13:18:31 -07:00
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>
2021-07-16 11:22:21 -05:00
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01:00
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>
2021-07-14 17:32:07 -07:00
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>
2021-07-14 13:16:06 -05:00
hultonha 9939913c8d update MSVC to use new lambda processing
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-13 18:23:19 +01:00
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>
2021-07-12 20:22:32 -05:00
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
2021-07-12 15:34:11 -07:00
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>
2021-07-12 13:39:30 -07:00
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>
2021-07-12 11:38:05 -07:00
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>
2021-07-12 10:24:45 -07:00
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>
2021-07-12 10:23:48 -07:00
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00
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
2021-07-09 17:55:15 -07:00
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
2021-07-09 17:28:18 -07:00
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>
2021-07-09 14:58:32 -07:00
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>
2021-07-09 14:25:23 -07:00
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>
2021-07-09 11:57:51 -07:00
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>
2021-07-09 10:34:34 -07:00
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>
2021-07-09 12:19:42 -05:00
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>
2021-07-09 00:41:25 -05:00
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>
2021-07-08 17:20:20 -07:00
Jeongseok Lee ec026963b8 Create 3rd-party directory if not exists (#1877)
Signed-off-by: Jeongseok Lee <jeoslee@amazon.com>
2021-07-07 18:18:48 -07:00
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
John 17fde4e228 Move source of truth logic from TIAF to job 2021-07-05 14:56:48 +01:00
amzn-hdoke 1dfe65a3ef Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-04 15:47:17 -07:00
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>
2021-07-02 21:46:26 -05:00
Mike Chang 497059bea7 Update 3p CDN to https (#1807)
* Update CDN address to https

Signed-off-by: changml <changml@amazon.com>
2021-07-02 15:37:54 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
SJ 5eb0b79417 Increment AWS native SDK Android package version number. This fixes curl library not being copied into APK. (#1728) 2021-07-02 09:46:18 -07:00
Mike Chang 1cf6e6dd10 Change 3p default CDN endpoint (#1749)
Signed-off-by: changml <changml@amazon.com>
2021-07-02 09:27:04 -07:00
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>
2021-07-02 08:24:42 -07:00
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>
2021-07-02 00:22:12 -05:00
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>
2021-06-30 19:51:55 -07:00
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>
2021-06-30 11:19:52 -07:00
Scott Romero 0b3884985e [stabilization/2106] generalize progress screen text and split out download/execution progress (#1654) 2021-06-29 15:57:22 -07:00
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-06-29 15:40:46 -07:00