From c1d3cf7fb68cde48585f79fc3bd76babba694c51 Mon Sep 17 00:00:00 2001
From: GregF <greg@LunarG.com>
Date: Mon, 21 Sep 2015 17:53:57 -0600
Subject: build: bring update_external_sources.sh to latest rev 31 SPIR-V

---
 LunarGLASS_revision        |  2 +-
 glslang_revision           |  2 +-
 update_external_sources.sh | 26 +++++++++++++++-----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/LunarGLASS_revision b/LunarGLASS_revision
index 0141c45d..094d6491 100644
--- a/LunarGLASS_revision
+++ b/LunarGLASS_revision
@@ -1 +1 @@
-1104
+431d5804d21af260d5938b39575d0103aaf05b51
diff --git a/glslang_revision b/glslang_revision
index bff302dc..b72fbddf 100644
--- a/glslang_revision
+++ b/glslang_revision
@@ -1 +1 @@
-6726cccc91abd91dbcba9af035852b107e6309d9
+b9cd3996c7a67687b0a1fe5066c92e43a820de1e
diff --git a/update_external_sources.sh b/update_external_sources.sh
index d99f8b96..77ce46fa 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -30,23 +30,27 @@ function update_glslang () {
 function create_LunarGLASS () {
    rm -rf $BASEDIR/LunarGLASS
    echo "Creating local LunarGLASS repository ($BASEDIR/LunarGLASS)."
-   mkdir -p $BASEDIR/LunarGLASS/Core/LLVM
-   cd $BASEDIR/LunarGLASS/Core/LLVM 
+   mkdir -p $BASEDIR/LunarGLASS
+   cd $BASEDIR/LunarGLASS
+   git clone https://github.com/LunarG/LunarGLASS.git .
+   mkdir -p Core/LLVM
+   cd Core/LLVM 
    wget http://llvm.org/releases/3.4/llvm-3.4.src.tar.gz
    tar --gzip -xf llvm-3.4.src.tar.gz
-   cd $BASEDIR/LunarGLASS
-   svn checkout --force https://lunarglass.googlecode.com/svn/trunk/ .
-   svn revert --depth=infinity .
+   git checkout -f .  # put back the LunarGLASS versions of some LLVM files
+   git checkout $LUNARGLASS_REVISION
 }
 
 function update_LunarGLASS () {
    echo "Updating $BASEDIR/LunarGLASS"
    cd $BASEDIR/LunarGLASS
-   svn update -r "$LUNARGLASS_REVISION" |& tee svnout
-   if grep --quiet LLVM svnout ; then
-      rm -rf $BASEDIR/LunarGLASS/Core/LLVM/llvm-3.4/build
-   fi
-   rm -rf svnout
+   git fetch
+   git checkout $LUNARGLASS_REVISION |& tee gitout
+   # Figure out how to do this with git
+   #if grep --quiet LLVM gitout ; then
+   #   rm -rf $BASEDIR/LunarGLASS/Core/LLVM/llvm-3.4/build
+   #fi
+   rm -rf gitout
 }
 
 function build_glslang () {
@@ -81,7 +85,7 @@ function build_LunarGLASS () {
 if [ ! -d "$BASEDIR/glslang" -o ! -d "$BASEDIR/glslang/.git" ]; then
    create_glslang
 fi
-if [ ! -d "$BASEDIR/LunarGLASS" ]; then
+if [ ! -d "$BASEDIR/LunarGLASS" -o ! -d "$BASEDIR/LunarGLASS/.git" ]; then
    create_LunarGLASS
 fi
 
-- 
cgit v1.2.3