From 298320b12df0c862ea0ce84f8c100d9e8fc5a802 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 8 Oct 2015 09:06:53 -0600 Subject: misc: do not need pull if using git checkout Also remove unused R32 variable and file now that we can get latest glslang from git. --- glslang_revision_R32 | 1 - update_external_sources.sh | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 glslang_revision_R32 diff --git a/glslang_revision_R32 b/glslang_revision_R32 deleted file mode 100644 index 0a8c17e1..00000000 --- a/glslang_revision_R32 +++ /dev/null @@ -1 +0,0 @@ -32031 diff --git a/update_external_sources.sh b/update_external_sources.sh index cade2b6d..fce9e5e7 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -9,9 +9,7 @@ echo "LUNARGLASS_REVISION=$LUNARGLASS_REVISION" echo "GLSLANG_REVISION=$GLSLANG_REVISION" LUNARGLASS_REVISION_R32=$(cat $PWD/LunarGLASS_revision_R32) -GLSLANG_REVISION_R32=$(cat $PWD/glslang_revision_R32) echo "LUNARGLASS_REVISION_R32=$LUNARGLASS_REVISION_R32" -echo "GLSLANG_REVISION_R32=$GLSLANG_REVISION_R32" BUILDDIR=$PWD BASEDIR=$BUILDDIR/.. @@ -22,18 +20,14 @@ function create_glslang () { mkdir -p $BASEDIR/glslang cd $BASEDIR/glslang git clone git@gitlab.khronos.org:GLSL/glslang.git . - git branch --track Rev32 origin/Rev32 - git checkout Rev32 - # git checkout $GLSLANG_REVISION + git checkout $GLSLANG_REVISION } function update_glslang () { echo "Updating $BASEDIR/glslang" cd $BASEDIR/glslang git fetch --all - git checkout Rev32 - git checkout -f . - # git checkout $GLSLANG_REVISION + git checkout $GLSLANG_REVISION } function create_LunarGLASS () { -- cgit v1.2.3