toolchain: Switch to using github for glslang
We don't have any tags to pull from, but we can pull specific
commits that are tested and known to work.
The current commit matches up with the previous subversion
version of glslang, so there is no functional change.
diff --git a/glslang_revision b/glslang_revision
index ccc6346..33b51a0 100644
--- a/glslang_revision
+++ b/glslang_revision
@@ -1 +1 @@
-31490
+9e41f362a6ee3118b61f076ee156125b59b3a005
diff --git a/update_external_sources.bat b/update_external_sources.bat
index bc36765..e4bb454 100755
--- a/update_external_sources.bat
+++ b/update_external_sources.bat
@@ -26,8 +26,8 @@
set sync-LunarGLASS=0
set build-glslang=0
set build-LunarGLASS=0
- set check-fetch-dependencies=0
set check-glslang-build-dependencies=0
+ set check-LunarGLASS-fetch-dependencies=0
set check-LunarGLASS-build-dependencies=0
:parameterLoop
@@ -42,7 +42,7 @@
if "%1" == "--sync-LunarGLASS" (
set sync-LunarGLASS=1
- set check-fetch-dependencies=1
+ set check-LunarGLASS-fetch-dependencies=1
shift
goto:parameterLoop
)
@@ -57,7 +57,7 @@
if "%1" == "--build-LunarGLASS" (
set sync-LunarGLASS=1
- set check-fetch-dependencies=1
+ set check-LunarGLASS-fetch-dependencies=1
set check-LunarGLASS-build-dependencies=1
set build-LunarGLASS=1
shift
@@ -69,7 +69,7 @@
set sync-LunarGLASS=1
set build-glslang=1
set build-LunarGLASS=1
- set check-fetch-dependencies=1
+ set check-LunarGLASS-fetch-dependencies=1
set check-glslang-build-dependencies=1
set check-LunarGLASS-build-dependencies=1
shift
@@ -85,17 +85,25 @@
REM // ======== Dependency checking ======== //
-
- for %%X in (svn.exe) do (set FOUND=%%~$PATH:X)
+ for %%X in (git.exe) do (set FOUND=%%~$PATH:X)
if not defined FOUND (
echo Dependency check failed:
- echo svn.exe not found
- echo Get Subversion for Windows here: http://sourceforge.net/projects/win32svn/
- echo Install and ensure the svn.exe makes it into your PATH, default is "C:\Program Files (x86)\Subversion\bin"
+ echo git.exe not found
+ echo Install and ensure git.exe makes it into your PATH
+
set errorCode=1
)
- if %check-fetch-dependencies% equ 1 (
+ if %check-LunarGLASS-fetch-dependencies% equ 1 (
+ for %%X in (svn.exe) do (set FOUND=%%~$PATH:X)
+ if not defined FOUND (
+ echo Dependency check failed:
+ echo svn.exe not found
+ echo Get Subversion for Windows here: http://sourceforge.net/projects/win32svn/
+ echo Install and ensure svn.exe makes it into your PATH, default is "C:\Program Files (x86)\Subversion\bin"
+ set errorCode=1
+ )
+
for %%X in (wget.exe) do (set FOUND=%%~$PATH:X)
if not defined FOUND (
echo Dependency check failed:
@@ -242,7 +250,8 @@
echo Creating local glslang repository %GLSLANG_DIR%)
mkdir %GLSLANG_DIR%
cd %GLSLANG_DIR%
- svn checkout https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@%GLSLANG_REVISION% .
+ git clone https://github.com/KhronosGroup/glslang.git .
+ git checkout %GLSLANG_REVISION%
if not exist %GLSLANG_DIR%\SPIRV (
echo glslang source download failed!
set errorCode=1
@@ -253,9 +262,7 @@
echo.
echo Updating %GLSLANG_DIR%
cd %GLSLANG_DIR%
- svn update -r %GLSLANG_REVISION%
- REM Just in case we are moving backward, do a revert
- svn revert -R .
+ git checkout %GLSLANG_REVISION%
goto:eof
:create_LunarGLASS
diff --git a/update_external_sources.sh b/update_external_sources.sh
index 6425e21..5f145f7 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -16,13 +16,14 @@
echo "Creating local glslang repository ($BASEDIR/glslang)."
mkdir -p $BASEDIR/glslang
cd $BASEDIR/glslang
- svn checkout https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang .
+ git clone https://github.com/KhronosGroup/glslang.git .
+ git checkout $GLSLANG_REVISION
}
function update_glslang () {
echo "Updating $BASEDIR/glslang"
cd $BASEDIR/glslang
- svn update -r "$GLSLANG_REVISION"
+ git checkout $GLSLANG_REVISION
}
function create_LunarGLASS () {