Browse Source

[spirv] Use git submodules for SPIR-V dependency projects (#455)

Lei Zhang 8 years ago
parent
commit
bd2371f900
8 changed files with 21 additions and 8 deletions
  1. 0 3
      .gitignore
  2. 15 0
      .gitmodules
  3. 1 5
      appveyor.yml
  4. 1 0
      external/SPIRV-Headers
  5. 1 0
      external/SPIRV-Tools
  6. 1 0
      external/effcee
  7. 1 0
      external/googletest
  8. 1 0
      external/re2

+ 0 - 3
.gitignore

@@ -68,9 +68,6 @@ tools/polly
 docs/_build
 # TAEF crash logs.
 WexLogFileOutput/*
-# SPIR-V dependencies.
-external/SPIRV-Headers
-external/SPIRV-Tools
 
 #==============================================================================#
 # Files created in tree by the Go bindings.

+ 15 - 0
.gitmodules

@@ -0,0 +1,15 @@
+[submodule "external/SPIRV-Headers"]
+	path = external/SPIRV-Headers
+	url = https://github.com/KhronosGroup/SPIRV-Headers
+[submodule "external/SPIRV-Tools"]
+	path = external/SPIRV-Tools
+	url = https://github.com/KhronosGroup/SPIRV-Tools
+[submodule "external/googletest"]
+	path = external/googletest
+	url = https://github.com/google/googletest
+[submodule "external/re2"]
+	path = external/re2
+	url = https://github.com/google/re2
+[submodule "external/effcee"]
+	path = external/effcee
+	url = https://github.com/google/effcee

+ 1 - 5
appveyor.yml

@@ -8,11 +8,7 @@ environment:
   HLSL_BLD_DIR: c:\projects\DirectXShaderCompiler.bin
 install:
 - ps: c:\projects\DirectXShaderCompiler\utils\appveyor\appveyor_setup.ps1
-- git clone --depth=1 https://github.com/google/googletest.git          %HLSL_SRC_DIR%\external\googletest
-- git clone --depth=1 https://github.com/google/effcee.git              %HLSL_SRC_DIR%\external\effcee
-- git clone --depth=1 https://github.com/google/re2.git                 %HLSL_SRC_DIR%\external\re2
-- git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers.git %HLSL_SRC_DIR%\external\SPIRV-Headers
-- git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Tools.git   %HLSL_SRC_DIR%\external\SPIRV-Tools
+- git submodule update --init --recursive
 build_script:
 - cmd: >-
     cd %HLSL_SRC_DIR%

+ 1 - 0
external/SPIRV-Headers

@@ -0,0 +1 @@
+Subproject commit 63e1062a194750b354d48be8c16750d7a4d0dc4e

+ 1 - 0
external/SPIRV-Tools

@@ -0,0 +1 @@
+Subproject commit dbc2049aa35a06b160b91fb76820358a17b77bfa

+ 1 - 0
external/effcee

@@ -0,0 +1 @@
+Subproject commit 4a6edb2f740b9b87b04306a7815f42de5ca149a4

+ 1 - 0
external/googletest

@@ -0,0 +1 @@
+Subproject commit 59c795ce08be0c8b225bc894f8da6c7954ea5c14

+ 1 - 0
external/re2

@@ -0,0 +1 @@
+Subproject commit b2c9765b4a7afbea8b6be1dae548b6f4d5f39e42