Commit Graph

81 Commits

Author SHA1 Message Date
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 00:16:26 -07:00
lumberyard-employee-dm c67cd2dc4e Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator 2021-05-27 17:35:08 -05:00
lumberyard-employee-dm f6568f5c63 Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target 2021-05-27 13:10:54 -07:00
lumberyard-employee-dm 18e479589d Updating the Install_common.cmake ly_setup_o3de_install() function to be
able forward all the ly_add_targets calls within a single source Engine
CMakeLists.txt to a single installed Engine CMakeLists.txt
2021-05-27 12:19:49 -07:00
pappeste cba5c35de5 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 10:30:28 -07:00
pappeste 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
lumberyard-employee-dm 5b8e759c2d Implemented changes in the ly_setup_target() command to forward the ly_create_alias() command calls to the configured CMakeLists.txt per installed target 2021-05-26 23:59:49 -05:00
scottr 86035104b9 Merge branch 'main' into cpack_installer 2021-05-26 20:20:47 -07:00
scottr 883ddf667e [cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...) 2021-05-26 20:19:42 -07:00
lumberyard-employee-dm 84cf3bffde Updating the Install_common.cmake script to copy over the source engine.json templates array to the generated installed engine.json 2021-05-26 20:49:52 -05:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
scottr 2ba645c264 [cpack_installer] post install hooks to install cmake and python 2021-05-26 16:13:14 -07:00
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 23:48:55 -05:00
lumberyard-employee-dm d536a9438d Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"
This reverts commit f972edee01.
2021-05-25 17:36:16 -05:00
lumberyard-employee-dm b99bcea24a Updating the engine.json.in template for the cmake INSTALL target to add the list of external subdirectories to allow the installed layout to access the subdirectories via it's engine.json file 2021-05-24 00:43:21 -05:00
scottr d83d9c9bff [cpack_installer] fixed issue with applying default installer GUIDs when seed property changes 2021-05-19 20:26:27 -07:00
scottr e0cb0fec9b [cpack_installer] add desktop and start menu shortcuts 2021-05-19 19:39:52 -07:00
scottr 3d4d63ab1d [cpack_installer] installer product icons 2021-05-19 14:08:38 -07:00
scottr 9788caa6cb [cpack_installer] move non-cmake packaging resources into their own folder 2021-05-19 13:48:02 -07:00
phistere cef7eacd24 Fixes install of scripts to include o3de folder 2021-05-19 13:25:51 -05:00
phistere f972edee01 Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install 2021-05-19 10:49:17 -05:00
scottr b45d01919d [cpack_installer] simplify guid generation by using existing project props instead of timestamp in seed value. add bootstrapper specific guids. 2021-05-18 00:22:17 -07:00
scottr efbb0077b5 [cpack_installer] configure install to be per machine 2021-05-17 21:43:46 -07:00
scottr 37b2ac797d [cpack_installer] bootstrap installer is copied to root of build directory. uploads directory is cleaned before copied to. 2021-05-17 20:52:06 -07:00
scottr 2ddbd36f9a [cpack_installer] add option to specify license url. replicate online artifacts copy 2021-05-17 16:34:24 -07:00
scottr b19779e491 [cpack_installer] cpack variable usage cleanup 2021-05-17 15:28:32 -07:00
scottr f6b1fac139 [cpack_installer] initial bootstrap installer generation, this bootstrapper is what downloads the artifacts 2021-05-14 12:03:20 -07:00
pappeste 671f26bed4 fixing debug configuration and how we declare IMPORTED targets (instead of UNKNOW we use the actual type) 2021-05-11 19:06:07 -07:00
scottr c777e2e353 [cpack_installer] some cpack cleanup and prep for online installer support (pre/post build steps) 2021-05-11 18:07:19 -07:00
pappeste b3ae71a5d8 misc fixes 2021-05-10 16:03:00 -07:00
pappeste 65e0bd270e Fixing runtime dependencies (including qt deploy). Running AP/Editor again 2021-05-10 14:55:03 -07:00
pappeste 12cea5d029 Fixing headers and interface build dependencies 2021-05-10 13:58:22 -07:00
pappeste 33e4098741 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
# Conflicts:
#	cmake/Platform/Common/Install_common.cmake
2021-05-10 12:01:49 -07:00
pappeste 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
phistere bedecebdcc Configures and installs an engine.json generated from a template. Fixes HEADERONLY targets for install. Fixes locating .ico resource file. Fix infinite loop in CMake configure on new projects. 2021-05-07 20:05:05 -05:00
pappeste 6ab9d68e69 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Code/Tools/ProjectManager/CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog.cpp
#	Code/Tools/ProjectManager/Source/GemCatalog.h
#	Code/Tools/ProjectManager/Source/GemCatalog.ui
#	Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.h
#	Code/Tools/ProjectManager/Source/ScreenFactory.cpp
#	Code/Tools/ProjectManager/project_manager_files.cmake
#	Code/Tools/ProjectManager/source/Qt/GemCatalog.h
2021-05-07 11:05:20 -07:00
scottr ff437aadf1 [cpack_installer] windows installer product GUID handling 2021-05-06 17:24:57 -07:00
scottr efe6d24d51 [cpack_installer] new windows installer basic implementation 2021-05-06 15:51:20 -07:00
pappeste bddbe43240 adding all the config folder for ImageProcessingAtom 2021-05-06 13:55:34 -07:00
pappeste 68f19644e7 typo 2021-05-05 16:42:50 -07:00
pappeste f6187f510a config file going to the wrong place 2021-05-05 16:21:25 -07:00
pappeste 988daaef0b Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
2021-05-05 12:33:47 -07:00
pappeste d27aa0f584 replaced ly_add_dependencies with ly_add_target_files so settingsregistry is happy 2021-05-05 12:31:34 -07:00
pappeste 7c9837dfd4 installing the gems.json files 2021-05-05 12:07:45 -07:00
pappeste b0732dd494 Changing find files to add_subdirectory to be able to have SettingsRegistry.cmake finding the path to the gems 2021-05-04 13:52:19 -07:00
amzn-sj b99d0fb36a Move symbol stripping attributes to iOS configuration file 2021-05-04 10:20:51 -07:00
amzn-sj 1474b56e12 Deployment postprocessing should be enabled only for release builds 2021-05-04 09:55:07 -07:00
pappeste 03ae0195a3 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	cmake/Platform/Common/Install_common.cmake
2021-05-03 18:18:20 -07:00
pappeste d1416d53e0 adding a file for ImageProcessing 2021-05-03 18:16:08 -07:00
pappeste 5c68647b6b fixing qt deploy and adding install of runtime dependencies 2021-05-03 17:16:03 -07:00