Remove angle

Author: dkulp

.gitignore

@@ -10,5 +10,3 @@ bin
 output
 spm-artifacts
 submodules/*.log
-submodules/angle-prebuilt
-submodules/klightmapper-prebuilt

build.sh

@@ -56,13 +56,8 @@ cd submodules
 ./build_curl_ios.sh 2>&1 | tee ./build_curl_ios.log
 ./build_shader_translate_ios.sh 2>&1 | tee ./build_shader_translate_ios.log
 
-
-./build_angle.sh 2>&1 | tee ./build_angle.log
-
-
 cd ..
 
-
 rm -rf output
 mkdir -p output
 

submodules/build_angle.sh

@@ -13,9 +13,10 @@ BASE_DEPS_DIR=$( dirname -- "${SCRIPT_DIR}" )
 STAGE="${SCRIPT_DIR}/.shader_translate_stage"
 rm -rf "${STAGE}"; mkdir -p "${STAGE}"
 
-# glslang carries version-matched SPIRV-Tools + SPIRV-Headers via its updater.
-[ -d glslang ]     || git clone --depth 1 https://github.com/KhronosGroup/glslang.git
-[ -d SPIRV-Cross ] || git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Cross.git
+# glslang carries version-matched SPIRV-Tools + SPIRV-Headers via its updater
+# (fetched into glslang/External each run; cleaned up below).
+[ -f glslang/CMakeLists.txt ]     || git clone --depth 1 https://github.com/KhronosGroup/glslang.git
+[ -f SPIRV-Cross/CMakeLists.txt ] || git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Cross.git
 ( cd glslang && python3 update_glslang_sources.py )
 
 COMMON=(
@@ -52,4 +53,9 @@ cp -R "${STAGE}/include/glslang"     "${BASE_DEPS_DIR}/include/"
 cp -R "${STAGE}/include/spirv-tools"  "${BASE_DEPS_DIR}/include/"
 cp -R "${STAGE}/include/spirv_cross"  "${BASE_DEPS_DIR}/include/"
 rm -rf "${STAGE}"
+
+# Leave the checkouts pristine so the parent repo's git status stays clean
+# (removes build dirs and glslang/External; both are re-created on next run).
+( cd glslang     && git clean -dffx -q )
+( cd SPIRV-Cross && git clean -dffx -q )
 echo "shader-translate deps installed."

submodules/build_shader_translate.sh

@@ -9,8 +9,10 @@ set -e
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BASE_DEPS_DIR=$( dirname -- "${SCRIPT_DIR}" )
 
-# Sources are cloned/updated by build_shader_translate.sh (run it first).
-[ -d glslang ] || { echo "run build_shader_translate.sh first (clones sources)"; exit 1; }
+# Self-contained: sources come from the submodules (or build_shader_translate.sh's
+# clones); glslang's External deps are re-fetched if a prior cleanup removed them.
+[ -f glslang/CMakeLists.txt ] || { echo "glslang sources missing (init submodules or run build_shader_translate.sh)"; exit 1; }
+[ -d glslang/External/spirv-tools ] || ( cd glslang && python3 update_glslang_sources.py )
 
 LIBS="libglslang.a libSPIRV.a libMachineIndependent.a libGenericCodeGen.a \
       libglslang-default-resource-limits.a libOSDependent.a \
@@ -50,3 +52,7 @@ build_variant() {  # $1=tag $2=sysroot("" for device) $3=libtree $4=dbgtree
 
 build_variant device ""               lib-ios     libdbg-ios
 build_variant sim    iphonesimulator  lib-ios-sim libdbg-ios-sim
+
+# Leave the checkouts pristine so the parent repo's git status stays clean.
+( cd glslang     && git clean -dffx -q )
+( cd SPIRV-Cross && git clean -dffx -q )