Index: ObjFW.xcodeproj/project.pbxproj ================================================================== --- ObjFW.xcodeproj/project.pbxproj +++ ObjFW.xcodeproj/project.pbxproj @@ -915,11 +915,10 @@ 4BD9CA211DA2C66A00E5AD52 /* OFXMLParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67E1235358D0076B512 /* OFXMLParserTests.m */; }; 4BD9CA221DA2C66A00E5AD52 /* PBKDF2Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD306301D46CEAE00E2F372 /* PBKDF2Tests.m */; }; 4BD9CA231DA2C66A00E5AD52 /* RuntimeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B44836F1D049887005D12A7 /* RuntimeTests.m */; }; 4BD9CA241DA2C66A00E5AD52 /* ScryptTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5AC54E1D97DEB100FECFAA /* ScryptTests.m */; }; 4BD9CA251DA2C66A00E5AD52 /* TestsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF6811235358D0076B512 /* TestsAppDelegate.m */; }; - 4BD9CA271DA2C95400E5AD52 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BD9CA261DA2C95400E5AD52 /* UIKit.framework */; }; 4BD9CA281DA2C9C300E5AD52 /* serialization.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE7353139C507F00F682ED /* serialization.xml */; }; 4BD9CA291DA2C9C300E5AD52 /* testfile.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BF33B4213380CD40059CEF7 /* testfile.bin */; }; 4BD9CA2A1DA2C9C300E5AD52 /* testfile.ini in Resources */ = {isa = PBXBuildFile; fileRef = 4B5B02C218B289ED00CE6AE4 /* testfile.ini */; }; 4BD9CA2B1DA2C9C300E5AD52 /* testfile.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4BF33B4313380CD40059CEF7 /* testfile.txt */; }; 4BD9CA2D1DA2CF1D00E5AD52 /* ObjFW.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2C22B01DA292BE00735907 /* ObjFW.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -926,11 +925,10 @@ 4BDF37B51338055600F9A81A /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDF37B41338055600F9A81A /* config.h */; }; 4BE52D2117B990B4005958D1 /* OFZIPArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE52D1F17B990B4005958D1 /* OFZIPArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BE52D2217B990B4005958D1 /* OFZIPArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE52D2017B990B4005958D1 /* OFZIPArchive.m */; }; 4BE52D2517B990DA005958D1 /* OFChecksumFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE52D2317B990DA005958D1 /* OFChecksumFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BE52D2617B990DA005958D1 /* OFChecksumFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE52D2417B990DA005958D1 /* OFChecksumFailedException.m */; }; - 4BEAF52D19A811DA00B61868 /* module.map in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BEAF52519A8107500B61868 /* module.map */; }; 4BEC83B919B7CB7100E4BB08 /* OFRIPEMD160Hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BEC83B719B7CB7100E4BB08 /* OFRIPEMD160Hash.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BEC83BA19B7CB7100E4BB08 /* OFRIPEMD160Hash.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BEC83B819B7CB7100E4BB08 /* OFRIPEMD160Hash.m */; }; 4BEC83BC19B7CBDE00E4BB08 /* OFRIPEMD160HashTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BEC83BB19B7CBDE00E4BB08 /* OFRIPEMD160HashTests.m */; }; 4BF0DD741D44645D001D9949 /* OFHMACTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0DD731D44645D001D9949 /* OFHMACTests.m */; }; 4BF171B21C949A3300F5B47B /* OFStdIOStream+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF171B11C9499F300F5B47B /* OFStdIOStream+Private.h */; }; @@ -1064,20 +1062,10 @@ dstSubfolderSpec = 10; files = ( 4BD9CA2D1DA2CF1D00E5AD52 /* ObjFW.framework in Embed Frameworks */, ); name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 4BEAF52C19A811CE00B61868 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ObjFW.framework; - dstSubfolderSpec = 16; - files = ( - 4BEAF52D19A811DA00B61868 /* module.map in CopyFiles */, - ); runOnlyForDeploymentPostprocessing = 0; }; 4BF33AEE133807310059CEF7 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 12; @@ -1543,11 +1531,10 @@ 4BD77FDC176E4BC40031C497 /* OFUnboundPrefixException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFUnboundPrefixException.h; path = src/exceptions/OFUnboundPrefixException.h; sourceTree = ""; }; 4BD77FDD176E4BC40031C497 /* OFUnboundPrefixException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFUnboundPrefixException.m; path = src/exceptions/OFUnboundPrefixException.m; sourceTree = ""; }; 4BD86D801237A6C600ED9912 /* OFBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFBlock.h; path = src/OFBlock.h; sourceTree = SOURCE_ROOT; }; 4BD86D811237A6C600ED9912 /* OFBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFBlock.m; path = src/OFBlock.m; sourceTree = SOURCE_ROOT; }; 4BD98C011338140B0048DD5B /* objfw-defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "objfw-defs.h"; path = "src/objfw-defs.h"; sourceTree = SOURCE_ROOT; }; - 4BD9CA261DA2C95400E5AD52 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 4BDF37B41338055600F9A81A /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; 4BE17AD812FD744C002CEB0B /* foundation-compat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "foundation-compat.m"; path = "src/foundation-compat.m"; sourceTree = SOURCE_ROOT; }; 4BE17AD912FD746D002CEB0B /* OFDataArray+CryptoHashing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFDataArray+CryptoHashing.h"; path = "src/OFDataArray+CryptoHashing.h"; sourceTree = SOURCE_ROOT; }; 4BE17ADA12FD746D002CEB0B /* OFDataArray+CryptoHashing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OFDataArray+CryptoHashing.m"; path = "src/OFDataArray+CryptoHashing.m"; sourceTree = SOURCE_ROOT; }; 4BE52D1F17B990B4005958D1 /* OFZIPArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFZIPArchive.h; path = src/OFZIPArchive.h; sourceTree = ""; }; @@ -1646,11 +1633,10 @@ 4B76F4721DA2C2BB00CFF831 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( 4BD9C9FF1DA2C5B800E5AD52 /* ObjFW.framework in Frameworks */, - 4BD9CA271DA2C95400E5AD52 /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; 4BF33AED133807310059CEF7 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -2251,11 +2237,10 @@ isa = PBXGroup; children = ( 4B3D23761337FBC800DD29B8 /* ObjFW.framework */, 4B5BC95B1DA301B500F97AE8 /* Foundation.framework */, 4B5BC9581DA2FF0000F97AE8 /* Foundation.framework */, - 4BD9CA261DA2C95400E5AD52 /* UIKit.framework */, ); name = Frameworks; sourceTree = ""; }; 4BF33B4113380CB60059CEF7 /* Supporting Files */ = { @@ -2846,11 +2831,10 @@ buildConfigurationList = 4B3D23861337FBC800DD29B8 /* Build configuration list for PBXNativeTarget "ObjFW (Mac)" */; buildPhases = ( 4B3D23711337FBC800DD29B8 /* Sources */, 4B3D23721337FBC800DD29B8 /* Frameworks */, 4B3D23731337FBC800DD29B8 /* Headers */, - 4BEAF52C19A811CE00B61868 /* CopyFiles */, ); buildRules = ( ); dependencies = ( 4B8BA41C133805A700E65070 /* PBXTargetDependency */, @@ -3721,10 +3705,11 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "$(SRCROOT)/misc/Bridge-Info.plist"; + INSTALL_PATH = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; PRODUCT_NAME = "ObjFW-Bridge"; SDKROOT = iphoneos; WRAPPER_EXTENSION = framework; }; @@ -3750,10 +3735,11 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "$(SRCROOT)/misc/Bridge-Info.plist"; + INSTALL_PATH = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; PRODUCT_NAME = "ObjFW-Bridge"; SDKROOT = iphoneos; WRAPPER_EXTENSION = framework; }; @@ -3847,17 +3833,19 @@ 4B2C22AE1DA292BE00735907 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEFINES_MODULE = YES; DEVELOPMENT_TEAM = MXKNFCKFL6; DYLIB_COMPATIBILITY_VERSION = 8; DYLIB_CURRENT_VERSION = 8; ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/misc/Info.plist"; INSTALL_PATH = "@executable_path/Frameworks"; + MODULEMAP_FILE = misc/module.map; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -3871,17 +3859,19 @@ 4B2C22AF1DA292BE00735907 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEFINES_MODULE = YES; DEVELOPMENT_TEAM = MXKNFCKFL6; DYLIB_COMPATIBILITY_VERSION = 8; DYLIB_CURRENT_VERSION = 8; ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/misc/Info.plist"; INSTALL_PATH = "@executable_path/Frameworks"; + MODULEMAP_FILE = misc/module.map; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -3893,14 +3883,16 @@ name = Release; }; 4B3D23871337FBC800DD29B8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 8; DYLIB_CURRENT_VERSION = 8; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/misc/Info.plist"; + MODULEMAP_FILE = misc/module.map; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -3912,14 +3904,16 @@ name = Debug; }; 4B3D23881337FBC800DD29B8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 8; DYLIB_CURRENT_VERSION = 8; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/misc/Info.plist"; + MODULEMAP_FILE = misc/module.map; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", );