Commit Graph

673 Commits

Author SHA1 Message Date
Steve Pham 0e8edfa702 Update OpenMesh for Windows and prepare for Linux and Mac (#5248)
- Update to OpenMesh-8.1-rev3 for Windows
- Add OpenMesh-8.1-rev3 for Linux but not enabled
- Add OpenMesh-8.1-rev3 for Mac but not enabled

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-03 11:37:28 -07:00
Esteban Papp 458dad8e47 Making paths consistent (PR comment)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-02 17:05:47 -07:00
Esteban Papp c54331dee5 Cherry-picked 3334f5eb91
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-02 16:41:28 -07:00
Esteban Papp 958c4c7920 Cherry-picked c9f4600bf3
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-02 15:24:06 -07:00
Esteban Papp bf0a309a3c copy commands need to be per permutation/per configuraiton (#5183)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-01 15:18:30 -07:00
Esteban Papp 2cc4f322b7 Skips signing when there is no upload URL (#5120)
* Skips signing when there is no upload URL so we can run the scripts locally

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

* Fixes prebuild command and improves post build command to not depend on psiexec

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-01 11:06:04 -07:00
Esteban Papp 8c0dbe4b33 missed escaping these variables and breaks runtime dependencines in the install layout (#5149)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-30 12:39:40 -07:00
Esteban Papp de4658b16c Corrects mistake naming the override commands (#5140)
* corrects mistake naming the override commands

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

* fixes PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-29 14:25:13 -07:00
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 18:29:52 -07:00
Esteban Papp 60e14d3a4c Fixes PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 18:17:26 -07:00
Esteban Papp 4dcd60ba08 testing changes to fix Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 17:49:31 -07:00
lumberyard-employee-dm b9147c60a0 Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)
* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

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

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-28 13:45:19 -05:00
Esteban Papp c82f97c03c Moves the inclusion of the platform-specific install files to the end of cmake/Install.cmake so the install wrapper functions are available
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-27 16:59:39 -07:00
Esteban Papp b48073b171 fixes PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-27 14:41:00 -07:00
Esteban Papp 46fc1a720c Fixes monolithic and non-monolithic installed builds (test project builds against debug/profile non-monolithic and release monolithic)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-27 13:04:10 -07:00
Esteban Papp b7b79efd69 fixes monolithic vs non-monolithic installation (generates, monolithic doesnt build)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-27 10:17:27 -07:00
Chris Burel e4c69a29fa [Linux] Update Qt package to include xcb GL integration plugin (#4976)
Fixes #3132.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-10-26 18:45:33 -05:00
Esteban Papp fec1b2fda2 Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
#	cmake/Platform/Common/Install_common.cmake
2021-10-25 12:47:36 -07:00
Esteban Papp 595e0e1a83 better wrapping for install in core components
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-22 20:38:52 -07:00
AMZN-Phil 04033b088a Fix desktop shortcuts created by Windows installer
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-22 16:12:18 -07:00
Esteban Papp c345733057 improving some text messages
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-22 15:30:32 -07:00
galibzon 63140dc247 Atom/galibzon/atom 4608/inline to root constant (#4897)
* Changed references to "InlineConstant" to "RootConstant".

Updated AZSLC to version 1.7.34  for mac,  linux & windows

Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-22 05:52:50 -05:00
Esteban Papp 2fe1e51346 generated a package for debug/profile/release monolithic-profile/release
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-21 18:40:31 -07:00
AMZN-AlexOteiza ea442b80d1 Renamed ctest_pytest.ini to pytest.ini so it is used by default, added TestSuite_ as collection file (#4822)
* Fixed warnings of unused marks, renamed ctest_pytest.ini to pytest.ini to better consistency on runs

* Fixed some test suites to run propertly

* Fix missing arguments

* Fixed missing cmakelists and renamed missing file

* Temp disable editor_testing_tests as timeout in jenkins
2021-10-21 22:03:18 +01:00
Esteban Papp 83af2cdaac Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-18 16:13:56 -07:00
Esteban Papp c842fce4bf WIP, need to merge from development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-18 16:13:35 -07:00
Esteban Papp 3deaed5733 Enable cmake-install in project-centric / engine-prebuilt (#4767)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-18 15:56:59 -07:00
Esteban Papp 5df85534b7 Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Packaging.cmake
#	cmake/Projects.cmake
#	scripts/build/Platform/Windows/build_config.json
2021-10-18 14:30:02 -07:00
Nicholas Lawson 5ba30f9a37 Update tiff to the new package revision (fixes IOS TIFF package) (#4638)
The new tiff package works for all platforms, including android and IOS, which had issues before.
Android - was missing tiff.h
ios - wrong minimum ios revision
2021-10-13 13:46:20 -07:00
Artur K 80db67e90a Remove many unused variables and unused setting files (#4607)
* Remove many unused variables and unused setting files

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove a few more dead config vars

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-10-12 17:06:15 -05:00
Qing Tao e64b9d3536 ATOM-16320 Remove PVRTC and ETC compressor (#4557)
Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-07 16:23:13 -07:00
AMZN-Phil 4e3711f643 Merge pull request #4531 from aws-lumberyard-dev/InstallerShortcutsFix
Update wix installer folders to match the new binary locations.
2021-10-06 14:10:33 -07:00
Vincent Liu ba107c06b6 [LYN-6779] AWSNativeSDK update and AWSCore platform cmake update (#4231)
Signed-off-by: onecent1101 <liug@amazon.com>
2021-10-06 14:02:28 -07:00
AMZN-Phil 39cf3f51cc Update wix installer folders to match the new binary locations.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-06 11:43:41 -07:00
Nicholas Lawson 977d58e1a8 Update ZLIB min req osx ios and android to reasonable limits (#4473)
This also updates the name of the zlib library to uppercase ZLIB which conforms to normal CMake standards .
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-10-05 15:20:26 -07:00
lumberyard-employee-dm 14474dbac7 Swapped the order in which the engine.pak is searched (#4455)
* Swapped the order in which the engine.pak is searched

First the Project Cache Root folder is searched before falling back to
the Executable Directory

Removed the need for the engine.json and project.json in a project
release layout when a "Cache" directory exist at the root.
The project root uses the the first "Cache" directory it finds by scanning upwards as if fails to find a
project.json,
The engine root use the project root, if it fails to reconcile the
engine path using project.json "engine" key and the o3de_manifest.json
"engines_path" object.

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

* Removed Generation of the engine.json and project.json in Release
Install builds.

The project and engine path can be determined based on the Cache
directory location.

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

* Added missing space for enginePakOpened

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

* Adding missing endif() and bracket argument terminator.


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-05 11:24:37 -05:00
Esteban Papp f3e6adce7f LYN-6882 release builds are executing code in asserts (#4305)
* adding Windows/release to PR-validation builds

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

* changing trace back to expand to nothing for release

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

* typo

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

* more fixes

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

* fixing some more unused variable cases

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

* renaming file in ScriptCanvas that causes a msbuild warning

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

* reverting a previous change

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-01 13:52:52 -07:00
SJ b984335b30 [Android] Fix black screen on Android when app is launched (#4418)
* When copying the runtime dependency setreg files to the cache, the name of the registry directory should be all lower case

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

* Lower case the registry folder name when looking in the asset cache.

Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-10-01 09:02:09 -07:00
Esteban Papp bf393ec85c fixes some install paths issues in monolithic release (#4422)
* fixes some install paths issues in monolithic release

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

* PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-01 08:38:46 -07:00
Mike Chang 0b718d435c Installer, bootstrapper, and executable signing for Windows (#4406)
* Added a codesigning script to pre and post build steps in the Windows installer CD job

* Changed `windows_installer` job name to `installer_vs2019`

* Added `installer-nightly` tag for `installer_vs2019`

* Updated `build_config.json` to use an envvar for the installer url and bucket

Signed-off-by: Mike Chang <changml@amazon.com>
2021-09-30 17:40:34 -07:00
Esteban Papp f273664e1d Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-30 13:39:41 -07:00
lumberyard-employee-dm b1c82fc045 Updated references to Engine.pak to be lowercase engine.pak (#4397)
* Updated references to Engine.pak to be lowercase engine.pak

This makes the engine.pak file consistent with naming scheme of other pak files such as assets.pak.

It will also help avoid issues with mounting the file on Linux.

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

* Engine.pak now loads correctly in release builds. The check for the file existing was failing in release builds because it was only checking inside packs. OpenPack first checks if the file exists, anyways, so it was safe to remove.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-09-30 10:57:54 -05:00
jiaweig 0f4a9d70b5 Fix 3p path setting to the upper level (#4399)
Signed-off-by: jiaweig <jiaweig@amazon.com>
2021-09-29 17:46:35 -05:00
Artur K bdc5cb1fff Replace PROFILE define with AZ_PROFILE_BUILD
It now follows the schema defined by `AZ_DEBUG_BUILD` define instead.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-09-29 09:30:38 -07:00
santorac 765f82d945 Merge branch 'development' into Atom/santora/UseLibPng 2021-09-27 21:29:52 -07:00
galibzon 133c85c641 MCPP should not add new line (#4353)
MCPP should not add new line characters at the end of comment lines

Update for windows, mac and linux of mcpp package to 'mcpp-2.7.2-az.2-rev1'

Signed-off-by: garrieta <garrieta@amazon.com>
2021-09-27 18:22:05 -05:00
SJ 1dbf9157ea Set working directory to the install directory so that cmake can find includes in the engine root's cmake directory. (#4328)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-09-27 09:48:59 -07:00
Esteban Papp 3106e88155 Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-22 19:29:29 -07:00
Esteban Papp a2e9b0cb69 reverting some changes that affected the custom UI
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-22 19:29:08 -07:00
SJ 5ae35810ae 1. Update iOS deployment target to 14 (#4266)
2. Set MacOS default deployment target to 11.

Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-09-22 19:11:20 -07:00