From 33026457a27de6c417276561d76bbba1e2d359da Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Fri, 18 Nov 2016 13:20:36 -0700
Subject: build: Move revision files into external_revisions

Moved glslang, spirv-tools and spirv-headers revision files into
the external_revisions subdirectory.  Modified the Win/Lin update
external sources files to use the new locations.

Change-Id: I56138d5ae21430bcc564e6a42723accae1bcb9de
---
 external_revisions/glslang_revision       |  1 +
 external_revisions/spirv-headers_revision |  1 +
 external_revisions/spirv-tools_revision   |  1 +
 glslang_revision                          |  1 -
 spirv-headers_revision                    |  1 -
 spirv-tools_revision                      |  1 -
 update_external_sources.bat               | 15 ++++++++-------
 update_external_sources.sh                |  8 +++++---
 8 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 external_revisions/glslang_revision
 create mode 100644 external_revisions/spirv-headers_revision
 create mode 100644 external_revisions/spirv-tools_revision
 delete mode 100644 glslang_revision
 delete mode 100644 spirv-headers_revision
 delete mode 100644 spirv-tools_revision

diff --git a/external_revisions/glslang_revision b/external_revisions/glslang_revision
new file mode 100644
index 00000000..82b5757d
--- /dev/null
+++ b/external_revisions/glslang_revision
@@ -0,0 +1 @@
+d3f1122a4430563cd47f60060956e88dc559ba22
\ No newline at end of file
diff --git a/external_revisions/spirv-headers_revision b/external_revisions/spirv-headers_revision
new file mode 100644
index 00000000..52a37598
--- /dev/null
+++ b/external_revisions/spirv-headers_revision
@@ -0,0 +1 @@
+bd47a9abaefac00be692eae677daed1b977e625c
\ No newline at end of file
diff --git a/external_revisions/spirv-tools_revision b/external_revisions/spirv-tools_revision
new file mode 100644
index 00000000..99a8fff8
--- /dev/null
+++ b/external_revisions/spirv-tools_revision
@@ -0,0 +1 @@
+38036a7203ca604c0f25b0dc33da169ac58e2900
\ No newline at end of file
diff --git a/glslang_revision b/glslang_revision
deleted file mode 100644
index 82b5757d..00000000
--- a/glslang_revision
+++ /dev/null
@@ -1 +0,0 @@
-d3f1122a4430563cd47f60060956e88dc559ba22
\ No newline at end of file
diff --git a/spirv-headers_revision b/spirv-headers_revision
deleted file mode 100644
index 52a37598..00000000
--- a/spirv-headers_revision
+++ /dev/null
@@ -1 +0,0 @@
-bd47a9abaefac00be692eae677daed1b977e625c
\ No newline at end of file
diff --git a/spirv-tools_revision b/spirv-tools_revision
deleted file mode 100644
index 99a8fff8..00000000
--- a/spirv-tools_revision
+++ /dev/null
@@ -1 +0,0 @@
-38036a7203ca604c0f25b0dc33da169ac58e2900
\ No newline at end of file
diff --git a/update_external_sources.bat b/update_external_sources.bat
index d5f28638..2d01a243 100644
--- a/update_external_sources.bat
+++ b/update_external_sources.bat
@@ -14,6 +14,7 @@ setlocal EnableDelayedExpansion
 set errorCode=0
 set BUILD_DIR=%~dp0
 set BASE_DIR="%BUILD_DIR%external"
+set REVISION_DIR="%BUILD_DIR%external_revisions"
 set GLSLANG_DIR=%BASE_DIR%\glslang
 set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools
 
@@ -121,23 +122,23 @@ if %errorCode% neq 0 (goto:error)
 
 REM Read the target versions from external file, which is shared with Linux script
 
-if not exist glslang_revision (
+if not exist %REVISION_DIR%\glslang_revision (
    echo.
-   echo Missing glslang_revision file!  Place it next to this script with target version in it.
+   echo Missing glslang_revision file!  Place it in %REVSION_DIR% with target version in it.
    set errorCode=1
    goto:error
 )
 
-if not exist spirv-tools_revision (
+if not exist %REVISION_DIR%\spirv-tools_revision (
    echo.
-   echo Missing spirv-tools_revision file!  Place it next to this script with target version in it.
+   echo Missing spirv-tools_revision file!  Place it in %REVISION_DIR% with target version in it.
    set errorCode=1
    goto:error
 )
 
-set /p GLSLANG_REVISION= < glslang_revision
-set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision
-set /p SPIRV_HEADERS_REVISION= < spirv-headers_revision
+set /p GLSLANG_REVISION= < %REVISION_DIR%\glslang_revision
+set /p SPIRV_TOOLS_REVISION= < %REVISION_DIR%\spirv-tools_revision
+set /p SPIRV_HEADERS_REVISION= < %REVISION_DIR%\spirv-headers_revision
 echo GLSLANG_REVISION=%GLSLANG_REVISION%
 echo SPIRV_TOOLS_REVISION=%SPIRV_TOOLS_REVISION%
 echo SPIRV_HEADERS_REVISION=%SPIRV_HEADERS_REVISION%
diff --git a/update_external_sources.sh b/update_external_sources.sh
index 6f87903a..c20297ad 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -3,9 +3,11 @@
 
 set -e
 
-GLSLANG_REVISION=$(cat "${PWD}"/glslang_revision)
-SPIRV_TOOLS_REVISION=$(cat "${PWD}"/spirv-tools_revision)
-SPIRV_HEADERS_REVISION=$(cat "${PWD}"/spirv-headers_revision)
+REVISION_DIR=$PWD/external_revisions
+
+GLSLANG_REVISION=$(cat ${REVISION_DIR}/glslang_revision)
+SPIRV_TOOLS_REVISION=$(cat "${REVISION_DIR}"/spirv-tools_revision)
+SPIRV_HEADERS_REVISION=$(cat "${REVISION_DIR}"/spirv-headers_revision)
 echo "GLSLANG_REVISION=${GLSLANG_REVISION}"
 echo "SPIRV_TOOLS_REVISION=${SPIRV_TOOLS_REVISION}"
 echo "SPIRV_HEADERS_REVISION=${SPIRV_HEADERS_REVISION}"
-- 
cgit v1.2.3