diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-11-18 13:20:36 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-11-22 09:03:13 -0700 |
| commit | 33026457a27de6c417276561d76bbba1e2d359da (patch) | |
| tree | 19622e4e0290d88fbfacaf463b612f0f7810ef0d | |
| parent | 831298a9579aded6f7906aa05c35ebbd41f9235a (diff) | |
| download | usermoji-33026457a27de6c417276561d76bbba1e2d359da.tar.xz | |
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
| -rw-r--r-- | external_revisions/glslang_revision (renamed from glslang_revision) | 0 | ||||
| -rw-r--r-- | external_revisions/spirv-headers_revision (renamed from spirv-headers_revision) | 0 | ||||
| -rw-r--r-- | external_revisions/spirv-tools_revision (renamed from spirv-tools_revision) | 0 | ||||
| -rw-r--r-- | update_external_sources.bat | 15 | ||||
| -rwxr-xr-x | update_external_sources.sh | 8 |
5 files changed, 13 insertions, 10 deletions
diff --git a/glslang_revision b/external_revisions/glslang_revision index 82b5757d..82b5757d 100644 --- a/glslang_revision +++ b/external_revisions/glslang_revision diff --git a/spirv-headers_revision b/external_revisions/spirv-headers_revision index 52a37598..52a37598 100644 --- a/spirv-headers_revision +++ b/external_revisions/spirv-headers_revision diff --git a/spirv-tools_revision b/external_revisions/spirv-tools_revision index 99a8fff8..99a8fff8 100644 --- a/spirv-tools_revision +++ b/external_revisions/spirv-tools_revision 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}" |