Skip to content

Commit 233be88

Browse files
committed
Update scripts for 3.4 branch
1 parent 7c28a0c commit 233be88

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Scripts/UpdateCommon.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ def UpdateGitHubRepo(repoRootUrl, location, commit):
9999
except subprocess.CalledProcessError as e:
100100
print ("'git pull' failed with returncode: %d\n" % e.returncode)
101101
sys.exit(1)
102-
sys.stdout.flush()
103-
104-
try:
105-
subprocess.check_call(["git", "-C", targetPath, "checkout", reqdCommit], shell=SHELLARG)
106-
except subprocess.CalledProcessError as e:
107-
print ("'git checkout' failed with returncode: %d\n" % e.returncode)
108-
sys.exit(1)
109102
sys.stderr.flush()
110103
sys.stdout.flush()
111104
else:
@@ -115,13 +108,20 @@ def UpdateGitHubRepo(repoRootUrl, location, commit):
115108
print("Directory " + targetPath + " does not exist. \n\tUsing 'git clone' to get from " + ghRepoSource)
116109
sys.stdout.flush()
117110
try:
118-
subprocess.check_call(["git", "-C", scriptRoot, "clone", ghRepoSource, targetPath, "--branch", reqdCommit], shell=SHELLARG)
111+
subprocess.check_call(["git", "-C", scriptRoot, "clone", ghRepoSource, targetPath], shell=SHELLARG)
119112
except subprocess.CalledProcessError as e:
120113
print("'git clone' failed with returncode: %d\n" % e.returncode)
121114
sys.exit(1)
122115
sys.stderr.flush()
123116
sys.stdout.flush()
124-
117+
try:
118+
subprocess.check_call(["git", "-C", targetPath, "checkout", reqdCommit], shell=SHELLARG)
119+
except subprocess.CalledProcessError as e:
120+
print ("'git checkout' failed with returncode: %d\n" % e.returncode)
121+
sys.exit(1)
122+
sys.stderr.flush()
123+
sys.stdout.flush()
124+
125125
for key in gitMapping:
126126
UpdateGitHubRepo(ghAmdRoot, gitMapping[key][0], gitMapping[key][1])
127127

Scripts/UpdateCommonMap.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
# "git repo name" : ["Directory for clone relative to parent project directory", "branch or commit to checkout (or None for top of tree)"]
1010
gitMapping = {
1111
# Lib.
12-
"common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", None],
13-
"common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", None],
14-
"common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", None],
15-
"common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", None],
16-
"googletest" : ["../Common/Lib/Ext/GoogleTest", "v1.8.x"],
12+
"common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", "da98d7a9d2b8a6222d32c82952ee44bdfc827b2e"],
13+
"common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", "4fad89c430a886d2e4723e617d821386eb634ec7"],
14+
"common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", "63cd62c8b25e165b0e6f3307b998ed0cf3810edf"],
15+
"common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", "2c99b88d6a8a9b672464436dad771b9799056a8a"],
16+
"googletest" : ["../Common/Lib/Ext/GoogleTest", "542e057c6c5bf45454b43764b881397b71164d62"],
1717
# Src.
18-
"common-src-ADLUtil" : ["../Common/Src/ADLUtil", None],
19-
"common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", None],
20-
"common-src-AmdVkExt" : ["../Common/Src/AmdVkExt", None],
21-
"common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", None],
22-
"common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", None],
23-
"common-src-TSingleton" : ["../Common/Src/TSingleton", None],
24-
"common-src-CMakeModules" : ["../Common/Src/CMakeModules", None],
18+
"common-src-ADLUtil" : ["../Common/Src/ADLUtil", "d62c94514326775c83fc129bb89d299c8749ebd1"],
19+
"common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", "9caab274b792ecb3a8d0db4b03315d6564a12eca"],
20+
"common-src-AmdVkExt" : ["../Common/Src/AmdVkExt", "95c1039d849f2a61ba61facf175b866175169819"],
21+
"common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", "8f62f981b950d052fe2549bfc9c3b678f3160c13"],
22+
"common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", "ab1e854a6596e2f4d01c0b99096be11bbcd57ab8"],
23+
"common-src-TSingleton" : ["../Common/Src/TSingleton", "02e8fa7d98f33cdbd0e1f77d1a8a403a32e35882"],
24+
"common-src-CMakeModules" : ["../Common/Src/CMakeModules", "4d593266f3bb8916b15834050744659d0b86fc65"],
2525
}
2626

2727
# Name : Source , Destination, version, Copied/Installation location wrt to Script root

0 commit comments

Comments
 (0)