swiftlang · gottesmm · Mar 20, 2019 · Mar 10, 2019
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -721,6 +721,7 @@ function(_add_swift_library_single target name)
         FILE_DEPENDS
         FRAMEWORK_DEPENDS
         FRAMEWORK_DEPENDS_WEAK
+        GYB_SOURCES
         INCORPORATE_OBJECT_LIBRARIES
         INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
         INTERFACE_LINK_LIBRARIES
@@ -810,10 +811,14 @@ function(_add_swift_library_single target name)
         "Either SHARED, STATIC, or OBJECT_LIBRARY must be specified")
   endif()
 
-  handle_gyb_sources(
-      gyb_dependency_targets
-      SWIFTLIB_SINGLE_SOURCES
-      "${SWIFTLIB_SINGLE_ARCHITECTURE}")
+  if(SWIFTLIB_SINGLE_GYB_SOURCES)
+    handle_gyb_sources(
+        gyb_dependency_targets
+        SWIFTLIB_SINGLE_GYB_SOURCES
+        "${SWIFTLIB_SINGLE_ARCHITECTURE}")
+    set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_SOURCES}
+      ${SWIFTLIB_SINGLE_GYB_SOURCES})
+  endif()
 
   # Remove the "swift" prefix from the name to determine the module name.
   if(SWIFTLIB_IS_STDLIB_CORE)
@@ -1620,6 +1625,7 @@ function(add_swift_target_library name)
         FRAMEWORK_DEPENDS_IOS_TVOS
         FRAMEWORK_DEPENDS_OSX
         FRAMEWORK_DEPENDS_WEAK
+        GYB_SOURCES
         INCORPORATE_OBJECT_LIBRARIES
         INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
         INTERFACE_LINK_LIBRARIES
@@ -1914,6 +1920,7 @@ function(add_swift_target_library name)
         DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
         DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_DEPLOYMENT_VERSION_TVOS}"
         DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS}"
+        GYB_SOURCES ${SWIFTLIB_GYB_SOURCES}
       )
 
       if(NOT SWIFTLIB_OBJECT_LIBRARY)

diff --git a/cmake/modules/SwiftHandleGybSources.cmake b/cmake/modules/SwiftHandleGybSources.cmake
@@ -131,35 +131,31 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/UIDs.py")
 
   foreach (src ${${sources_var_name}})
-    string(REGEX REPLACE "[.]gyb$" "" src_sans_gyb "${src}")
-    if(src STREQUAL src_sans_gyb)
-      list(APPEND de_gybbed_sources "${src}")
+    # On Windows (using Visual Studio), the generated project files assume that the
+    # generated GYB files will be in the source, not binary directory.
+    # We can work around this by modifying the root directory when generating VS projects.
+    if ("${CMAKE_GENERATOR_PLATFORM}" MATCHES "Visual Studio")
+      set(dir_root ${CMAKE_CURRENT_SOURCE_DIR})
     else()
+      set(dir_root ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
 
-      # On Windows (using Visual Studio), the generated project files assume that the
-      # generated GYB files will be in the source, not binary directory.
-      # We can work around this by modifying the root directory when generating VS projects.
-      if ("${CMAKE_GENERATOR_PLATFORM}" MATCHES "Visual Studio")
-        set(dir_root ${CMAKE_CURRENT_SOURCE_DIR})
-      else()
-        set(dir_root ${CMAKE_CURRENT_BINARY_DIR})
-      endif()
-
-      if (arch)
-        set(dir "${dir_root}/${ptr_size}")
-      else()
-        set(dir "${dir_root}")
-      endif()
-      set(output_file_name "${dir}/${src_sans_gyb}")
-      list(APPEND de_gybbed_sources "${output_file_name}")
-      handle_gyb_source_single(dependency_target
-          SOURCE "${src}"
-          OUTPUT "${output_file_name}"
-          FLAGS ${extra_gyb_flags}
-          DEPENDS "${gyb_extra_sources}"
-          COMMENT "with ptr size = ${ptr_size}")
-      list(APPEND dependency_targets "${dependency_target}")
+    if (arch)
+      set(dir "${dir_root}/${ptr_size}")
+    else()
+      set(dir "${dir_root}")
     endif()
+    # get_filename_component(src_sans_gyb ${src} NAME_WLE)
+    string(REGEX REPLACE "\.gyb$" "" src_sans_gyb ${src})
+    set(output_file_name "${dir}/${src_sans_gyb}")
+    list(APPEND de_gybbed_sources "${output_file_name}")
+    handle_gyb_source_single(dependency_target
+        SOURCE "${src}"
+        OUTPUT "${output_file_name}"
+        FLAGS ${extra_gyb_flags}
+        DEPENDS "${gyb_extra_sources}"
+        COMMENT "with ptr size = ${ptr_size}")
+    list(APPEND dependency_targets "${dependency_target}")
   endforeach()
   set("${dependency_out_var_name}" "${dependency_targets}" PARENT_SCOPE)
   set("${sources_var_name}" "${de_gybbed_sources}" PARENT_SCOPE)

diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
@@ -102,7 +102,8 @@ add_swift_host_library(swiftBasic STATIC
   # Platform-agnostic fallback TaskQueue implementation
   Default/TaskQueue.inc
 
-  UnicodeExtendedGraphemeClusters.cpp.gyb
+  GYB_SOURCES
+    UnicodeExtendedGraphemeClusters.cpp.gyb
 
   C_COMPILE_FLAGS ${UUID_INCLUDE}
   LLVM_COMPONENT_DEPENDS support)

diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
@@ -10,9 +10,6 @@ add_swift_host_library(swiftParse STATIC
   ParseDecl.cpp
   ParsedRawSyntaxNode.cpp
   ParsedRawSyntaxRecorder.cpp
-  ParsedSyntaxBuilders.cpp.gyb
-  ParsedSyntaxNodes.cpp.gyb
-  ParsedSyntaxRecorder.cpp.gyb
   ParsedTrivia.cpp
   ParseExpr.cpp
   ParseGeneric.cpp
@@ -24,7 +21,12 @@ add_swift_host_library(swiftParse STATIC
   PersistentParserState.cpp
   Scope.cpp
   SyntaxParsingCache.cpp
-  SyntaxParsingContext.cpp)
+  SyntaxParsingContext.cpp
+
+  GYB_SOURCES
+    ParsedSyntaxBuilders.cpp.gyb
+    ParsedSyntaxNodes.cpp.gyb
+    ParsedSyntaxRecorder.cpp.gyb)
 target_link_libraries(swiftParse PRIVATE
   swiftAST
   swiftSyntax)

diff --git a/lib/Syntax/CMakeLists.txt b/lib/Syntax/CMakeLists.txt
@@ -5,14 +5,16 @@ else()
 endif()
 
 add_swift_host_library(swiftSyntax STATIC
-  SyntaxNodes.cpp.gyb
-  SyntaxBuilders.cpp.gyb
-  SyntaxKind.cpp.gyb
-  SyntaxFactory.cpp.gyb
-  SyntaxVisitor.cpp.gyb
-  Trivia.cpp.gyb
   RawSyntax.cpp
   Syntax.cpp
   SyntaxData.cpp
-  SyntaxSerialization.cpp.gyb
-  UnknownSyntax.cpp)
+  UnknownSyntax.cpp
+
+  GYB_SOURCES
+    SyntaxNodes.cpp.gyb
+    SyntaxBuilders.cpp.gyb
+    SyntaxKind.cpp.gyb
+    SyntaxFactory.cpp.gyb
+    SyntaxVisitor.cpp.gyb
+    Trivia.cpp.gyb
+    SyntaxSerialization.cpp.gyb)
diff --git a/stdlib/private/SwiftPrivate/CMakeLists.txt b/stdlib/private/SwiftPrivate/CMakeLists.txt
@@ -7,10 +7,12 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   # filename.
   SwiftPrivate.swift
 
-  AtomicInt.swift.gyb
   IO.swift
   ShardedAtomicCounter.swift
 
+  GYB_SOURCES
+    AtomicInt.swift.gyb
+
   SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK
   SWIFT_COMPILE_FLAGS ${swift_swiftprivate_compile_flags}
   INSTALL_IN_COMPONENT stdlib-experimental)

diff --git a/stdlib/public/Darwin/AVFoundation/CMakeLists.txt b/stdlib/public/Darwin/AVFoundation/CMakeLists.txt
@@ -8,7 +8,9 @@ add_swift_target_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYP
   AVCaptureVideoDataOutput.swift
   AVError.swift
   AVMetadataObject.swift
-  NSValue.swift.gyb
+
+  GYB_SOURCES
+    NSValue.swift.gyb
 
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"

diff --git a/stdlib/public/Darwin/Accelerate/CMakeLists.txt b/stdlib/public/Darwin/Accelerate/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftAccelerate ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  BNNS.swift.gyb
+
+  GYB_SOURCES
+    BNNS.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/CoreGraphics/CMakeLists.txt b/stdlib/public/Darwin/CoreGraphics/CMakeLists.txt
@@ -3,9 +3,11 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftCoreGraphics ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   CoreGraphics.swift
-  CGFloat.swift.gyb
   Private.swift
 
+  GYB_SOURCES
+    CGFloat.swift.gyb
+
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
   SWIFT_MODULE_DEPENDS_OSX Darwin CoreFoundation Dispatch IOKit ObjectiveC # auto-updated

diff --git a/stdlib/public/Darwin/CoreLocation/CMakeLists.txt b/stdlib/public/Darwin/CoreLocation/CMakeLists.txt
@@ -3,7 +3,9 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftCoreLocation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   CLError.swift
-  NSValue.swift.gyb
+
+  GYB_SOURCES
+    NSValue.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/Foundation/CMakeLists.txt b/stdlib/public/Darwin/Foundation/CMakeLists.txt
@@ -51,7 +51,6 @@ add_swift_target_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES
   NSTextCheckingResult.swift
   NSUndoManager.swift
   NSURL.swift
-  NSValue.swift.gyb
   PersonNameComponents.swift
   PlistEncoder.swift
   Progress.swift
@@ -64,6 +63,9 @@ add_swift_target_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES
   UUID.swift
   CheckClass.mm
 
+  GYB_SOURCES
+    NSValue.swift.gyb
+
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-Xllvm" "-sil-inline-generics" "-Xllvm" "-sil-partial-specialization" "-swift-version" "5"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
 

diff --git a/stdlib/public/Darwin/GLKit/CMakeLists.txt b/stdlib/public/Darwin/GLKit/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftGLKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  GLKMath.swift.gyb
+
+  GYB_SOURCES
+    GLKMath.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/MapKit/CMakeLists.txt b/stdlib/public/Darwin/MapKit/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftMapKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  NSValue.swift.gyb
+
+  GYB_SOURCES
+    NSValue.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/QuartzCore/CMakeLists.txt b/stdlib/public/Darwin/QuartzCore/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftQuartzCore ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  NSValue.swift.gyb
+
+  GYB_SOURCES
+    NSValue.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/SceneKit/CMakeLists.txt b/stdlib/public/Darwin/SceneKit/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftSceneKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  SceneKit.swift.gyb
+
+  GYB_SOURCES
+    SceneKit.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/SpriteKit/CMakeLists.txt b/stdlib/public/Darwin/SpriteKit/CMakeLists.txt
@@ -3,7 +3,9 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftSpriteKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   SpriteKit.swift
-  SpriteKitQuickLooks.swift.gyb
+
+  GYB_SOURCES
+    SpriteKitQuickLooks.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/UIKit/CMakeLists.txt b/stdlib/public/Darwin/UIKit/CMakeLists.txt
@@ -4,7 +4,9 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
 add_swift_target_library(swiftUIKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   DesignatedInitializers.mm
   UIKit.swift
-  UIKit_FoundationExtensions.swift.gyb
+
+  GYB_SOURCES
+    UIKit_FoundationExtensions.swift.gyb
 
   SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} -swift-version 4.2
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Darwin/simd/CMakeLists.txt b/stdlib/public/Darwin/simd/CMakeLists.txt
@@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.4.3)
 include("../../../../cmake/modules/StandaloneOverlay.cmake")
 
 add_swift_target_library(swiftsimd ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  simd.swift.gyb
-  Quaternion.swift.gyb
+
+  GYB_SOURCES
+    simd.swift.gyb
+    Quaternion.swift.gyb
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt
@@ -1,14 +1,18 @@
 set(swift_platform_sources
     Platform.swift
-    TiocConstants.swift
+    TiocConstants.swift)
+set(swift_platform_gyb_sources
     tgmath.swift.gyb)
 
 add_swift_target_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-    Darwin.swift.gyb
     ${swift_platform_sources}
     POSIXError.swift
     MachError.swift
 
+    GYB_SOURCES
+      ${swift_platform_gyb_sources}
+      Darwin.swift.gyb
+
     SWIFT_COMPILE_FLAGS -Xfrontend -disable-objc-attr-requires-foundation-module "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS ALL_APPLE_PLATFORMS
@@ -18,9 +22,12 @@ add_swift_target_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_
     DEPENDS copy_apinotes)
 
 add_swift_target_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-    Glibc.swift.gyb
     ${swift_platform_sources}
 
+    GYB_SOURCES
+      ${swift_platform_gyb_sources}
+      Glibc.swift.gyb
+
     SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS ANDROID CYGWIN FREEBSD LINUX HAIKU
@@ -30,6 +37,9 @@ add_swift_target_library(swiftMSVCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_
     msvcrt.swift
     ${swift_platform_sources}
 
+    GYB_SOURCES
+      ${swift_platform_gyb_sources}
+
     SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS WINDOWS)