Update scripts for 3.0 branch

GPUOpen-Tools · Mar 20, 2018 · d7450dc · d7450dc
1 parent 9455320
commit d7450dc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/Scripts/UpdateCommon.py b/Scripts/UpdateCommon.py
@@ -45,7 +45,7 @@
 
 for key in GitHubMapping:
     # convert targetPath to OS specific format
-    tmppath = os.path.join(scriptRoot, "..", GitHubMapping[key])
+    tmppath = os.path.join(scriptRoot, "..", GitHubMapping[key][0])
     # clean up path, collapsing any ../ and converting / to \ for Windows
     targetPath = os.path.normpath(tmppath)
     if os.path.isdir(targetPath):
@@ -58,6 +58,8 @@
         commandArgs = ["git", "clone", gitamdRoot, targetPath]
         p = subprocess.Popen( commandArgs )
         p.wait()
+        p = subprocess.Popen(["git","reset","--hard",GitHubMapping[key][1]], cwd=targetPath)
+        p.wait()
 
 # Downloads and runs an installer for a Common Dir (just used for VulkanSDK currently)
 # key is the URL to download the installer

diff --git a/Scripts/UpdateCommonMap.py b/Scripts/UpdateCommonMap.py
@@ -6,19 +6,19 @@
 
 # GitHub GPUOpen-Tools projects map
 GitHubMapping = {
-    "common-lib-amd-ADL"                     : "../Common/Lib/AMD/ADL",
-    "common-lib-amd-APPSDK-3.0"              : "../Common/Lib/AMD/APPSDK",
-    "common-lib-ext-GoogleTest-1.7"          : "../Common/Lib/Ext/GoogleTest",
-    "common-lib-ext-OpenGL"                  : "../Common/Lib/Ext/OpenGL",
-    "common-lib-ext-WindowsKits"             : "../Common/Lib/Ext/Windows-Kits",
-    "common-lib-ext-Vulkan-1.0.49.0"         : "../Common/Lib/Ext/Vulkan",
-    "common-src-ADLUtil"                     : "../Common/Src/ADLUtil",
-    "common-src-AmdDxExt"                    : "../Common/Src/AmdDxExt",
-    "common-src-AmdVkExt"                    : "../Common/Src/AmdVkExt",
-    "common-src-DeviceInfo"                  : "../Common/Src/DeviceInfo",
-    "common-src-DynamicLibraryModule"        : "../Common/Src/DynamicLibraryModule",
-    "common-src-TSingleton"                  : "../Common/Src/TSingleton",
-    "common-src-Vsprops"                     : "../Common/Src/Vsprops",
+    "common-lib-amd-ADL"                     : ["../Common/Lib/AMD/ADL", "99cb60efe22718c1e12415b6b381facfdc7c7979"],
+    "common-lib-amd-APPSDK-3.0"              : ["../Common/Lib/AMD/APPSDK", "52c521c0b6ae72d38bb6b324941a9bc2bff88b20"],
+    "common-lib-ext-GoogleTest-1.7"          : ["../Common/Lib/Ext/GoogleTest", "7ab958af33ee2d435b52d341f95aafb67e0189d0"],
+    "common-lib-ext-OpenGL"                  : ["../Common/Lib/Ext/OpenGL", "6b6684bf5408da05efeb24c53f4241a003c1ac6e"],
+    "common-lib-ext-WindowsKits"             : ["../Common/Lib/Ext/Windows-Kits", "75d314b074e5899e1d8133e6ca253c3dca0307c9"],
+    "common-lib-ext-Vulkan-1.0.49.0"         : ["../Common/Lib/Ext/Vulkan", "2940df77aed7f794f0c6808f8a42f3dbd812457a"],
+    "common-src-ADLUtil"                     : ["../Common/Src/ADLUtil", "fa6949339b23529b30cf186188039adcb63ec596"],
+    "common-src-AmdDxExt"                    : ["../Common/Src/AmdDxExt", "1e16621535a70dc4e088aaa7975ac4b84949f9e3"],
+    "common-src-AmdVkExt"                    : ["../Common/Src/AmdVkExt", "ddee45ff247d37e6abc662dcd11d7a48a3cd3707"],
+    "common-src-DeviceInfo"                  : ["../Common/Src/DeviceInfo", "15ab2c9116565f277113ede928df3f1cb1fc52d6"],
+    "common-src-DynamicLibraryModule"        : ["../Common/Src/DynamicLibraryModule", "c331489a4167aca1f6d2e9a907ab7758c0b9bd90"],
+    "common-src-TSingleton"                  : ["../Common/Src/TSingleton", "2a338d5b7e649ffba0225772c521726c18b13fff"],
+    "common-src-Vsprops"                     : ["../Common/Src/Vsprops", "5a434b269727ed1f36c3c31aa56a0ca06502b198"],
 }
 
 downloadAndInstallMappingWin = {