Skip to content

Commit ae37717

Browse files
committed
Update scripts for 3.2 branch
1 parent 49d4232 commit ae37717

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

Scripts/UpdateCommon.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,7 @@
9898
except subprocess.CalledProcessError as e:
9999
print ("'git pull' failed with returncode: %d\n" % e.returncode)
100100
sys.exit(1)
101-
sys.stdout.flush()
102101

103-
try:
104-
subprocess.check_call(["git", "-C", targetPath, "checkout", reqdCommit], shell=SHELLARG)
105-
except subprocess.CalledProcessError as e:
106-
print ("'git checkout' failed with returncode: %d\n" % e.returncode)
107-
sys.exit(1)
108102
sys.stderr.flush()
109103
sys.stdout.flush()
110104
else:
@@ -114,12 +108,19 @@
114108
print("Directory " + targetPath + " does not exist. \n\tUsing 'git clone' to get from " + ghRepoSource)
115109
sys.stdout.flush()
116110
try:
117-
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)
118112
except subprocess.CalledProcessError as e:
119113
print("'git clone' failed with returncode: %d\n" % e.returncode)
120114
sys.exit(1)
121115
sys.stderr.flush()
122116
sys.stdout.flush()
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()
123124

124125
def download(srcPath, destPath, FileName):
125126
# Assuming path is absolute

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-GoogleTest-1.7" : ["../Common/Lib/Ext/GoogleTest", None],
15-
"common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", None],
16-
"common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", None],
12+
"common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", "04b97aa3138c282d9c2b84b3b2f3d06decbea6df"],
13+
"common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", "4e6d30e406d2e5a65e1d65e404fe6df5f772a32b"],
14+
"common-lib-ext-GoogleTest-1.7" : ["../Common/Lib/Ext/GoogleTest", "3cf708e099a67b1cbbcade19ef8a7a8dbc0a185e"],
15+
"common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", "6b6684bf5408da05efeb24c53f4241a003c1ac6e"],
16+
"common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", "dc6a865cab7aac7a9d3c033c529dbd37cf3cee41"],
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-Vsprops" : ["../Common/Src/Vsprops", None],
18+
"common-src-ADLUtil" : ["../Common/Src/ADLUtil", "2f57a3e44067379a1bdbb7b420d5e95ab2cab55c"],
19+
"common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", "3192b5d86218214fa04462523b58553ac9d406e6"],
20+
"common-src-AmdVkExt" : ["../Common/Src/AmdVkExt", "6b1123404d4bc27ad6b46fb8d8c12b0f02a0c1dd"],
21+
"common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", "6a07ac4ba89cb4e47cae250c293161df2a6177a4"],
22+
"common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", "37160c2c7543f08b04cf0ac633a38f221bfad31e"],
23+
"common-src-TSingleton" : ["../Common/Src/TSingleton", "ebde730c07eac1c1da7f486d65517b93e1550edb"],
24+
"common-src-Vsprops" : ["../Common/Src/Vsprops", "69c97737d688a2e3fe5a5d4ba844ae6ab1cd35c4"],
2525
}
2626

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

0 commit comments

Comments
 (0)