From 233be88b396864bcf8fc096695d0854d3bb36f25 Mon Sep 17 00:00:00 2001 From: Chris Hesik Date: Wed, 10 Jul 2019 16:42:44 -0400 Subject: [PATCH] Update scripts for 3.4 branch --- Scripts/UpdateCommon.py | 18 +++++++++--------- Scripts/UpdateCommonMap.py | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Scripts/UpdateCommon.py b/Scripts/UpdateCommon.py index 24fd324e..8c3fa49c 100644 --- a/Scripts/UpdateCommon.py +++ b/Scripts/UpdateCommon.py @@ -99,13 +99,6 @@ def UpdateGitHubRepo(repoRootUrl, location, commit): except subprocess.CalledProcessError as e: print ("'git pull' failed with returncode: %d\n" % e.returncode) sys.exit(1) - sys.stdout.flush() - - try: - subprocess.check_call(["git", "-C", targetPath, "checkout", reqdCommit], shell=SHELLARG) - except subprocess.CalledProcessError as e: - print ("'git checkout' failed with returncode: %d\n" % e.returncode) - sys.exit(1) sys.stderr.flush() sys.stdout.flush() else: @@ -115,13 +108,20 @@ def UpdateGitHubRepo(repoRootUrl, location, commit): print("Directory " + targetPath + " does not exist. \n\tUsing 'git clone' to get from " + ghRepoSource) sys.stdout.flush() try: - subprocess.check_call(["git", "-C", scriptRoot, "clone", ghRepoSource, targetPath, "--branch", reqdCommit], shell=SHELLARG) + subprocess.check_call(["git", "-C", scriptRoot, "clone", ghRepoSource, targetPath], shell=SHELLARG) except subprocess.CalledProcessError as e: print("'git clone' failed with returncode: %d\n" % e.returncode) sys.exit(1) sys.stderr.flush() sys.stdout.flush() - + try: + subprocess.check_call(["git", "-C", targetPath, "checkout", reqdCommit], shell=SHELLARG) + except subprocess.CalledProcessError as e: + print ("'git checkout' failed with returncode: %d\n" % e.returncode) + sys.exit(1) + sys.stderr.flush() + sys.stdout.flush() + for key in gitMapping: UpdateGitHubRepo(ghAmdRoot, gitMapping[key][0], gitMapping[key][1]) diff --git a/Scripts/UpdateCommonMap.py b/Scripts/UpdateCommonMap.py index 90c3aa54..e2b0938f 100644 --- a/Scripts/UpdateCommonMap.py +++ b/Scripts/UpdateCommonMap.py @@ -9,19 +9,19 @@ # "git repo name" : ["Directory for clone relative to parent project directory", "branch or commit to checkout (or None for top of tree)"] gitMapping = { # Lib. - "common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", None], - "common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", None], - "common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", None], - "common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", None], - "googletest" : ["../Common/Lib/Ext/GoogleTest", "v1.8.x"], + "common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", "da98d7a9d2b8a6222d32c82952ee44bdfc827b2e"], + "common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", "4fad89c430a886d2e4723e617d821386eb634ec7"], + "common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", "63cd62c8b25e165b0e6f3307b998ed0cf3810edf"], + "common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", "2c99b88d6a8a9b672464436dad771b9799056a8a"], + "googletest" : ["../Common/Lib/Ext/GoogleTest", "542e057c6c5bf45454b43764b881397b71164d62"], # Src. - "common-src-ADLUtil" : ["../Common/Src/ADLUtil", None], - "common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", None], - "common-src-AmdVkExt" : ["../Common/Src/AmdVkExt", None], - "common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", None], - "common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", None], - "common-src-TSingleton" : ["../Common/Src/TSingleton", None], - "common-src-CMakeModules" : ["../Common/Src/CMakeModules", None], + "common-src-ADLUtil" : ["../Common/Src/ADLUtil", "d62c94514326775c83fc129bb89d299c8749ebd1"], + "common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", "9caab274b792ecb3a8d0db4b03315d6564a12eca"], + "common-src-AmdVkExt" : ["../Common/Src/AmdVkExt", "95c1039d849f2a61ba61facf175b866175169819"], + "common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", "8f62f981b950d052fe2549bfc9c3b678f3160c13"], + "common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", "ab1e854a6596e2f4d01c0b99096be11bbcd57ab8"], + "common-src-TSingleton" : ["../Common/Src/TSingleton", "02e8fa7d98f33cdbd0e1f77d1a8a403a32e35882"], + "common-src-CMakeModules" : ["../Common/Src/CMakeModules", "4d593266f3bb8916b15834050744659d0b86fc65"], } # Name : Source , Destination, version, Copied/Installation location wrt to Script root