Fixed build script for OSX, builds dynamic library 'SwiftFoundation'

No-oped CF_AVAILABILITY macros when building SwiftFoundation
Changed configure environment variable for swift build directory from
'SDKROOT' (confuses xcrun) to 'SWIFT_SDKROOT'. Requires change to
swift's build-script-impl.

Author: springsup

CoreFoundation/Base.subproj/CFAvailability.h

@@ -89,6 +89,29 @@
 #define CF_DEPRECATED_IOS(_iosIntro, _iosDep, ...)
 #endif
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+// PortableFoundation is a standalone module and does not depend on system version
+#undef CF_AVAILABLE
+#undef CF_AVAILABLE_MAC
+#undef CF_AVAILABLE_IOS
+#undef CF_DEPRECATED
+#undef CF_DEPRECATED_MAC
+#undef CF_DEPRECATED_IOS
+
+#define CF_AVAILABLE(_mac, _ios)
+#define CF_AVAILABLE_MAC(_mac)
+#define CF_AVAILABLE_IOS(_ios)
+
+#if __has_attribute(deprecated) // Keep deprecation warnings
+#define CF_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
+#else
+#define CF_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...)
+#endif
+
+#define CF_DEPRECATED_MAC(_macIntro, _macDep, ...) CF_DEPRECATED(_macIntro, _macDep, 0, 0, __VA_ARGS__)
+#define CF_DEPRECATED_IOS(_iosIntro, _iosDep, ...) CF_DEPRECATED(0, 0, _iosIntro, _iosDep, __VA_ARGS__)
+#endif
+
 // Older versions of these macros; use iOS versions instead
 #define CF_AVAILABLE_IPHONE(_ios) CF_AVAILABLE_IOS(_ios)
 #define CF_DEPRECATED_IPHONE(_iosIntro, _iosDep) CF_DEPRECATED_IOS(_iosIntro, _iosDep)

CoreFoundation/Base.subproj/SymbolAliases

@@ -273,9 +273,9 @@
 		D3E8D6D11C367AB600295652 /* NSSpecialValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3E8D6D01C367AB600295652 /* NSSpecialValue.swift */; };
 		D3E8D6D31C36982700295652 /* NSKeyedUnarchiver-EdgeInsetsTest.plist in Resources */ = {isa = PBXBuildFile; fileRef = D3E8D6D21C36982700295652 /* NSKeyedUnarchiver-EdgeInsetsTest.plist */; };
 		D3E8D6D51C36AC0C00295652 /* NSKeyedUnarchiver-RectTest.plist in Resources */ = {isa = PBXBuildFile; fileRef = D3E8D6D41C36AC0C00295652 /* NSKeyedUnarchiver-RectTest.plist */; };
-		D5C40F331CDA1D460005690C /* TestNSOperationQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C40F321CDA1D460005690C /* TestNSOperationQueue.swift */; };
 		D51239DF1CD9DA0800D433EE /* CFSocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B5D88E01BBC9B0300234F36 /* CFSocket.c */; };
 		D512D17C1CD883F00032E6A5 /* TestNSFileHandle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D512D17B1CD883F00032E6A5 /* TestNSFileHandle.swift */; };
+		D5C40F331CDA1D460005690C /* TestNSOperationQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C40F321CDA1D460005690C /* TestNSOperationQueue.swift */; };
 		E1A03F361C4828650023AF4D /* PropertyList-1.0.dtd in Resources */ = {isa = PBXBuildFile; fileRef = E1A03F351C4828650023AF4D /* PropertyList-1.0.dtd */; };
 		E1A03F381C482C730023AF4D /* NSXMLDTDTestData.xml in Resources */ = {isa = PBXBuildFile; fileRef = E1A03F371C482C730023AF4D /* NSXMLDTDTestData.xml */; };
 		E1A3726F1C31EBFB0023AF4D /* NSXMLDocumentTestData.xml in Resources */ = {isa = PBXBuildFile; fileRef = E1A3726E1C31EBFB0023AF4D /* NSXMLDocumentTestData.xml */; };
@@ -649,8 +649,8 @@
 		D3E8D6D01C367AB600295652 /* NSSpecialValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSSpecialValue.swift; sourceTree = "<group>"; };
 		D3E8D6D21C36982700295652 /* NSKeyedUnarchiver-EdgeInsetsTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NSKeyedUnarchiver-EdgeInsetsTest.plist"; sourceTree = "<group>"; };
 		D3E8D6D41C36AC0C00295652 /* NSKeyedUnarchiver-RectTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NSKeyedUnarchiver-RectTest.plist"; sourceTree = "<group>"; };
-		D5C40F321CDA1D460005690C /* TestNSOperationQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSOperationQueue.swift; sourceTree = "<group>"; };
 		D512D17B1CD883F00032E6A5 /* TestNSFileHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSFileHandle.swift; sourceTree = "<group>"; };
+		D5C40F321CDA1D460005690C /* TestNSOperationQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSOperationQueue.swift; sourceTree = "<group>"; };
 		D834F9931C31C4060023812A /* TestNSOrderedSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSOrderedSet.swift; sourceTree = "<group>"; };
 		DCDBB8321C1768AC00313299 /* TestNSData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSData.swift; sourceTree = "<group>"; };
 		E19E17DB1C2225930023AF4D /* TestNSXMLDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSXMLDocument.swift; sourceTree = "<group>"; };
@@ -2161,7 +2161,7 @@
 				);
 				OTHER_LDFLAGS = (
 					"-twolevel_namespace",
-					"-Wl,-alias_list,CoreFoundation/Base.subproj/SymbolAliases",
+					"-Wl,-alias_list,CoreFoundation/Base.subproj/DarwinSymbolAliases",
 					"-sectcreate",
 					__UNICODE,
 					__csbitmaps,
@@ -2230,7 +2230,7 @@
 				);
 				OTHER_LDFLAGS = (
 					"-twolevel_namespace",
-					"-Wl,-alias_list,CoreFoundation/Base.subproj/SymbolAliases",
+					"-Wl,-alias_list,CoreFoundation/Base.subproj/DarwinSymbolAliases",
 					"-sectcreate",
 					__UNICODE,
 					__csbitmaps,

Foundation.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 
 script = Script()
 
-foundation = DynamicLibrary("Foundation")
+foundation = DynamicLibrary(Configuration.current.module_name)
 
 foundation.GCC_PREFIX_HEADER = 'CoreFoundation/Base.subproj/CoreFoundation_Prefix.h'
 
@@ -22,6 +22,8 @@
 elif Configuration.current.target.sdk == OSType.MacOSX:
 	foundation.CFLAGS = '-DDEPLOYMENT_TARGET_MACOSX '
 	foundation.LDFLAGS = '-licucore -twolevel_namespace -Wl,-alias_list,CoreFoundation/Base.subproj/DarwinSymbolAliases -sectcreate __UNICODE __csbitmaps CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data CoreFoundation/CharacterSets/CFUnicodeData-L.mapping -segprot __UNICODE r r '
+	foundation.LDFLAGS += '-mmacosx-version-min=10.11 ' # Required to link symbol ___udivti3 from CFBigNumber
+	foundation.LDFLAGS += '-init ___CFInitialize -install_name @rpath/lib' + foundation.name + '.dylib -Xlinker -no_deduplicate '
 
 if Configuration.current.build_mode == Configuration.Debug:
         foundation.LDFLAGS += ' -lswiftSwiftOnoneSupport '
@@ -48,20 +50,20 @@
 	'-Wno-unused-variable',
 	'-Wno-int-conversion',
 	'-Wno-unused-function',
-	'-I/usr/include/libxml2',
+	'-I${SYSROOT}/usr/include/libxml2',
 	'-I./',
 ])
 
 swift_cflags = [
-	'-I${BUILD_DIR}/Foundation/usr/lib/swift',
-	'-I/usr/include/libxml2'
+	'-I${BUILD_DIR}/${MODULE_NAME}/usr/lib/swift',
+	'-I${SYSROOT}/usr/include/libxml2'
 ]
 
 if "XCTEST_BUILD_DIR" in Configuration.current.variables:
 	swift_cflags += [
 		'-I${XCTEST_BUILD_DIR}',
 		'-L${XCTEST_BUILD_DIR}',
-		'-I/usr/include/libxml2'
+		'-I${SYSROOT}/usr/include/libxml2'
 	]
 
 # Configure use of Dispatch in CoreFoundation and Foundation if libdispatch is being built
@@ -414,22 +416,22 @@
 extra_script = """
 rule InstallFoundation
     command = mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
-    cp "${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
+    cp "${BUILD_DIR}/${MODULE_NAME}/${DYLIB_PREFIX}${MODULE_NAME}${DYLIB_SUFFIX}" "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
     mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}"; $
-    cp "${BUILD_DIR}/Foundation/Foundation.swiftmodule" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $
-    cp "${BUILD_DIR}/Foundation/Foundation.swiftdoc" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $
+    cp "${BUILD_DIR}/${MODULE_NAME}/${MODULE_NAME}.swiftmodule" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $
+    cp "${BUILD_DIR}/${MODULE_NAME}/${MODULE_NAME}.swiftdoc" "${DSTROOT}/${PREFIX}/lib/swift/${OS}/${ARCH}/"; $
     mkdir -p "${DSTROOT}/${PREFIX}/local/include"; $
-    rsync -r "${BUILD_DIR}/Foundation/${PREFIX}/lib/swift/CoreFoundation" "${DSTROOT}/${PREFIX}/lib/swift/"
+    rsync -r "${BUILD_DIR}/${MODULE_NAME}/${PREFIX}/lib/swift/CoreFoundation" "${DSTROOT}/${PREFIX}/lib/swift/"
 
-build ${BUILD_DIR}/.install: InstallFoundation ${BUILD_DIR}/Foundation/${DYLIB_PREFIX}Foundation${DYLIB_SUFFIX}
+build ${BUILD_DIR}/.install: InstallFoundation ${BUILD_DIR}/${MODULE_NAME}/${DYLIB_PREFIX}${MODULE_NAME}${DYLIB_SUFFIX}
 
 build install: phony | ${BUILD_DIR}/.install
 
 """
 if "XCTEST_BUILD_DIR" in Configuration.current.variables:
 	extra_script += """
 rule RunTestFoundation
-    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/:${XCTEST_BUILD_DIR} ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/:${XCTEST_BUILD_DIR} lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
+    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/${MODULE_NAME}/:${XCTEST_BUILD_DIR} ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/${MODULE_NAME}/:${XCTEST_BUILD_DIR} lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
     description = Building Tests
 
 build ${BUILD_DIR}/.test: RunTestFoundation | TestFoundation
@@ -440,7 +442,7 @@
 else:
 	extra_script += """
 rule RunTestFoundation
-    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/ ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/ lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
+    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/${MODULE_NAME}/ ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/${MODULE_NAME}/ lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
     description = Building Tests
 
 build ${BUILD_DIR}/.test: RunTestFoundation | TestFoundation

build.py

@@ -59,6 +59,8 @@ def reconfigure(config, path):
                 config.build_script_path = Path(info['build_script_path'])
             if 'source_root' in info and info['source_root'] is not None:
                 config.source_root = Path(info['source_root'])
+            if 'module_name' in info and info['module_name'] is not None:
+                config.module_name = info['module_name']
             if 'target' in info and info['target'] is not None:
                 config.target = Target(info['target'])
             if 'system_root' in info and info['system_root'] is not None:
@@ -124,7 +126,7 @@ def main():
     config.extra_c_flags          = os.getenv("CFLAGS", "")
     config.extra_swift_flags      = os.getenv("SWIFTCFLAGS", "")
     config.extra_ld_flags         = os.getenv("LDFLAGS", "")
-    config.swift_sdk              = os.getenv("SDKROOT", None)
+    config.swift_sdk              = os.getenv("SWIFT_SDKROOT", None)
     config.script_path            = config.source_root.path_by_appending("build.py")
     config.build_script_path      = config.source_root.path_by_appending("build.ninja")
     config.config_path            = config.source_root.path_by_appending(".configuration")
@@ -165,8 +167,9 @@ def main():
         if config.target.sdk == OSType.MacOSX and config.system_root is None and Target(Target.default()).sdk == OSType.MacOSX:
             import subprocess
             config.system_root = Path.path(subprocess.Popen(['xcrun', '--show-sdk-path'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0])
-            swift_path = Path.path(subprocess.Popen(['xcrun', '--find', 'swift'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0]).parent().parent()
-            config.swift_sdk = swift_path.absolute()
+            if config.swift_sdk is None:
+                swift_path = Path.path(subprocess.Popen(['xcrun', '--find', 'swift'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate()[0]).parent().parent()
+                config.swift_sdk = swift_path.absolute()
         elif config.swift_sdk is None:
             config.swift_sdk = "/usr"
         config.toolchain = Path.path(args.toolchain)
@@ -177,6 +180,14 @@ def main():
         elif config.ar is None:
             config.ar = "ar"
 
+    # Set the module name. On OSX this must not conflict with the system 'Foundation'
+    # or swift's libswiftFoundation.dylib
+
+    if config.target.sdk == OSType.MacOSX:
+        config.module_name = "SwiftFoundation"
+    else:
+        config.module_name = "Foundation"
+
     config.write(config.config_path.absolute())
     Configuration.current = config