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
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
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
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
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
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
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
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
bfd266db8f
LYN-4659 OSX: Prebuilt Editor and Asset Processor fail to launch ( #1446 )
...
* LYN-4657 OSX: Building AutomatedTesting project fails
* forgot this file
* fixing lrelease patching in mac/windows
* reverting change and disabling warning, the intention of the test is to compare to unitialized values
* Fix for dxc
* no need to disable the warning, just remove the const
* missing dependency to EditorCommon
2021-06-21 18:24:29 -07:00
c02345fd71
LYN-4657 OSX: Building AutomatedTesting project fails ( #1436 )
...
* LYN-4657 OSX: Building AutomatedTesting project fails
* forgot this file
2021-06-18 11:57:37 -07:00
5e64586030
Handle a bug where gp_resolve_item picks up a header file instead of the binary for qt frameworks
2021-06-16 13:39:31 -07:00
daacd25fc9
change STREQUAL to cmake_path(COMPARE
2021-06-15 19:24:13 -07:00
1121299efc
Set policy to avoid warnings on runtime dependencies
2021-06-15 18:58:23 -07:00
411bbc8e2f
removed the copy of bundles since fixup_bundle does a better job
2021-06-15 17:33:33 -07:00
310f1b79dd
plugins should be handled by fixup_bundle
2021-06-15 17:33:31 -07:00
02dd2138cb
improving the check so it doesnt have to be "FALSE" (and can be 0/Off/etc)
2021-06-15 17:33:30 -07:00
6e2e187e31
improve incremental
2021-06-15 17:33:28 -07:00
4a53d79158
Fixup editor bundle working
2021-06-15 17:33:26 -07:00
e7d8699293
passing plugin dirs
2021-06-15 17:33:25 -07:00
b5c7a35442
working with fixup bundle and incrementals of 1s
2021-06-15 17:33:23 -07:00
47c3c3a5d0
Solution that wraps qt deploy with cmake
2021-06-15 17:33:20 -07:00
9fe06453d3
Initial commit to use qt.conf for all builds
2021-06-15 17:33:18 -07:00
bbae6490d9
Enabled LyTestTools trait only for windows and mac
2021-06-10 14:38:14 -07:00
f1b688f435
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# CMakeLists.txt
# Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
# Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
# cmake/LYWrappers.cmake
# cmake/SettingsRegistry.cmake
# scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders ( #949 )
2021-05-26 19:17:17 -05:00
ac7024cc06
Making install to be completely a post-processing step. We need this so all dependencies are declared and ready when we generate the target files
2021-05-10 11:19:35 -07:00
01f9d7bdc1
SPEC-6565 Cleanup paths to Tools/Python
2021-04-28 13:33:37 -07:00
ca47e6dbbb
[cpack_installer] added PAL trait to define if CPack is supported for a platform
2021-04-21 13:53:00 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Terry Michaels
Steve Pham
Danilo Aimini
SJ
Esteban Papp
Esteban Papp
srikappa-amzn
Terry Michaels
scottr
alexpete