Fix build errors:

- No more SPIRV-Tools revision file. Instead, the
  revision-parsing script just runs "git rev-parse HEAD"
  in the spirv-tools repository to extract the commit ID.
- Invoke the revision-parsing script from the .sh Android scripts,
  in addition to the .bat scripts.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5aa0c3..574f11f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,10 +316,10 @@ macro(run_vk_xml_generate dependency output)
 endmacro()
 
 # Define macro used for generating header files containing commit IDs for external dependencies
-macro(run_external_revision_generate source_dir revision_file output)
+macro(run_external_revision_generate source_dir symbol_name output)
     add_custom_command(OUTPUT ${output}
-    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir} ${revision_file} ${output}
-    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${revision_file}
+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir} ${symbol_name} ${output}
+    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index
     )
 endmacro()
 
@@ -349,7 +349,7 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h)
 run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
 run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
 run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/spirv-tools ${CMAKE_CURRENT_SOURCE_DIR}/external_revisions/spirv-tools_revision spirv_tools_commit_id.h)
+run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
 
 if(NOT WIN32)
     include(GNUInstallDirs)

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index 171e656..b3982f2 100644 (file)
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -34,6 +34,6 @@ py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_layer_d
 py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h
 py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml object_tracker.cpp
 py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_typemap_helper.h
-py -3 ../../../scripts/external_revision_generator.py ../../../external/spirv-tools ../../../external_revisions/spirv-tools_revision spirv_tools_commit_id.h
+py -3 ../../../scripts/external_revision_generator.py ../../third_party/shaderc/third_party/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h
 cd ../..
 

diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index 504bb76..6058f00 100755 (executable)
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -37,6 +37,6 @@ mkdir -p generated/include generated/common
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml object_tracker.cpp )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_typemap_helper.h )
-( cd generated/include; python3 ../../../scripts/external_revision_generator.py ../../../external/spirv-tools ../../../external_revisions/spirv-tools_revision spirv_tools_commit_id.h )
+( cd generated/include; python3 ../../../scripts/external_revision_generator.py ../../third_party/shaderc/third_party/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h )
 
 exit 0

diff --git a/scripts/external_revision_generator.py b/scripts/external_revision_generator.py
index acfb42e..34f7102 100644 (file)
--- a/scripts/external_revision_generator.py
+++ b/scripts/external_revision_generator.py
@@ -23,24 +23,17 @@ import os
 import subprocess
 import sys
 
-
-
 if __name__ == '__main__':
     if (len(sys.argv) != 4):
-        print("Usage: %s <SPIRV_TOOLS_SOURCE_DIR> <SPIRV_TOOLS_REVISION_FILE> <OUTPUT_HEADER_FILE>" % sys.argv[0])
+        print("Usage: %s <SOURCE_DIR> <SYMBOL_NAME> <OUTPUT_HEADER_FILE>" % sys.argv[0])
         sys.exit(os.EX_USAGE)
     
-    spirv_tools_source_dir = sys.argv[1]
-    spirv_tools_revision_file = sys.argv[2]
+    source_dir = sys.argv[1]
+    symbol_name = sys.argv[2]
     output_header_file = sys.argv[3]
     
-    # Load SPIRV-Tools revision
-    with open(spirv_tools_revision_file, "r") as rev_file:
-      revision = rev_file.read().replace('\n', '')
-      
-    # The revision listed in the file may be symbolic; use "git rev-parse" to
-    # convert it to a commit hash
-    spirv_tools_commit_id = subprocess.check_output(["git", "rev-parse", revision], cwd=spirv_tools_source_dir).decode('utf-8').strip()
+    # Extract commit ID from the specified source directory
+    commit_id = subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=source_dir).decode('utf-8').strip()
     
     # Write commit ID to output header file
     with open(output_header_file, "w") as header_file:
@@ -77,6 +70,6 @@ if __name__ == '__main__':
         header_file.write(copyright)
         # Contents
         contents = '#pragma once\n\n'
-        contents += '#define SPIRV_TOOLS_COMMIT_ID "' + spirv_tools_commit_id + '"\n'
+        contents += '#define %s "%s"\n' % (symbol_name, commit_id)
         header_file.write(contents)
     
\ No newline at end of file