Make CoreFoundation a public module and install its headers

Author: jmschonfeld

Sources/CoreFoundation/CMakeLists.txt

@@ -13,9 +13,9 @@
 ##===----------------------------------------------------------------------===##
 
 file(GLOB_RECURSE _CoreFoundationSources "*.c")
-add_library(_CoreFoundation STATIC ${_CoreFoundationSources})
+add_library(CoreFoundation STATIC ${_CoreFoundationSources})
 
-target_include_directories(_CoreFoundation
+target_include_directories(CoreFoundation
     PUBLIC
         include
     PRIVATE
@@ -28,13 +28,30 @@ list(APPEND _CoreFoundation_build_flags
     "-DCF_CHARACTERSET_UNICHAR_DB=\"${CMAKE_SOURCE_DIR}/Sources/CoreFoundation/CFUniCharPropertyDatabase.data\""
     "-DCF_CHARACTERSET_BITMAP=\"${CMAKE_SOURCE_DIR}/Sources/CoreFoundation/CFCharacterSetBitmaps.bitmap\"")
 
-target_compile_options(_CoreFoundation PRIVATE
+target_compile_options(CoreFoundation PRIVATE
     "SHELL:$<$<COMPILE_LANGUAGE:C>:${_CoreFoundation_build_flags}>")
 
-target_precompile_headers(_CoreFoundation PRIVATE internalInclude/CoreFoundation_Prefix.h)
+target_precompile_headers(CoreFoundation PRIVATE internalInclude/CoreFoundation_Prefix.h)
 
-target_link_libraries(_CoreFoundation PUBLIC
-    FoundationICU)
-
-target_link_libraries(_CoreFoundation PRIVATE
+target_link_libraries(CoreFoundation PRIVATE
+    FoundationICU
     dispatch)
+
+file(COPY
+        "include/module.map"
+    DESTINATION
+        ${CMAKE_BINARY_DIR}/CoreFoundationHeaders
+    NO_SOURCE_PERMISSIONS)
+
+
+file(GLOB_RECURSE _CoreFoundationPublicHeaders "include/*.h")
+file(COPY
+        ${_CoreFoundationPublicHeaders}
+    DESTINATION
+        ${CMAKE_BINARY_DIR}/CoreFoundationHeaders
+    NO_SOURCE_PERMISSIONS)
+
+install(DIRECTORY
+            ${CMAKE_BINARY_DIR}/CoreFoundationHeaders/
+        DESTINATION
+            lib/swift/CoreFoundation)

Sources/CoreFoundation/include/module.map

@@ -1,4 +1,4 @@
-module _CoreFoundation [extern_c] [system] {
+module CoreFoundation [extern_c] [system] {
     umbrella header "CoreFoundation.h"
     explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
 }

Sources/CoreFoundation/include/module.modulemap

@@ -1,4 +1,4 @@
-module _CoreFoundation {
+module CoreFoundation {
     umbrella header "CoreFoundation.h"
     explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
 

Sources/Foundation/Bridging.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 #if canImport(ObjectiveC)
 import ObjectiveC

Sources/Foundation/Bundle.swift

@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 @_silgen_name("swift_getTypeContextDescriptor")
 private func _getTypeContextDescriptor(of cls: AnyClass) -> UnsafeRawPointer

Sources/Foundation/CMakeLists.txt

@@ -19,7 +19,7 @@ target_compile_options(Foundation PRIVATE
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:${_Foundation_swift_build_flags}>")
 
 target_link_libraries(Foundation PRIVATE
-    _CoreFoundation
+    CoreFoundation
     FoundationEssentials
     FoundationInternationalization)
 

Sources/Foundation/DateComponents.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension DateComponents : ReferenceConvertible {
     public typealias ReferenceType = NSDateComponents

Sources/Foundation/DateFormatter.swift

@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 @_spi(SwiftCorelibsFoundation) import FoundationEssentials
 
 open class DateFormatter : Formatter {

Sources/Foundation/DateInterval.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension DateInterval : _ObjectiveCBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {

Sources/Foundation/DateIntervalFormatter.swift

@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 internal let kCFDateIntervalFormatterNoStyle = CFDateIntervalFormatterStyle.noStyle
 internal let kCFDateIntervalFormatterShortStyle = CFDateIntervalFormatterStyle.shortStyle