Commit Graph

248 Commits (0ad2fe2294e9468e59af2457058807d0d0e8dca1)

Author SHA1 Message Date
Esteban Papp 08db058476
SPEC-2513 Fixes to enable w4436 and w4366 (#1157)
* Fix for w4457

* Nothing to fix, seems we deleted all the code that was causing this offense

* removing warning

* another warning that doesnt trigger
5 years ago
Esteban Papp cf35585bc0
Making incremental linking off by default (#1154) 5 years ago
Esteban Papp e71a4656bc
SPEC-2513 Fixes to enable w4450 (#1145)
* Fix for w4457

* Nothing to fix, seems we deleted all the code that was causing this offense
5 years ago
Esteban Papp 76a6df341b
SPEC-2513 Fixes to enable w4457 5 years ago
scottr 0d1b217b24 Merge branch 'main' into cpack_installer 5 years ago
lumberyard-employee-dm dce87534c7
Removing the Pyside implementation of the project manager python scripts (#1112)
* Removing the Pyside implementation of the project manager python scripts

* Removing reference to the scripts/project_manager directory 

The Install_common.cmake script reference to the project_manager directory has been removed.
5 years ago
Esteban Papp 5d7aae9bd8
SPEC-2513 Fixes to enable w4459 (#1107)
* fixing w4459

* Fixes for nounity

* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
5 years ago
scottr 957937ffc2 Merge branch 'main' into cpack_installer 5 years ago
Esteban Papp 29c71b4e53
SPEC-2513 Fixes to enable w4701 (#1105)
* Some fixes

* more fixes

* fixes for debug
5 years ago
scottr 8214706ff9 [cpack_installer] reworked how packaging is enabled for windows 5 years ago
scottr 328ced0059 [cpack_installer] replaced missing get_target_property hack and fixed a typo 5 years ago
scottr b09f73378f [cpack_installer] replaced LY_DEFAULT_INSTALL_COMPONENT with built-in CMAKE_INSTALL_DEFAULT_COMPONENT_NAME. updated stale references to ly_install_target_COMPONENT with a get_prop call 5 years ago
scottr 3a7ec61efd Merge branch 'main' into cpack_installer 5 years ago
Esteban Papp f1dbeb584a
LYN-4206 CMake bakes install prefix during configure (#1100) 5 years ago
scottr 12cdaed03e [cpack_installer] updated installer icon/logo 5 years ago
scottr cfd06f2e4a [cpack_installer] added check for desired cmake version to be at least greater than minimum required plus minor cleanup 5 years ago
Esteban Papp 7d1fedc10c
LYN-4128 EditorPythonBindings.Editor in debug does not load (missing python_d.dll) 5 years ago
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
lumberyard-employee-dm c67cd2dc4e Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator 5 years ago
lumberyard-employee-dm f6568f5c63 Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target 5 years ago
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
5 years ago
pappeste cba5c35de5 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 5 years ago
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
5 years ago
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 5 years ago
scottr 86035104b9 Merge branch 'main' into cpack_installer 5 years ago
scottr 883ddf667e [cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...) 5 years ago
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 5 years ago
Terry Michaels 9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders (#949) 5 years ago
scottr 2ba645c264 [cpack_installer] post install hooks to install cmake and python 5 years ago
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 5 years ago
lumberyard-employee-dm d536a9438d Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"
This reverts commit f972edee01.
5 years ago
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 5 years ago
scottr d83d9c9bff [cpack_installer] fixed issue with applying default installer GUIDs when seed property changes 5 years ago
scottr e0cb0fec9b [cpack_installer] add desktop and start menu shortcuts 5 years ago
scottr 3d4d63ab1d [cpack_installer] installer product icons 5 years ago
scottr 9788caa6cb [cpack_installer] move non-cmake packaging resources into their own folder 5 years ago
phistere cef7eacd24 Fixes install of scripts to include o3de folder 5 years ago
phistere f972edee01 Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install 5 years ago
scottr b45d01919d [cpack_installer] simplify guid generation by using existing project props instead of timestamp in seed value. add bootstrapper specific guids. 5 years ago
scottr efbb0077b5 [cpack_installer] configure install to be per machine 5 years ago
scottr 37b2ac797d [cpack_installer] bootstrap installer is copied to root of build directory. uploads directory is cleaned before copied to. 5 years ago
scottr 2ddbd36f9a [cpack_installer] add option to specify license url. replicate online artifacts copy 5 years ago
scottr b19779e491 [cpack_installer] cpack variable usage cleanup 5 years ago
scottr f6b1fac139 [cpack_installer] initial bootstrap installer generation, this bootstrapper is what downloads the artifacts 5 years ago
pappeste 671f26bed4 fixing debug configuration and how we declare IMPORTED targets (instead of UNKNOW we use the actual type) 5 years ago
scottr c777e2e353 [cpack_installer] some cpack cleanup and prep for online installer support (pre/post build steps) 5 years ago
pappeste b3ae71a5d8 misc fixes 5 years ago
pappeste 65e0bd270e Fixing runtime dependencies (including qt deploy). Running AP/Editor again 5 years ago
pappeste 12cea5d029 Fixing headers and interface build dependencies 5 years ago
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
5 years ago
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 5 years ago
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. 5 years ago
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
5 years ago
scottr ff437aadf1 [cpack_installer] windows installer product GUID handling 5 years ago
scottr efe6d24d51 [cpack_installer] new windows installer basic implementation 5 years ago
pappeste bddbe43240 adding all the config folder for ImageProcessingAtom 5 years ago
pappeste 68f19644e7 typo 5 years ago
pappeste f6187f510a config file going to the wrong place 5 years ago
pappeste 988daaef0b Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
5 years ago
pappeste d27aa0f584 replaced ly_add_dependencies with ly_add_target_files so settingsregistry is happy 5 years ago
pappeste 7c9837dfd4 installing the gems.json files 5 years ago
pappeste b0732dd494 Changing find files to add_subdirectory to be able to have SettingsRegistry.cmake finding the path to the gems 5 years ago
amzn-sj b99d0fb36a Move symbol stripping attributes to iOS configuration file 5 years ago
amzn-sj 1474b56e12 Deployment postprocessing should be enabled only for release builds 5 years ago
pappeste 03ae0195a3 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	cmake/Platform/Common/Install_common.cmake
5 years ago
pappeste d1416d53e0 adding a file for ImageProcessing 5 years ago
pappeste 5c68647b6b fixing qt deploy and adding install of runtime dependencies 5 years ago
pappeste ed17d01028 making the runtime_dependencies a function so we can reuse internal functions for the install 5 years ago
Eric Phister 4485edf77d
LYN-2578: Updates cmake install for 'scripts' directory. (#518)
* LYN-2578: Updates cmake install for 'scripts' directory.  Updates destination of certain binaries.
* LYN-2578: Updates to cmake install based on feedback.
5 years ago
pappeste a905f38cc4 qt deploy 5 years ago
pappeste d046bae20b removing duplicate message 5 years ago
scottr 37f0b44de4 [install_gem_assets_fix] include the Registry folder in the gem install filtering 5 years ago
scottr ce17170bae [install_gem_assets_fix] revert gem asset folder glob to use CMAKE_SOURCE_DIR instead of CMAKE_CURRENT_SOURCE_DIR 5 years ago
scottr 9df8ac76d4 [install_gem_assets_fix] fixed glob/filter logic for finding gem asset directories to install 5 years ago
lumberyard-employee-dm 3dec5d3b71
LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
5 years ago
Esteban Papp 01f9d7bdc1
SPEC-6565 Cleanup paths to Tools/Python 5 years ago
Esteban Papp 5d13ad963a
SPEC-6437 Dlls should go to bin instead of profile (#287)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed

* putting dlls/exe in the right place, with the right output subdirectory

* setting runtime dependencies for the dlls that we link against

* singular target location

* code review comments/fixes

* Fixing identation
5 years ago
scottr bb1a7580f5 [cpack_installer] missed some new install() entries after a merge that need component tagging 5 years ago
scottr 15d253ac49 Merge branch 'main' into cpack_installer 5 years ago
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 5 years ago
phistere f36bfd9db5 LYN-2524: Adding more files to CMake install to help AP run from SDK. Fixes an issue configuring an external project. 5 years ago
scottr 6c1e617d49 [cpack_installer] added another missing trailing newline to a modified file 5 years ago
scottr 56dfaca6cf [cpack_installer] re-applying install component support after merge. added some missing doc comments. 5 years ago
scottr 22f34d953a Merge branch 'main' into cpack_installer 5 years ago
scottr ca47e6dbbb [cpack_installer] added PAL trait to define if CPack is supported for a platform 5 years ago
Esteban Papp 92c77dca11
LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
5 years ago
scottr 8784314b7b Merge branch 'main' into cpack_installer 5 years ago
scottr 4638a831bc [cpack_installer] updates to default install component and target registration 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
scottr f5c8bf068d Merge branch 'main' into cpack_installer 5 years ago
scottr 11b6874d92 [cpack_installer] initial support for installable components 5 years ago
amzn-sj fff97cda3b Cache runtime dependencies for targets to speed up iOS configuration. 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago