[CMake] Declare the precise dependencies of the gyb custom command invocations

Author: akyrtzi

cmake/modules/AddSwift.cmake

@@ -7,9 +7,11 @@ include(SwiftAndroidSupport)
 function(_swift_gyb_target_sources target scope)
   file(GLOB GYB_UNICODE_DATA ${SWIFT_SOURCE_DIR}/utils/UnicodeData/*)
   file(GLOB GYB_STDLIB_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_stdlib_support.py)
-  file(GLOB GYB_SYNTAX_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/*)
-  file(GLOB GYB_SOURCEKIT_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/*)
+  file(GLOB GYB_SYNTAX_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/*.py)
+  file(GLOB GYB_SOURCEKIT_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/*.py)
   set(GYB_SOURCES
+    ${SWIFT_SOURCE_DIR}/utils/gyb
+    ${SWIFT_SOURCE_DIR}/utils/gyb.py
     ${SWIFT_SOURCE_DIR}/utils/GYBUnicodeDataUtils.py
     ${SWIFT_SOURCE_DIR}/utils/SwiftIntTypes.py
     ${GYB_UNICODE_DATA}

cmake/modules/SwiftHandleGybSources.cmake

@@ -77,7 +77,8 @@ endfunction()
 # handle_gyb_sources(
 #     dependency_out_var_name
 #     sources_var_name
-#     arch)
+#     [ARCH arch]
+#     [DEPENDS [depends ...]])
 #
 # Replace, in ${sources_var_name}, the given .gyb-suffixed sources with
 # their un-suffixed intermediate files, which will be generated by processing
@@ -93,11 +94,21 @@ endfunction()
 #   false, the files are architecture-independent and will be emitted
 #   into ${CMAKE_CURRENT_BINARY_DIR} instead of an architecture-specific
 #   destination; this is useful for generated include files.
-function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
+#
+# depends
+#   Additional file dependencies beyond the standard dependencies that all gyb
+#   invocations get.
+function(handle_gyb_sources dependency_out_var_name sources_var_name)
+  set(options)
+  set(single_value_args ARCH)
+  set(multi_value_args DEPENDS)
+  cmake_parse_arguments(GYB
+    "${options}" "${single_value_args}" "${multi_value_args}" ${ARGN})
+
   set(extra_gyb_flags "")
-  if (arch)
+  if (GYB_ARCH)
     set_if_arch_bitness(ptr_size
-      ARCH "${arch}"
+      ARCH "${GYB_ARCH}"
       CASE_32_BIT "4"
       CASE_64_BIT "8")
     set(extra_gyb_flags "-DCMAKE_SIZEOF_VOID_P=${ptr_size}")
@@ -141,7 +152,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       set(dir_root ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 
-    if (arch)
+    if (GYB_ARCH)
       set(dir "${dir_root}/${ptr_size}")
     else()
       set(dir "${dir_root}")
@@ -154,7 +165,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
         SOURCE "${src}"
         OUTPUT "${output_file_name}"
         FLAGS ${extra_gyb_flags}
-        DEPENDS "${gyb_extra_sources}"
+        DEPENDS "${GYB_DEPENDS}" "${gyb_extra_sources}"
         COMMENT "with ptr size = ${ptr_size}")
     list(APPEND dependency_targets "${dependency_target}")
   endforeach()
@@ -163,13 +174,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
 endfunction()
 
 function(add_gyb_target target sources)
-  set(options)
-  set(single_value_args ARCH)
-  set(multi_value_args)
-  cmake_parse_arguments(GYB
-    "${options}" "${single_value_args}" "${multi_value_args}" ${ARGN})
-
-  handle_gyb_sources(gyb_sources_depends sources "${GYB_ARCH}")
+  handle_gyb_sources(gyb_sources_depends sources ${ARGN})
 
   add_custom_target(${target}
     DEPENDS "${gyb_sources_depends}")

lib/ClangImporter/CMakeLists.txt

@@ -2,7 +2,8 @@ set(SWIFT_GYB_FLAGS
     "-DCFDatabaseFile=${SWIFT_SOURCE_DIR}/lib/ClangImporter/CFDatabase.def")
 
 add_gyb_target(generated_sorted_cf_database
-    SortedCFDatabase.def.gyb)
+    SortedCFDatabase.def.gyb
+    DEPENDS "${SWIFT_SOURCE_DIR}/lib/ClangImporter/CFDatabase.def")
 
 add_swift_host_library(swiftClangImporter STATIC
   CFTypeInfo.cpp

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -729,7 +729,7 @@ function(_add_swift_target_library_single target name)
     handle_gyb_sources(
         gyb_dependency_targets
         SWIFTLIB_SINGLE_GYB_SOURCES
-        "${SWIFTLIB_SINGLE_ARCHITECTURE}")
+        ARCH "${SWIFTLIB_SINGLE_ARCHITECTURE}")
     set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_SOURCES}
       ${SWIFTLIB_SINGLE_GYB_SOURCES})
   endif()

unittests/Basic/CMakeLists.txt

@@ -3,7 +3,7 @@ set(generated_tests UnicodeGraphemeBreakTest.cpp.gyb)
 handle_gyb_sources(
     gyb_dependency_targets
     generated_tests
-    ${SWIFT_HOST_VARIANT_ARCH})
+    ARCH ${SWIFT_HOST_VARIANT_ARCH})
 
 add_swift_unittest(SwiftBasicTests
   BlotMapVectorTest.cpp