Commit Graph

203 Commits

Author SHA1 Message Date
Esteban Papp 1396110f6d Preventing builds from cleaning on each step (#1151) 2021-06-04 15:46:19 -07:00
Esteban Papp cf35585bc0 Making incremental linking off by default (#1154) 2021-06-04 15:25:57 -07:00
scottr 0d1b217b24 Merge branch 'main' into cpack_installer 2021-06-04 06:45:43 -07:00
Scott Romero 64872e024e [main] add 3rd party to engine registration
Merge pull request #1131 from aws-lumberyard-dev/default_3rdparty
2021-06-03 19:32:59 -07:00
scottr 4405c2275f [default_3rdparty] changed CLI argument type to pathlib.Path and removed optional str type from usage 2021-06-03 18:23:01 -07:00
Esteban Papp 29ac17a090 SPEC-7135 Provide a method to re-trigger compiler detection for changes that require it (#1092)
* SPEC-7135 Provide a method to re-trigger compiler detection for changes that require it

* removing check (is wrong and is not necessary)

* Invert existance check

* add empty lines at the end

* Clean is triggering on each build

* clearing if the variable is false

* test code to understand what is going on...

* yeap, looks good

* handling "false" in linux/mac

* fix for linux/mac

* Fixing typos
2021-06-03 18:05:05 -07:00
scottr d30fd8b1dd Merge branch 'main' into default_3rdparty 2021-06-03 16:24:55 -07:00
lumberyard-employee-dm 816d05ef2d Updating manifest.py template query functions (#1113)
* Updating manifest.py template query functions
The get_project_templates, get_gem_templates and get_generic_templates
methods have been renamed to indicate that the methods return the
templates that can be used in a create-project, create-gem and
create-from-template command of the engine_template.py

Updated the print_registration.py script to support outputing project
specific gems and templates.
Add a unit test script for the manifest.py script.
Added unit test to validate the new functions:
`get_templates_for_project_creation`
`get_templates_for_gem_creation`
`get_templates_for_generic_creation`

* Implementing the project print registration methods

Added implementations of the project print registration methods and tested them locally
Removed implementations of the download print registration methods, since they have not went through app-sec review.

* Renaming get_restricted_data to get_restricted_json_data

Fixed the get_registered method in manifest.py when looking up projects

* Updated the print_manifest_json_data calls to return the result
2021-06-03 18:16:22 -05:00
scottr 85e6d06c2c [default_3rdparty] add 3rd party to engine registration + specific path registration fixes 2021-06-03 16:09:10 -07:00
amzn-mgwynn 77d861c124 Merge pull request #1108 from aws-lumberyard-dev/Prism/gem-db
Prism/gem db to main. Adding ability to modify project settings (display name, origin, icon, summary, user tags) through the o3de CLI with edit-project-properties using a project path or registered project name.
2021-06-03 16:10:56 -04:00
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.
2021-06-03 14:37:16 -05:00
mgwynn e99a95d909 Added copyright header for validation 2021-06-03 15:02:18 -04:00
mgwynn 7bba5ed2fc Incorporated suggestion to use setdefault to handle missing tag property rather than explicitly checking for and creating it. 2021-06-03 14:43:13 -04:00
mgwynn 6681a53768 Add the ability to remove tags. Updated some descriptions, and updated some log messages to include parameters. 2021-06-03 14:13:44 -04:00
scottr bcef8856ff [cpack_installer] minor wording fixes 2021-06-03 10:51:13 -07:00
mgwynn 5838975d62 Incorporating review comments. Minor formatting changes and changes to parameter descriptions.
Removed try-catch for property modification and added creation of user_tags element if it does not exist
but is modified through CLI
2021-06-03 13:29:51 -04:00
scottr 8214706ff9 [cpack_installer] reworked how packaging is enabled for windows 2021-06-03 08:24:01 -07:00
scottr 5695681ed3 [cpack_installer] fifth attempt to fix cpack selection 2021-06-02 21:03:41 -07:00
mgwynn 35fed77223 Adding CLI script for modifying project properties (LYN-3918). Updating O3de to support it.
Fixing some typo errors in manifest.py and minor optimizations
2021-06-02 21:56:03 -04:00
scottr 3f9811e498 [cpack_installer] fifth attempt to fix cpack selection 2021-06-02 18:40:22 -07:00
scottr 01f3ba5608 [cpack_installer] fourth attempt to fix cpack selection 2021-06-02 17:58:58 -07:00
scottr 201d6b1b72 [cpack_installer] third attempt to fix cpack selection 2021-06-02 17:29:50 -07:00
scottr fd8cff6aec [cpack_installer] second attempt to fix cpack selection 2021-06-02 16:10:41 -07:00
scottr 197241f16d [cpack_installer] fixed issue with cpack selection 2021-06-02 15:40:41 -07:00
scottr 134258c18a [cpack_installer] add trailing newline to some new files 2021-06-02 15:03:26 -07:00
scottr c6e4e3ed1f [cpack_installer] few more small fixes to installer Jenkins scripts 2021-06-02 14:57:18 -07:00
scottr 4b40f23d0b [cpack_installer] couple small fixes to installer Jenkins scripts 2021-06-02 14:06:27 -07:00
scottr a1b8d1233c [cpack_installer] initial work for installer Jenkins jobs 2021-06-02 11:28:22 -07:00
Mike Chang 262c1c1132 Change node label for Mac/iOS for new AMI update (#1086)
Changes the default node label for Mac/iOS to the newest AMI

- This AMI contains updates for XCode and CMake
- CMake is now on 3.20.2
2021-06-01 19:14:13 -07:00
Steve Pham bf0df4b369 Add Android 'gradle' job as a default job (#1082)
* Add Android 'gradle' job as a default job

* Replace warning about version checking type with string preprocessing of the captured version before comparisons
2021-06-01 16:37:30 -07:00
lumberyard-employee-dm 810d6a8deb Moved the add_gem_dependency and remove_gem_dependency methods to the cmake.py file
Fixed the add_gem_dependency method to append the newly added gem right after the 'set(ENABLED_GEMS...' line
2021-06-01 18:00:32 -05:00
lumberyard-employee-dm b3b5864f76 Added key checks for the o3de_manifest.json query functions to avoid python exceptions being raised 2021-06-01 18:00:32 -05:00
Alex Peterson a3e73948c5 Improved project creation validation
No longer requires project name to be part of the project path.
2021-06-01 15:32:57 -07:00
Steve Pham 74ec7a362b Update Android Project Generation to support AGP 4.2.0, Cmake 3.20, and newer versions of NDK&SDK
- build.gradle format updates for newer Android Gradle Plugin
- Remove hard coded Android Gradle Plugin version 3.6.4 to be passed in from command args
- Set Android Gradle Plugin min version 4.2.0 in order to support Min CMake version 3.20
- Add ability to use the android sdk to install missing components if needed rather than doing it externally
- Removed argument to pass in the NDK folder to use the android, use the android-sdk instead. Can request specific NDK versions if possible
- Android Gradle Plugin has dependencies by version and is being managed
- More defaults based on tools on path, agp version made possible so they are no longer needed in the command args
2021-05-28 23:24:51 -07:00
pappeste 58bad80ffa changing paths for the install location in Jenkins 2021-05-28 00:17:20 -07:00
lumberyard-employee-dm 23a5afeefb Renaming the unit_global_project.py to unit_test_global_project.py. This fixes the unit test not being found 2021-05-27 23:47:51 -05:00
lumberyard-employee-dm 74464afbf3 Updated the global_project.py script to be able to specify and output
path when setting the global project path
Also updated that script to support an input path when reading the
global project path.
Added a unit test for the global_projecy.py "set-global-project" command
2021-05-27 21:20:19 -05:00
lumberyard-employee-dm 87721cae55 Removed the ability to run download command from the o3de python package without user intervention 2021-05-27 20:56:03 -05:00
lumberyard-employee-dm 394ac7ab6a Updated the enable gem and disable gem API (#54)
* Updated the enable gem and disable gem API
Renamed remove_gem_project.py -> disable_gem.py
Renamed add_gem_project.py -> enable_gem.py
Renamed the "add-gem-to-project" command -> "enable-gem"
Renamed the "remove-gem-from-project" command -> "disable-gem"

Fixed the parsing of the enabled gems from the enabled_gems.cmake file

* Adding newline to the end of the CMakeLists.txt
2021-05-27 16:44:50 -05: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
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
lumberyard-employee-dm 44c8a19bce Fix Python TypeError in the engine_template.py create-project command 2021-05-26 19:05:33 -05:00
Brian Herrera d99fea7a98 [Inclusion] Rename parameter for retry config
Parameter was renamed to allowed_methods in urllib3 1.26.0. Both options are currently available in the version we are using now.
2021-05-26 13:54:39 -07:00
Steve Pham d4587d1f99 Add Label Exclusion filter for Sandbox tests from the main test suites (#955) 2021-05-26 10:14:18 -07:00
SJ 8ca3b078a2 Remove bootstrap.cfg and some references to it.
Merge pull request #836 from aws-lumberyard-dev/LYN-2461
2021-05-26 09:32:57 -07:00
pappeste a421b4cb71 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948
# Conflicts:
#	scripts/o3de.py
2021-05-26 09:06:49 -07:00
lumberyard-employee-dm 607dbc47b3 Surrouding the setting of the BASE_PATH within double quotes in the o3de.bat script. This allows to allow paths with spaces in it leading to the engine root directory to work properly when running the script 2021-05-26 10:40:47 -05:00
pappeste e8428b42be Adjusting o3de path to run from install (authored by @lumberyard-employee-dm) 2021-05-26 08:17:09 -07:00
lumberyard-employee-dm 62d196da30 Removed tool and server gem query functions from the ProjectManager projects.py script
Updated the mentions of the runtime gem targets to just be general project gem targets
2021-05-26 04:57:43 -05:00