Update pull_and_build_from_git.py with latest PR feedback

rename git-path argument to local-repo

Update DirectXShaderCompiler & Spirv-cross repo url's to match new o3de urls.

Signed-off-by: rgba16f <[email protected]>

Scripts/extras/pull_and_build_from_git.py

@@ -52,8 +52,8 @@ The following keys can exist at the root level or the target-platform level:
                           to restrict building to a specific configuration rather than building all configurations 
                           (provided by the default value: ['Debug', 'Release'])
 * patch_file            : (optional) Option patch file to apply to the synced source before performing a build
-* git_path              : (optional) Option to provide a path to the project source rather than getting it from github
-* git_skip              : (optional) Option to skip all git commands, requires src_folder
+* local_repo            : (optional) Option to provide a path to the project source rather than getting it from github
+* git_skip              : (optional) Option to skip all git commands, requires local_repo
 
 
 The following keys can only exist at the target platform level as they describe the specifics for that platform
@@ -858,11 +858,11 @@ if __name__ == '__main__':
                             action="store_true")
         parser.add_argument('--build-path',
                             help="Path to build the repository in. Defaults to {base_path}/temp.")
-        parser.add_argument('--git-path',
+        parser.add_argument('--local-repo',
                             help='Path to an existing git repo',
                             default=None)
         parser.add_argument('--git-skip',
-                            help='skips all git commands, requires git-path to be provided',
+                            help='skips all git commands, requires local-repo to be provided',
                             default=False)
 
         parsed_args = parser.parse_args(sys.argv[1:])
@@ -886,7 +886,7 @@ if __name__ == '__main__':
                                    toolchain_file=custom_toolchain_file,
                                    build_config_file=parsed_args.build_config_file,
                                    clean=parsed_args.clean,
-                                   src_folder=parsed_args.git_path,
+                                   src_folder=parsed_args.local_repo,
                                    skip_git=parsed_args.git_skip)
 
         # Execute the generation of the 3P folder for packaging

package-system/DirectXShaderCompiler/build_config.json

@@ -1,9 +1,9 @@
 {
-   "git_url":"https://github.com/aws-lumberyard/DirectXShaderCompiler.git",
+   "git_url":"https://github.com/o3de/DirectXShaderCompiler.git",
    "git_tag":"release-1.6.2104-o3de",
    "package_name":"DirectXShaderCompilerDxc",
-   "package_version":"1.6.2104-o3de-rev2",
-   "package_url":"https://github.com/aws-lumberyard/DirectXShaderCompiler",
+   "package_version":"1.6.2104-o3de-rev3",
+   "package_url":"https://github.com/o3de/DirectXShaderCompiler",
    "package_license":"NCSA",
    "package_license_file":"LICENSE.TXT",
    "cmake_find_target":"FindDirectXShaderCompilerDxc.cmake",

package-system/SPIRVCross/build_config.json

@@ -1,9 +1,9 @@
 {
-   "git_url":"https://github.com/aws-lumberyard/SPIRV-Cross.git",
+   "git_url":"https://github.com/o3de/SPIRV-Cross.git",
    "git_tag":"release-2021.04.29",
    "package_name":"SPIRVCross",
    "package_version":"2021.04.29-rev1",
-   "package_url":"https://github.com/aws-lumberyard/SPIRV-Cross",
+   "package_url":"https://github.com/03de/SPIRV-Cross",
    "package_license":"Apache-2.0",
    "package_license_file":"LICENSE",
    "cmake_find_target":"FindSPIRVCross.cmake",