Commit Graph

279 Commits

Author SHA1 Message Date
lumberyard-employee-dm 6ebf3a93d1 Added protection in the register python script queries of the default folders against a non-existent key causing a KeyError in python (#1946)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 12:56:29 -05:00
Shirang Jia 55a3b41222 Fix unmounting error (#1940) 2021-07-07 16:44:42 -07:00
Shirang Jia 992f5aab1b Convert Incremental scripts to Python3 (#1934)
Convert incremental build script to Python3
2021-07-07 15:12:10 -07:00
lumberyard-employee-dm 8592e4fbbe Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively (#1880)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-06 20:42:09 -05:00
lumberyard-employee-dm d73a98aa2f Added detection of gems which are not directly under an external subdirectory root (#1841)
* Added proper detection of the list of Gems in the Project Templates
enabled_gems.cmake file

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a CMake alias target for the Atom Gem and the AtomLyIntegration

Both of those targets just aliases the Atom_AtomBridge gem
Therefore they turn on Atom

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replacing the Atom_AtomBridge gem in the project template with the Atom gem

The Atom gem is just an alias to the Atom_AtomBridge gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the manifest.py gem gathering logic to recurse through the external subdirecotories locating gem.json files to discover all gems in a subdirectory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-02 21:46:26 -05:00
AMZN-Phil b3fd63a0f3 Merge branch 'stabilization/2106' into LYN-4507 2021-07-02 09:31:22 -07:00
lumberyard-employee-dm 2478c60793 Fixed several o3de python package and install layout issues (#1714)
* Updated the CrashLog directory path to save to the project user
directory instead of the engine-root directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing the custom OUTPUT_NAME for the Multiplayer Gem Builder target

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the default value for the LY_3RDPARTY_PATH cache variable to be
~/.o3de/3rdParty

This simplifies the first time user experience when running cmake

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed Windows only issue where using creating a VS Solution for an O3DE project on a different drive resulted in an unloaded "<drive letter>:" entry appearing in the solution explorer

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Refactored install layout logic for External Subdirectories

Instead of performing a regular expression over the Gems/* directory, now the each external subdirectory including the project (external) directory is recursied over and scanned for any folders that aren't excluded.
By default those folders are the [Cc]ache, [Bb]uild and [Uu]ser directories

Afterwards the list files to copy over are then split into a directory list and a file list that is filtered by an include regex
Next the directory list is iterated over and the directories are copied to the install layout
Finally the file list is iterated and the list of files are also copied to the install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed the o3de.bat script changing the working directory before running the o3de.py script

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed exception in engine-template.py script when the create-gem command
is invoked with the --template-name parameter that does not correspond
to a registered Template

Updated the create-project command to register the project with the
o3de_manifest.json and the engine with the project as the final step

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed register.py over-registration of non-engine directories when then
--this-engine parameter is supplied.
All the projects, gems and templates inside of the default o3de_manifest
folder locations were being registered with the engine that was being
registered

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed register.py register_project_path() method to return 0 when the
project path is successfully registered.

This issue was that the save_o3de_manifest method "return" value was
being checked and that method doesn't actually return a value

Added question mark to the engine_template.py to correct text around
notifying the user if the project was registered

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added doc comment on the new cmke ly_get_vs_folder_directory function()

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added clarifying comment to the ly_setup_others() command logic to copy over directories and files from any external subdirectories(Gems) that are registered with the engine at the time of install

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed infinite recursion when trying to create a template with the
source directory used to seed the template

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-02 00:22:12 -05:00
pconroy a0b754bb4d Fix return value when multiple projects are removed and one fails
Signed-off-by: pconroy <pconroy@amazon.com>
2021-07-01 20:10:23 -07:00
pconroy ae6a424064 Make remove_invalid_o3de_projects take a path and return a value
Signed-off-by: pconroy <pconroy@amazon.com>
2021-07-01 20:10:16 -07:00
pconroy e0c3d15d5a Remove deleted projects from project manager
Signed-off-by: pconroy <pconroy@amazon.com>
2021-07-01 20:10:10 -07:00
Shirang Jia af9f1aaae0 Remove unused package filelist (#1687) 2021-07-01 10:21:48 -07:00
AMZN-ScottR 6af01fc378 Merge branch 'stabilization/2106' into installer/2106-engine-name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-06-30 20:31:17 -07:00
Steve Pham 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
AMZN-ScottR 56ce9908a5 [installer/2106-engine-name] update installer job to override engine name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-06-30 18:02:50 -07:00
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:55:32 -07:00
Esteban Papp 9f0bbf3b74 SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:51:24 -07:00
Esteban Papp acce801b41 SPEC-7435 Vegetation Tests Reference Missing File: Mocks/MockSpawnableEntitiesInterface.h 2021-06-25 09:23:27 -07:00
scottr 7b1ac7dd4e Merge branch 'stabilization/2106' into cpack/2106-license-url 2021-06-23 15:27:53 -07:00
evanchia-ly-sdets e9e740e355 Merge pull request #1527 from aws-lumberyard-dev/linux_sanity_fix
fixing linux sanity tests
2021-06-23 14:11:16 -07:00
Scott Romero 2480dedcd9 [stabilization/2106] Inclusion of 3rd party license manifest file in installer package (#1483) 2021-06-23 14:07:02 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
scottr 4b9c7c79b8 [cpack/2106-license-url] update to use correct license URL for installer job 2021-06-23 10:28:46 -07:00
Alex Peterson aa885e5d0b Fix project creation (#1445)
* Add ability to change project name

* Fixed several issues where path types were changed

* Added PythonBindings CreateProject unit test

* Fix python warning format

* Validate new project name in CLI

* Fix issue creating pathview on linux

* Use better testing macros

* Refactored the unit_test_engine_template.py test to actually test
against the current engine_template.py commands

The commands of create-template, create-from-template, create-project
and create-gem is now being validated.

Registered the unit_test_engine_template.py script with CTest in the smoke test
suite so that it runs in Automated Review

Fixed issues in the engine_template.py script where the template_restricted_path parameter was required in the create_project and create_gem functions

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-23 09:19:17 -07:00
Esteban Papp 78b8daa783 LYN-4745 ci_build_metrics doesnt distinguish between different repo (#1496)
* add repository to ci_build_metrics

* fixing build

* changing the job to pass the right parameters

* passing parameters that need to be expanded

* missed this, important

* fixing typo
2021-06-23 08:01:39 -07:00
SJ cb2d64b205 Add parameters to specify custom native build path and enable unity build in Android gradle builds (#1494)
* Add parameters to specify custom native build path and enable unity build in Android gradle builds

* Enable unity build for gradle to shorten the path to the generated object files which fixes build failures on Jenkins due to paths exceeding limit. This also speeds up builds.
2021-06-22 15:31:52 -07:00
scottr 46f7ecb7e6 [cpack/2106-license-url] update installer job to include license terms url 2021-06-22 15:20:36 -07:00
scottr e568004dd2 [cpack/2106-3p-manifest] update installer job with 3rd party SPDX license url 2021-06-22 14:16:33 -07:00
Scott Romero c05943abf4 [stabilization/2106] installer jenkins job fixes and improvements (#1453)
Updated installer job tags to be included in nightly clean builds
Fixed escaping issue with passing installer framework env var to cmake
Removed enforcement of aws profile for uploading
Various changes to shorten the install path cpack uses
Added cpack log file dump on error
Added build tagging from git repo info to installer job
Fixed bug causing bootsrapper to crash on secondary machines
2021-06-22 13:12:40 -07:00
Esteban Papp 44d8e7b804 LYN-4666 Make AR builds use the stabilization/2106 snapshot (#1440)
* use snapshots out of stabilization

* temporal print to figure out why the mount is not used

* removing print used for debugging
2021-06-22 10:35:02 -07:00
scottr 36929f59ae Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-22 09:52:14 -07:00
greerdv b69b6af305 add copyright notice 2021-06-21 22:28:50 +01:00
greerdv 40a84c3c74 add editor python script to help with migrating levels with non-uniform scale 2021-06-21 20:09:48 +01:00
scottr 64a960e428 Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main 2021-06-20 20:21:48 -07:00
scottr 00bb33587a [cpack/jenkins-main] fixed bug applying some cpack build job parameters 2021-06-20 20:17:11 -07:00
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-20 17:49:23 -07:00
scottr 3ca839a580 [cpack/jenkins-main] update installer job params and how they are applied 2021-06-20 14:45:03 -07:00
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 2021-06-20 14:31:10 -07:00
scottr 21d92a414e [cpack/jenkins-main] update commit date format string to something that works on all machines 2021-06-20 13:38:16 -07:00
scottr 646fc30dab [cpack/jenkins-main] build tag generator script now uses jenkins env vars and matches commands used 2021-06-20 13:31:59 -07:00
scottr f03b3623d4 [cpack/jenkins-main] fixed git date format on unix machines in jenkinsfile 2021-06-20 11:45:41 -07:00
scottr 68d90366a8 [cpack/jenkins-main] missed escaping a character in git command for jenkinsfile 2021-06-19 07:15:23 -07:00
scottr c507422760 [cpack/jenkins-main] update build url tag generation to use existing env vars from Jenkins 2021-06-18 20:52:04 -07:00
scottr a0d6e29198 [cpack/jenkins-main] additional logging to build id generator script 2021-06-18 18:05:26 -07:00
scottr a057cbb03a [cpack/jenkins-main] updated installer job params 2021-06-18 17:16:26 -07:00
scottr 8b68aa9f5a [cpack/jenkins-main] rework build tagging to include git repo info in installer job 2021-06-18 16:55:22 -07:00
amzn-hdoke 556d607a5e Make AWSCore.Editor tests windows only (#1410) 2021-06-18 16:30:49 -07:00
scottr 1519180cec [cpack/stabilization/2106-jenkins] updated installer job params to make the online version 2021-06-18 08:39:40 -07:00
scottr 7011bb66f1 [cpack/stabilization/2106-jenkins] missed cpack log file path shortening 2021-06-18 08:36:28 -07:00
scottr 1d8fb2a7f7 [cpack/stabilization/2106-jenkins] fixed installer framework include in jenkins job 2021-06-18 08:20:40 -07:00
scottr 059324add9 [cpack/stabilization/2106-jenkins] updated installer job tags to run nightly 2021-06-18 08:15:59 -07:00