Skip to content

Commit 328d4da

Browse files
committed
UpdateCommon should use specific commits on the GPA branch, so that the dependent modules don't float to the most recent versions
1 parent b1f9bfe commit 328d4da

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

Scripts/UpdateCommon.py

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

2121
for key in GitHubMapping:
2222
# convert targetPath to OS specific format
23-
tmppath = os.path.join(scriptRoot, "..", GitHubMapping[key])
23+
tmppath = os.path.join(scriptRoot, "..", GitHubMapping[key][0])
2424
# clean up path, collapsing any ../ and converting / to \ for Windows
2525
targetPath = os.path.normpath(tmppath)
2626
if os.path.isdir(targetPath):
@@ -33,4 +33,6 @@
3333
commandArgs = ["git", "clone", gitamdRoot, targetPath]
3434
p = subprocess.Popen( commandArgs )
3535
p.wait()
36+
p = subprocess.Popen(["git","reset","--hard",GitHubMapping[key][1]], cwd=targetPath)
37+
p.wait()
3638

Scripts/UpdateCommonMap.py

Lines changed: 14 additions & 14 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-OpenGLES" : "../Common/Lib/Ext/OpenGLES",
14-
"common-lib-ext-WindowsKits" : "../Common/Lib/Ext/Windows-Kits",
15-
"common-src-ADLUtil" : "../Common/Src/ADLUtil",
16-
"common-src-AMDTMutex" : "../Common/Src/AMDTMutex",
17-
"common-src-AmdDxExt" : "../Common/Src/AmdDxExt",
18-
"common-src-DeviceInfo" : "../Common/Src/DeviceInfo",
19-
"common-src-DynamicLibraryModule" : "../Common/Src/DynamicLibraryModule",
20-
"common-src-GPUPerfAPIUtils" : "../Common/Src/GPUPerfAPIUtils",
21-
"common-src-TSingleton" : "../Common/Src/TSingleton",
22-
"common-src-Vsprops" : "../Common/Src/Vsprops",
9+
"common-lib-amd-ADL" : ["../Common/Lib/AMD/ADL", "0f3122ba840b193ca9ebd8f050a7ddac58f3b27e"],
10+
"common-lib-amd-APPSDK-3.0" : ["../Common/Lib/AMD/APPSDK", "acb9bb08f23e5653bbe8b6021a2cf89f1c7fd26f"],
11+
"common-lib-ext-GoogleTest-1.7" : ["../Common/Lib/Ext/GoogleTest", "e6db51ed4f359551e2d0db743141b3c69c324ada"],
12+
"common-lib-ext-OpenGL" : ["../Common/Lib/Ext/OpenGL", "6b6684bf5408da05efeb24c53f4241a003c1ac6e"],
13+
"common-lib-ext-OpenGLES" : ["../Common/Lib/Ext/OpenGLES", "758b5caeeaff90858f292adc45f8cfda0d34b000"],
14+
"common-lib-ext-WindowsKits" : ["../Common/Lib/Ext/Windows-Kits", "75d314b074e5899e1d8133e6ca253c3dca0307c9"],
15+
"common-src-ADLUtil" : ["../Common/Src/ADLUtil", "5a54c478c06ced583ac8ad74228f3e84f90e44f6"],
16+
"common-src-AMDTMutex" : ["../Common/Src/AMDTMutex", "fb68811ed3a475cc9ab1c5d5e0482658ec679716"],
17+
"common-src-AmdDxExt" : ["../Common/Src/AmdDxExt", "0b9588573fb4ff03ed3dde59e47c86d650d2e46c"],
18+
"common-src-DeviceInfo" : ["../Common/Src/DeviceInfo", "e6bff98cf1e4e48867fda05d83b8d51c3808c8de"],
19+
"common-src-DynamicLibraryModule" : ["../Common/Src/DynamicLibraryModule", "363090bc8fc026a5708334e5068606250feb0ade"],
20+
"common-src-GPUPerfAPIUtils" : ["../Common/Src/GPUPerfAPIUtils", "d10457ebd4846a84820f83a7dd3e2e11ec1be081"],
21+
"common-src-TSingleton" : ["../Common/Src/TSingleton", "2a338d5b7e649ffba0225772c521726c18b13fff"],
22+
"common-src-Vsprops" : ["../Common/Src/Vsprops", "5a434b269727ed1f36c3c31aa56a0ca06502b198"],
2323
}
2424

0 commit comments

Comments
 (0)