Make CoreFoundation a public module and install its headers

swiftlang · May 29, 2024 · 00cdb9e · 00cdb9e
1 parent 5ee7cdc
commit 00cdb9e
Show file tree

Hide file tree

Showing 97 changed files with 123 additions and 106 deletions.
diff --git a/Sources/CoreFoundation/CMakeLists.txt b/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)
diff --git a/Sources/CoreFoundation/include/module.map b/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" }
 }
diff --git a/Sources/CoreFoundation/include/module.modulemap b/Sources/CoreFoundation/include/module.modulemap
@@ -1,4 +1,4 @@
-module _CoreFoundation {
+module CoreFoundation {
     umbrella header "CoreFoundation.h"
     explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
 

diff --git a/Sources/Foundation/Bridging.swift b/Sources/Foundation/Bridging.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 #if canImport(ObjectiveC)
 import ObjectiveC

diff --git a/Sources/Foundation/Bundle.swift b/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

diff --git a/Sources/Foundation/CMakeLists.txt b/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)
 

diff --git a/Sources/Foundation/DateComponents.swift b/Sources/Foundation/DateComponents.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension DateComponents : ReferenceConvertible {
     public typealias ReferenceType = NSDateComponents

diff --git a/Sources/Foundation/DateFormatter.swift b/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 {

diff --git a/Sources/Foundation/DateInterval.swift b/Sources/Foundation/DateInterval.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension DateInterval : _ObjectiveCBridgeable {
     public static func _isBridgedToObjectiveC() -> Bool {

diff --git a/Sources/Foundation/DateIntervalFormatter.swift b/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

diff --git a/Sources/Foundation/Dictionary.swift b/Sources/Foundation/Dictionary.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension Dictionary : _ObjectiveCBridgeable {
 

diff --git a/Sources/Foundation/FileHandle.swift b/Sources/Foundation/FileHandle.swift
@@ -7,7 +7,7 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 #if canImport(Dispatch)
 import Dispatch
 #endif

diff --git a/Sources/Foundation/FileManager+POSIX.swift b/Sources/Foundation/FileManager+POSIX.swift
@@ -13,7 +13,7 @@ internal func &(left: UInt32, right: mode_t) -> mode_t {
 }
 #endif
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 #if os(WASI)
 import WASILibc
@@ -27,7 +27,7 @@ internal var O_TRUNC: Int32 { _getConst_O_TRUNC() }
 internal var O_WRONLY: Int32 { _getConst_O_WRONLY() }
 #endif
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension FileManager {
     internal func _mountedVolumeURLs(includingResourceValuesForKeys propertyKeys: [URLResourceKey]?, options: VolumeEnumerationOptions = []) -> [URL]? {

diff --git a/Sources/Foundation/FileManager+Win32.swift b/Sources/Foundation/FileManager+Win32.swift
@@ -7,7 +7,7 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 #if os(Windows)
 import let WinSDK.INVALID_FILE_ATTRIBUTES

diff --git a/Sources/Foundation/FileManager.swift b/Sources/Foundation/FileManager.swift
@@ -15,7 +15,7 @@ fileprivate let UF_APPEND: Int32 = 1
 fileprivate let UF_HIDDEN: Int32 = 1
 #endif
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 #if os(Windows)
 import CRT
 import WinSDK

diff --git a/Sources/Foundation/Host.swift b/Sources/Foundation/Host.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 #if os(Windows)
 import WinSDK
 #endif

diff --git a/Sources/Foundation/ISO8601DateFormatter.swift b/Sources/Foundation/ISO8601DateFormatter.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension ISO8601DateFormatter {
 

diff --git a/Sources/Foundation/JSONDecoder.swift b/Sources/Foundation/JSONDecoder.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 /// A marker protocol used to determine whether a value is a `String`-keyed `Dictionary`
 /// containing `Decodable` values (in which case it should be exempt from key conversion strategies).

diff --git a/Sources/Foundation/JSONEncoder.swift b/Sources/Foundation/JSONEncoder.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 /// A marker protocol used to determine whether a value is a `String`-keyed `Dictionary`
 /// containing `Encodable` values (in which case it should be exempt from key conversion strategies).

diff --git a/Sources/Foundation/JSONSerialization.swift b/Sources/Foundation/JSONSerialization.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension JSONSerialization {
     public struct ReadingOptions : OptionSet {

diff --git a/Sources/Foundation/Measurement.swift b/Sources/Foundation/Measurement.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #if DEPLOYMENT_RUNTIME_SWIFT
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 #else
 @_exported import Foundation // Clang module
 import _SwiftCoreFoundationOverlayShims

diff --git a/Sources/Foundation/NSArray.swift b/Sources/Foundation/NSArray.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCoding, ExpressibleByArrayLiteral {
     private let _cfinfo = _CFInfo(typeID: CFArrayGetTypeID())

diff --git a/Sources/Foundation/NSAttributedString.swift b/Sources/Foundation/NSAttributedString.swift
@@ -7,7 +7,7 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 extension NSAttributedString {
     public struct Key: RawRepresentable, Equatable, Hashable {

diff --git a/Sources/Foundation/NSCFArray.swift b/Sources/Foundation/NSCFArray.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 internal final class _NSCFArray : NSMutableArray {
     deinit {

diff --git a/Sources/Foundation/NSCFBoolean.swift b/Sources/Foundation/NSCFBoolean.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 internal class __NSCFBoolean : NSNumber {
     override var hash: Int {

diff --git a/Sources/Foundation/NSCFCharacterSet.swift b/Sources/Foundation/NSCFCharacterSet.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Apple. All rights reserved.
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 internal class _NSCFCharacterSet : NSMutableCharacterSet {
 

diff --git a/Sources/Foundation/NSCFDictionary.swift b/Sources/Foundation/NSCFDictionary.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 internal final class _NSCFDictionary : NSMutableDictionary {
     deinit {

diff --git a/Sources/Foundation/NSCFSet.swift b/Sources/Foundation/NSCFSet.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 internal final class _NSCFSet : NSMutableSet {
     deinit {

diff --git a/Sources/Foundation/NSCFString.swift b/Sources/Foundation/NSCFString.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 @usableFromInline
 internal class _NSCFString : NSMutableString {

diff --git a/Sources/Foundation/NSCalendar.swift b/Sources/Foundation/NSCalendar.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) @_exported import FoundationEssentials
 
 internal let kCFCalendarUnitEra = CFCalendarUnit.era
@@ -23,7 +23,7 @@ internal let kCFCalendarUnitQuarter = CFCalendarUnit.quarter
 internal let kCFCalendarUnitWeekOfMonth = CFCalendarUnit.weekOfMonth
 internal let kCFCalendarUnitWeekOfYear = CFCalendarUnit.weekOfYear
 internal let kCFCalendarUnitYearForWeekOfYear = CFCalendarUnit.yearForWeekOfYear
-internal let kCFCalendarUnitNanosecond = CFCalendarUnit(rawValue: CFOptionFlags(_CoreFoundation.kCFCalendarUnitNanosecond))
+internal let kCFCalendarUnitNanosecond = CFCalendarUnit(rawValue: CFOptionFlags(CoreFoundation.kCFCalendarUnitNanosecond))
 
 internal func _CFCalendarUnitRawValue(_ unit: CFCalendarUnit) -> CFOptionFlags {
     return unit.rawValue

diff --git a/Sources/Foundation/NSCharacterSet.swift b/Sources/Foundation/NSCharacterSet.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 let kCFCharacterSetControl = CFCharacterSetPredefinedSet.control
 let kCFCharacterSetWhitespace = CFCharacterSetPredefinedSet.whitespace

diff --git a/Sources/Foundation/NSConcreteValue.swift b/Sources/Foundation/NSConcreteValue.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 class NSConcreteValue : NSValue {
 

diff --git a/Sources/Foundation/NSData.swift b/Sources/Foundation/NSData.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 #if !os(WASI)
 import Dispatch
 #endif

diff --git a/Sources/Foundation/NSDate.swift b/Sources/Foundation/NSDate.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 public typealias TimeInterval = Double
 

diff --git a/Sources/Foundation/NSDateComponents.swift b/Sources/Foundation/NSDateComponents.swift
@@ -8,7 +8,7 @@
 //
 
 @_exported import FoundationEssentials
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 
 // This is a just used as an extensible struct, basically;

diff --git a/Sources/Foundation/NSDictionary.swift b/Sources/Foundation/NSDictionary.swift
@@ -8,7 +8,7 @@
 //
 
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 #if !os(WASI)
 import Dispatch

diff --git a/Sources/Foundation/NSError.swift b/Sources/Foundation/NSError.swift
@@ -18,7 +18,7 @@ import Glibc
 import CRT
 #endif
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 public typealias NSErrorDomain = NSString
 

diff --git a/Sources/Foundation/NSKeyedArchiver.swift b/Sources/Foundation/NSKeyedArchiver.swift
@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-@_implementationOnly import _CoreFoundation
+@_implementationOnly import CoreFoundation
 
 /// Archives created using the class method `archivedData(withRootObject:)` use this key
 /// for the root object in the hierarchy of encoded objects. The `NSKeyedUnarchiver` class method