commit acfb0491b89d57c3915f661edaad114d64d87386
author Cody Northrop <cody@lunarg.com> Tue Mar 17 15:55:58 2015 -0600
committer Cody Northrop <cody@lunarg.com> Wed Mar 18 08:43:10 2015 -0600
tree d83312f4a9348faf8c00c9e17d5ed6bc3b8813b4
parent d4e020aa1921643b14a3a546f6807afbafa7629e

SPIR-V: Change BIL to SPV in all source files

update_external_sources.sh

diff --git a/update_external_sources.sh b/update_external_sources.sh
index f572032..73ed8ee 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 # Update source for glslang and LLVM
-# Copy necessary BIL pieces into glslang and LLVM
 
-BIL_REVISION=29773
-LUNARGLASS_REVISION=1060
-GLSLANG_REVISION=29773
+LUNARGLASS_REVISION=1061
+GLSLANG_REVISION=30042
 
 BUILDDIR=$PWD
 BASEDIR=$BUILDDIR/..
@@ -35,42 +33,12 @@
    svn revert --depth=infinity .
 }
 
-function create_BIL () {
-   rm -rf $BASEDIR/BIL
-   echo "Creating local BIL repository ($BASEDIR/BIL)."
-   mkdir -p $BASEDIR/BIL
-   cd $BASEDIR/BIL
-   svn checkout --username "$KHRONOS_ACCOUNT_NAME" https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/proposals/BIL .
-}
-
 function update_LunarGLASS () {
    echo "Updating $BASEDIR/LunarGLASS"
    cd $BASEDIR/LunarGLASS
    svn update -r "$LUNARGLASS_REVISION"
 }
 
-function update_BIL () {
-   # Update source
-   cd $BASEDIR/BIL
-   echo "Updating $BASEDIR/BIL"
-   svn update -r "$BIL_REVISION"
-   # copy of necessary BIL pieces into glslang
-   cp $BASEDIR/BIL/glslangOverlay_into_BIL/*.h  $BASEDIR/glslang/BIL
-   cp $BASEDIR/BIL/glslangOverlay_into_BIL/*.cpp  $BASEDIR/glslang/BIL
-   cp $BASEDIR/BIL/glslangOverlay_into_BIL/*.txt  $BASEDIR/glslang/BIL
-   cp -r $BASEDIR/BIL/glslangOverlay_into_BIL/glslang/*  $BASEDIR/glslang/glslang/
-   cp -uv $BASEDIR/BIL/Bil.h $BASEDIR/glslang/BIL
-   cp -uv $BASEDIR/BIL/GLSL450Lib.h $BASEDIR/glslang/BIL
-
-   # copy of necessary BIL pieces into LLVM
-   cp -uv $BASEDIR/BIL/ToLLVM/CMakeLists.txt $BASEDIR/LunarGLASS
-   cp -r $BASEDIR/BIL/ToLLVM/Standalone $BASEDIR/LunarGLASS
-
-   cp -r $BASEDIR/BIL/ToLLVM/FrontEnds/* $BASEDIR/LunarGLASS/Frontends/
-   cp -uv $BASEDIR/BIL/ToLLVM/Backends/GLSL/BottomToGLSL.cpp $BASEDIR/LunarGLASS/Backends/GLSL
-
-}
-
 function build_glslang () {
    echo "Building $BASEDIR/glslang"
    cd $BASEDIR/glslang
@@ -100,29 +68,15 @@
    make install
 }
 
-if [ -z "$KHRONOS_ACCOUNT_NAME" ]; then
-   echo "Must define KHRONOS_ACCOUNT_NAME to access BIL component"
-   exit 1
-fi
-
 if [ ! -d "$BASEDIR/glslang" ]; then
    create_glslang
 fi
 if [ ! -d "$BASEDIR/LunarGLASS" ]; then
    create_LunarGLASS
 fi
-if [ ! -d "$BASEDIR/BIL" ]; then
-   create_BIL
-fi
-
-if [ ! -d "$BASEDIR/BIL" -o ! -f "$BASEDIR/BIL/Bil.h" ]; then
-      echo "Missing BIL, is your Khronos account correct?"
-      exit 1
-fi
 
 update_glslang
 update_LunarGLASS
-update_BIL
 
 build_glslang
 build_LunarGLASS