Commit Graph

175 Commits

Author SHA1 Message Date
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
lumberyard-employee-dm 922099050b Simplified the o3de package gem enable/disable logic
The add_gem_project and remove_gem project scripts, now just enables on
a gem name basis instead of a CMake target basis

Updated the ProjectManager code and scripts to account for the
add_gem_project and rmeove_gem_project script changes.
2021-05-26 04:46:16 -05:00
lumberyard-employee-dm 59934e6be1 Updating the ProjectManager code and scripts with new layout of the o3de package scripts 2021-05-26 00:23:21 -05: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 80f9da800a insert the scripts/o3de folder to the front of the sys.path for the o3de.py script to allow the o3de package scripts to be imported 2021-05-25 22:27:28 -05:00
Steve Pham 6136bc270e Remove flaky test from AzNetwork instead of using retry
- Remove '--repeat until-pass' from profile test ctest argument
- Moved flaky TCP tests from main googletest suite to sandbox
- Added 'TARGET' to 'ly_add_googletest' to support adding the same module to multiple tests or adding a test that is not named the same as the module
- Fix minor bug in ly_add_googletest
2021-05-25 16:05:40 -07:00
Alex Peterson 82b4b83256 Launch o3de.exe instead of project_manager.py
Launch the o3de project manager application instead of project_manager.py when the editor is started but no project is specified.
2021-05-25 13:15:15 -07:00
Mike Chang 3d88774050 Inclusive language edit
- Small edit to remove non-inclusive language in a comment
2021-05-25 12:59:24 -07:00
lumberyard-employee-dm d3fb2dd68c Removed the add_external_subdirectory and add_gem_cmake python scripts
as well as their remove counterparts.

Updated teh register.py script to be able to register subdirectories to
the o3de_manifest.json
Also added the ability to register external subdirectories to the
project.json if the --external-subdirectory-project-path is supplied
Added the ability to register external subdirectories to the engine.json
if the --external-subdirector-engine-path is supplied
2021-05-24 22:49:37 -05:00
lumberyard-employee-dm 1a95b96985 Fixed importing of o3de package modules within the o3de.py script when a relative path is used to invoke it 2021-05-24 13:06:43 -05:00
lumberyard-employee-dm 57bdc58c68 Renamed the unit_test_registration.py script to be unit_test_register.py to be inline with the register.py script 2021-05-24 00:49:00 -05:00
lumberyard-employee-dm e59b154139 Updated the refactored o3de command scripts to be able to run standalone by adding a main section
Removed the ability to suppress errors in the add-gem-to-cmake and add-external-subdirectory command
Reduced duplicate logic in the download.py, register.py and repo.py scripts
Removed the registration.py script and moved the registration of those comamnds directly to the o3de.py script
Reduced the exception scope in the o3de command scripts to be as constrained as possible.
For example instead of having a block of Exception for catching a dictionary KeyError, the block has been updated to just catch KeyError
Added a python test for validating the "register.py --this-engine" functionality
2021-05-23 22:10:09 -05:00
lumberyard-employee-dm b42cc19f28 Moved the preview.png from the that the o3de engine template script from cmake/Tools directory to the o3de/resources directory 2021-05-23 21:54:56 -05:00
amzn-sj d369912727 Merge branch 'main' into LYN-2461 2021-05-21 16:41:46 -07:00
evanchia ed3b1dd8d5 adding explicit url for test metrics 2021-05-21 12:50:52 -07:00
lumberyard-employee-dm 530c9a424e Updating the manifest get_registered command to read the engine projects, gems, external_subdirectories, restricted and templates paths from the engine.json 2021-05-21 04:11:02 -05:00
lumberyard-employee-dm d422083faa Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/Engine-Gem-Tracking 2021-05-21 03:56:09 -05:00
lumberyard-employee-dm 470fde461f Removed engine registration from the Jenkins build scripts which builds the Engine in an engine centric manner 2021-05-21 02:04:07 -05:00
lumberyard-employee-dm a9bc8e943d Refactored the o3de registration.py script into several files which each
contains the implementation of a subparser command.

Updated the register command to be not register engine gems, templates,
projects and external subdirectories to the o3de_manifest

Updated the register-show command to be able to read the engine's gems,
templates, projects and external subdirectories from the engine.json
file
2021-05-21 01:58:54 -05:00
Steve Pham 42ccdf0572 Python3 installation script for Linux machines (#832) 2021-05-20 17:08:14 -07:00
phistere 7a25a17fae Fixes a few issues when using an engine name different from the default 2021-05-20 09:13:01 -05:00
amzn-sj 268fd8b714 Remove bootstrap.cfg and references to it. 2021-05-19 13:57:35 -07:00
phistere 0ba2900fdd Fixes and issue with o3de scripts assuming the wrong directory as the engine directory 2021-05-19 12:27:02 -05:00
ibtehajn 3c3f3fa91e Disable shallow checkout in initial setup step
Performing a shallow checkout breaks changelog computation, which is
required for accurate build failure notifications.
2021-05-19 17:35:18 +01:00
ibtehajn c49875fc37 Use author instead of committer in changelog computations
Any commits created through the GitHub UI (e.g. commits created by
merging PRs) usually assign GitHub itself as the ccommitter. This is
expected behaviour, as the commit is applied by GitHub itself. However,
for the purposes of changelog creation, showing the author (e.g. the
person who clicked the merge button on the PR) is more useful.
2021-05-19 15:15:27 +01:00
lumberyard-employee-dm c6b0e3562e Updating the python import paths for the o3de scripts to use the new package o3de package location 2021-05-19 00:52:28 -05:00
Mike Chang 85feef74dc Update Windows 2019 AMI v3 Label
* Added new Windows v3 build label

* New v3 AMI
2021-05-18 22:24:14 -07:00
lumberyard-employee-dm 703c268e40 Adding a setup.py and a README to the scripts/o3de folder so it can be linked as a package into the engine python runtime when python is installed via python/get_python.bat 2021-05-18 23:48:35 -05:00
lumberyard-employee-dm ec7f4c3fdc Moving the engine template unit test files into the o3de/tests folder 2021-05-18 23:15:50 -05:00