Skip to content

Commit d7450dc

Browse files
committed
Update scripts for 3.0 branch
1 parent 9455320 commit d7450dc

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

Scripts/UpdateCommon.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
for key in GitHubMapping:
4747
# convert targetPath to OS specific format
48-
tmppath = os.path.join(scriptRoot, "..", GitHubMapping[key])
48+
tmppath = os.path.join(scriptRoot, "..", GitHubMapping[key][0])
4949
# clean up path, collapsing any ../ and converting / to \ for Windows
5050
targetPath = os.path.normpath(tmppath)
5151
if os.path.isdir(targetPath):
@@ -58,6 +58,8 @@
5858
commandArgs = ["git", "clone", gitamdRoot, targetPath]
5959
p = subprocess.Popen( commandArgs )
6060
p.wait()
61+
p = subprocess.Popen(["git","reset","--hard",GitHubMapping[key][1]], cwd=targetPath)
62+
p.wait()
6163

6264
# Downloads and runs an installer for a Common Dir (just used for VulkanSDK currently)
6365
# key is the URL to download the installer

Scripts/UpdateCommonMap.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66

77
# GitHub GPUOpen-Tools projects map
88
GitHubMapping = {
9-
"common-lib-amd-ADL" : "../Common/Lib/AMD/ADL",
10-
"common-lib-amd-APPSDK-3.0" : "../Common/Lib/AMD/APPSDK",
11-
"common-lib-ext-GoogleTest-1.7" : "../Common/Lib/Ext/GoogleTest",
12-
"common-lib-ext-OpenGL" : "../Common/Lib/Ext/OpenGL",
13-
"common-lib-ext-WindowsKits" : "../Common/Lib/Ext/Windows-Kits",
14-
"common-lib-ext-Vulkan-1.0.49.0" : "../Common/Lib/Ext/Vulkan",
15-
"common-src-ADLUtil" : "../Common/Src/ADLUtil",
16-
"common-src-AmdDxExt" : "../Common/Src/AmdDxExt",
17-
"common-src-AmdVkExt" : "../Common/Src/AmdVkExt",
18-
"common-src-DeviceInfo" : "../Common/Src/DeviceInfo",
19-
"common-src-DynamicLibraryModule" : "../Common/Src/DynamicLibraryModule",
20-
"common-src-TSingleton" : "../Common/Src/TSingleton",
21-
"common-src-Vsprops" : "../Common/Src/Vsprops",
9+
"common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", "99cb60efe22718c1e12415b6b381facfdc7c7979"],
10+
"common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", "52c521c0b6ae72d38bb6b324941a9bc2bff88b20"],
11+
"common-lib-ext-GoogleTest-1.7" : ["../Common/Lib/Ext/GoogleTest", "7ab958af33ee2d435b52d341f95aafb67e0189d0"],
12+
"common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", "6b6684bf5408da05efeb24c53f4241a003c1ac6e"],
13+
"common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", "75d314b074e5899e1d8133e6ca253c3dca0307c9"],
14+
"common-lib-ext-Vulkan-1.0.49.0" : ["../Common/Lib/Ext/Vulkan", "2940df77aed7f794f0c6808f8a42f3dbd812457a"],
15+
"common-src-ADLUtil" : ["../Common/Src/ADLUtil", "fa6949339b23529b30cf186188039adcb63ec596"],
16+
"common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", "1e16621535a70dc4e088aaa7975ac4b84949f9e3"],
17+
"common-src-AmdVkExt" : ["../Common/Src/AmdVkExt", "ddee45ff247d37e6abc662dcd11d7a48a3cd3707"],
18+
"common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", "15ab2c9116565f277113ede928df3f1cb1fc52d6"],
19+
"common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", "c331489a4167aca1f6d2e9a907ab7758c0b9bd90"],
20+
"common-src-TSingleton" : ["../Common/Src/TSingleton", "2a338d5b7e649ffba0225772c521726c18b13fff"],
21+
"common-src-Vsprops" : ["../Common/Src/Vsprops", "5a434b269727ed1f36c3c31aa56a0ca06502b198"],
2222
}
2323

2424
downloadAndInstallMappingWin = {

0 commit comments

Comments
 (0)