From 328d4da7bd4ffd667c051fc9fcef80c2f4b10295 Mon Sep 17 00:00:00 2001
From: Chris Hesik <christopher.hesik@amd.com>
Date: Wed, 21 Dec 2016 18:05:32 -0500
Subject: [PATCH] UpdateCommon should use specific commits on the GPA branch,
 so that the dependent modules don't float to the most recent versions

---
 Scripts/UpdateCommon.py    |  4 +++-
 Scripts/UpdateCommonMap.py | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Scripts/UpdateCommon.py b/Scripts/UpdateCommon.py
index 3d34f4e7..badcfbff 100644
--- a/Scripts/UpdateCommon.py
+++ b/Scripts/UpdateCommon.py
@@ -20,7 +20,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):
@@ -33,4 +33,6 @@
         commandArgs = ["git", "clone", gitamdRoot, targetPath]
         p = subprocess.Popen( commandArgs )
         p.wait()
+    p = subprocess.Popen(["git","reset","--hard",GitHubMapping[key][1]], cwd=targetPath)
+    p.wait()
 
diff --git a/Scripts/UpdateCommonMap.py b/Scripts/UpdateCommonMap.py
index f812ae16..beac2bdd 100644
--- 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-OpenGLES"                : "../Common/Lib/Ext/OpenGLES",
-    "common-lib-ext-WindowsKits"             : "../Common/Lib/Ext/Windows-Kits",
-    "common-src-ADLUtil"                     : "../Common/Src/ADLUtil",
-    "common-src-AMDTMutex"                   : "../Common/Src/AMDTMutex",
-    "common-src-AmdDxExt"                    : "../Common/Src/AmdDxExt",
-    "common-src-DeviceInfo"                  : "../Common/Src/DeviceInfo",
-    "common-src-DynamicLibraryModule"        : "../Common/Src/DynamicLibraryModule",
-    "common-src-GPUPerfAPIUtils"             : "../Common/Src/GPUPerfAPIUtils",
-    "common-src-TSingleton"                  : "../Common/Src/TSingleton",
-    "common-src-Vsprops"                     : "../Common/Src/Vsprops",
+    "common-lib-amd-ADL"                     : ["../Common/Lib/AMD/ADL", "0f3122ba840b193ca9ebd8f050a7ddac58f3b27e"],
+    "common-lib-amd-APPSDK-3.0"              : ["../Common/Lib/AMD/APPSDK", "acb9bb08f23e5653bbe8b6021a2cf89f1c7fd26f"],
+    "common-lib-ext-GoogleTest-1.7"          : ["../Common/Lib/Ext/GoogleTest", "e6db51ed4f359551e2d0db743141b3c69c324ada"],
+    "common-lib-ext-OpenGL"                  : ["../Common/Lib/Ext/OpenGL", "6b6684bf5408da05efeb24c53f4241a003c1ac6e"],
+    "common-lib-ext-OpenGLES"                : ["../Common/Lib/Ext/OpenGLES", "758b5caeeaff90858f292adc45f8cfda0d34b000"],
+    "common-lib-ext-WindowsKits"             : ["../Common/Lib/Ext/Windows-Kits", "75d314b074e5899e1d8133e6ca253c3dca0307c9"],
+    "common-src-ADLUtil"                     : ["../Common/Src/ADLUtil", "5a54c478c06ced583ac8ad74228f3e84f90e44f6"],
+    "common-src-AMDTMutex"                   : ["../Common/Src/AMDTMutex", "fb68811ed3a475cc9ab1c5d5e0482658ec679716"],
+    "common-src-AmdDxExt"                    : ["../Common/Src/AmdDxExt", "0b9588573fb4ff03ed3dde59e47c86d650d2e46c"],
+    "common-src-DeviceInfo"                  : ["../Common/Src/DeviceInfo", "e6bff98cf1e4e48867fda05d83b8d51c3808c8de"],
+    "common-src-DynamicLibraryModule"        : ["../Common/Src/DynamicLibraryModule", "363090bc8fc026a5708334e5068606250feb0ade"],
+    "common-src-GPUPerfAPIUtils"             : ["../Common/Src/GPUPerfAPIUtils", "d10457ebd4846a84820f83a7dd3e2e11ec1be081"],
+    "common-src-TSingleton"                  : ["../Common/Src/TSingleton", "2a338d5b7e649ffba0225772c521726c18b13fff"],
+    "common-src-Vsprops"                     : ["../Common/Src/Vsprops", "5a434b269727ed1f36c3c31aa56a0ca06502b198"],
 }