Index: ObjFW.xcodeproj/project.pbxproj ================================================================== --- ObjFW.xcodeproj/project.pbxproj +++ ObjFW.xcodeproj/project.pbxproj @@ -54,23 +54,23 @@ 4B0E29711DA2A8A400323A76 /* OFArray_NSArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E31163EA3DA0049A832 /* OFArray_NSArray.m */; }; 4B0E29721DA2A8A400323A76 /* OFArray+NSObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E33163EA3DA0049A832 /* OFArray+NSObject.m */; }; 4B0E29731DA2A8A400323A76 /* OFDictionary_NSDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E36163EA3DA0049A832 /* OFDictionary_NSDictionary.m */; }; 4B0E29741DA2A8A400323A76 /* OFDictionary+NSObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E38163EA3DA0049A832 /* OFDictionary+NSObject.m */; }; 4B0E29751DA2A8A400323A76 /* OFString+NSObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E3A163EA3DA0049A832 /* OFString+NSObject.m */; }; - 4B0E297A1DA2A8A400323A76 /* NSArray_OFArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E25163EA3DA0049A832 /* NSArray_OFArray.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B0E297A1DA2A8A400323A76 /* NSArray_OFArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E25163EA3DA0049A832 /* NSArray_OFArray.h */; }; 4B0E297B1DA2A8A400323A76 /* NSArray+OFObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E27163EA3DA0049A832 /* NSArray+OFObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B0E297C1DA2A8A400323A76 /* NSBridging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E29163EA3DA0049A832 /* NSBridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B0E297D1DA2A8A400323A76 /* NSDictionary_OFDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2A163EA3DA0049A832 /* NSDictionary_OFDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B0E297D1DA2A8A400323A76 /* NSDictionary_OFDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2A163EA3DA0049A832 /* NSDictionary_OFDictionary.h */; }; 4B0E297E1DA2A8A400323A76 /* NSDictionary+OFObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2C163EA3DA0049A832 /* NSDictionary+OFObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B0E297F1DA2A8A400323A76 /* NSString+OFObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2E163EA3DA0049A832 /* NSString+OFObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B0E29801DA2A8A400323A76 /* OFArray_NSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E30163EA3DA0049A832 /* OFArray_NSArray.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B0E29801DA2A8A400323A76 /* OFArray_NSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E30163EA3DA0049A832 /* OFArray_NSArray.h */; }; 4B0E29811DA2A8A400323A76 /* OFArray+NSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E32163EA3DA0049A832 /* OFArray+NSObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B0E29821DA2A8A400323A76 /* OFBridging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E34163EA3DA0049A832 /* OFBridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B0E29831DA2A8A400323A76 /* OFDictionary_NSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E35163EA3DA0049A832 /* OFDictionary_NSDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B0E29831DA2A8A400323A76 /* OFDictionary_NSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E35163EA3DA0049A832 /* OFDictionary_NSDictionary.h */; }; 4B0E29841DA2A8A400323A76 /* OFDictionary+NSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E37163EA3DA0049A832 /* OFDictionary+NSObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B0E29851DA2A8A400323A76 /* OFString+NSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E39163EA3DA0049A832 /* OFString+NSObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B0E29861DA2A8A400323A76 /* ObjFW-Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E22163EA3DA0049A832 /* ObjFW-Bridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B0E29861DA2A8A400323A76 /* ObjFW_Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E22163EA3DA0049A832 /* ObjFW_Bridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B0EA91B1898690E00F573A4 /* OFKernelEventObserver_kqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B0EA9121898690E00F573A4 /* OFKernelEventObserver_kqueue.h */; }; 4B0EA91C1898690E00F573A4 /* OFKernelEventObserver_kqueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0EA9131898690E00F573A4 /* OFKernelEventObserver_kqueue.m */; }; 4B0EA91D1898690E00F573A4 /* OFKernelEventObserver_poll.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B0EA9141898690E00F573A4 /* OFKernelEventObserver_poll.h */; }; 4B0EA91E1898690E00F573A4 /* OFKernelEventObserver_poll.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0EA9151898690E00F573A4 /* OFKernelEventObserver_poll.m */; }; 4B0EA91F1898690E00F573A4 /* OFKernelEventObserver_select.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B0EA9161898690E00F573A4 /* OFKernelEventObserver_select.h */; }; @@ -116,28 +116,28 @@ 4B17FFB2133A3664003E6DCD /* OFUnsupportedProtocolException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B17FFB0133A365C003E6DCD /* OFUnsupportedProtocolException.m */; }; 4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B17FFB3133A374C003E6DCD /* OFUnboundNamespaceException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B17FFB6133A375B003E6DCD /* OFUnboundNamespaceException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B17FFB4133A3750003E6DCD /* OFUnboundNamespaceException.m */; }; 4B17FFB9133A381D003E6DCD /* OFInvalidServerReplyException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B17FFB7133A380F003E6DCD /* OFInvalidServerReplyException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B17FFBA133A381D003E6DCD /* OFInvalidServerReplyException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B17FFB8133A3813003E6DCD /* OFInvalidServerReplyException.m */; }; - 4B187E3B163EA3DA0049A832 /* ObjFW-Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E22163EA3DA0049A832 /* ObjFW-Bridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B187E3F163EA3DA0049A832 /* NSArray_OFArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E25163EA3DA0049A832 /* NSArray_OFArray.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B187E3B163EA3DA0049A832 /* ObjFW_Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E22163EA3DA0049A832 /* ObjFW_Bridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B187E3F163EA3DA0049A832 /* NSArray_OFArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E25163EA3DA0049A832 /* NSArray_OFArray.h */; }; 4B187E41163EA3DA0049A832 /* NSArray_OFArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E26163EA3DA0049A832 /* NSArray_OFArray.m */; }; 4B187E42163EA3DA0049A832 /* NSArray+OFObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E27163EA3DA0049A832 /* NSArray+OFObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B187E44163EA3DA0049A832 /* NSArray+OFObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E28163EA3DA0049A832 /* NSArray+OFObject.m */; }; 4B187E45163EA3DA0049A832 /* NSBridging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E29163EA3DA0049A832 /* NSBridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B187E46163EA3DA0049A832 /* NSDictionary_OFDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2A163EA3DA0049A832 /* NSDictionary_OFDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B187E46163EA3DA0049A832 /* NSDictionary_OFDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2A163EA3DA0049A832 /* NSDictionary_OFDictionary.h */; }; 4B187E48163EA3DA0049A832 /* NSDictionary_OFDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E2B163EA3DA0049A832 /* NSDictionary_OFDictionary.m */; }; 4B187E49163EA3DA0049A832 /* NSDictionary+OFObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2C163EA3DA0049A832 /* NSDictionary+OFObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B187E4B163EA3DA0049A832 /* NSDictionary+OFObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E2D163EA3DA0049A832 /* NSDictionary+OFObject.m */; }; 4B187E4C163EA3DA0049A832 /* NSString+OFObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E2E163EA3DA0049A832 /* NSString+OFObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B187E4E163EA3DA0049A832 /* NSString+OFObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E2F163EA3DA0049A832 /* NSString+OFObject.m */; }; - 4B187E4F163EA3DA0049A832 /* OFArray_NSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E30163EA3DA0049A832 /* OFArray_NSArray.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B187E4F163EA3DA0049A832 /* OFArray_NSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E30163EA3DA0049A832 /* OFArray_NSArray.h */; }; 4B187E51163EA3DA0049A832 /* OFArray_NSArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E31163EA3DA0049A832 /* OFArray_NSArray.m */; }; 4B187E52163EA3DA0049A832 /* OFArray+NSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E32163EA3DA0049A832 /* OFArray+NSObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B187E54163EA3DA0049A832 /* OFArray+NSObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E33163EA3DA0049A832 /* OFArray+NSObject.m */; }; 4B187E55163EA3DA0049A832 /* OFBridging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E34163EA3DA0049A832 /* OFBridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B187E56163EA3DA0049A832 /* OFDictionary_NSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E35163EA3DA0049A832 /* OFDictionary_NSDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B187E56163EA3DA0049A832 /* OFDictionary_NSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E35163EA3DA0049A832 /* OFDictionary_NSDictionary.h */; }; 4B187E58163EA3DA0049A832 /* OFDictionary_NSDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E36163EA3DA0049A832 /* OFDictionary_NSDictionary.m */; }; 4B187E59163EA3DA0049A832 /* OFDictionary+NSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E37163EA3DA0049A832 /* OFDictionary+NSObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B187E5B163EA3DA0049A832 /* OFDictionary+NSObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E38163EA3DA0049A832 /* OFDictionary+NSObject.m */; }; 4B187E5C163EA3DA0049A832 /* OFString+NSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B187E39163EA3DA0049A832 /* OFString+NSObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B187E5E163EA3DA0049A832 /* OFString+NSObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B187E3A163EA3DA0049A832 /* OFString+NSObject.m */; }; @@ -1107,11 +1107,11 @@ 4B06855018B2AD3800FC731A /* OFINICategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFINICategory.h; path = src/OFINICategory.h; sourceTree = ""; }; 4B06855118B2AD3800FC731A /* OFINICategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFINICategory.m; path = src/OFINICategory.m; sourceTree = ""; }; 4B06855218B2AD3800FC731A /* OFINICategory+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFINICategory+Private.h"; path = "src/OFINICategory+Private.h"; sourceTree = ""; }; 4B0D249411DFAA3D00ED6FFC /* OFXMLElementBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFXMLElementBuilder.h; path = src/OFXMLElementBuilder.h; sourceTree = ""; }; 4B0D249511DFAA3D00ED6FFC /* OFXMLElementBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFXMLElementBuilder.m; path = src/OFXMLElementBuilder.m; sourceTree = ""; }; - 4B0E298B1DA2A8A400323A76 /* ObjFW-Bridge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "ObjFW-Bridge.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B0E298B1DA2A8A400323A76 /* ObjFW_Bridge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjFW_Bridge.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4B0EA9121898690E00F573A4 /* OFKernelEventObserver_kqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFKernelEventObserver_kqueue.h; path = src/OFKernelEventObserver_kqueue.h; sourceTree = ""; }; 4B0EA9131898690E00F573A4 /* OFKernelEventObserver_kqueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFKernelEventObserver_kqueue.m; path = src/OFKernelEventObserver_kqueue.m; sourceTree = ""; }; 4B0EA9141898690E00F573A4 /* OFKernelEventObserver_poll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFKernelEventObserver_poll.h; path = src/OFKernelEventObserver_poll.h; sourceTree = ""; }; 4B0EA9151898690E00F573A4 /* OFKernelEventObserver_poll.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFKernelEventObserver_poll.m; path = src/OFKernelEventObserver_poll.m; sourceTree = ""; }; 4B0EA9161898690E00F573A4 /* OFKernelEventObserver_select.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFKernelEventObserver_select.h; path = src/OFKernelEventObserver_select.h; sourceTree = ""; }; @@ -1160,12 +1160,12 @@ 4B17FFB0133A365C003E6DCD /* OFUnsupportedProtocolException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFUnsupportedProtocolException.m; path = src/exceptions/OFUnsupportedProtocolException.m; sourceTree = ""; }; 4B17FFB3133A374C003E6DCD /* OFUnboundNamespaceException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFUnboundNamespaceException.h; path = src/exceptions/OFUnboundNamespaceException.h; sourceTree = ""; }; 4B17FFB4133A3750003E6DCD /* OFUnboundNamespaceException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFUnboundNamespaceException.m; path = src/exceptions/OFUnboundNamespaceException.m; sourceTree = ""; }; 4B17FFB7133A380F003E6DCD /* OFInvalidServerReplyException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFInvalidServerReplyException.h; path = src/exceptions/OFInvalidServerReplyException.h; sourceTree = ""; }; 4B17FFB8133A3813003E6DCD /* OFInvalidServerReplyException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFInvalidServerReplyException.m; path = src/exceptions/OFInvalidServerReplyException.m; sourceTree = ""; }; - 4B187E0E163EA29F0049A832 /* ObjFW-Bridge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "ObjFW-Bridge.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B187E22163EA3DA0049A832 /* ObjFW-Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ObjFW-Bridge.h"; path = "src/bridge/ObjFW-Bridge.h"; sourceTree = ""; }; + 4B187E0E163EA29F0049A832 /* ObjFW_Bridge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjFW_Bridge.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B187E22163EA3DA0049A832 /* ObjFW_Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjFW_Bridge.h; path = src/bridge/ObjFW_Bridge.h; sourceTree = ""; }; 4B187E23163EA3DA0049A832 /* Bridge-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Bridge-Info.plist"; path = "misc/Bridge-Info.plist"; sourceTree = ""; }; 4B187E24163EA3DA0049A832 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = src/bridge/Makefile; sourceTree = ""; }; 4B187E25163EA3DA0049A832 /* NSArray_OFArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSArray_OFArray.h; path = src/bridge/NSArray_OFArray.h; sourceTree = ""; }; 4B187E26163EA3DA0049A832 /* NSArray_OFArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSArray_OFArray.m; path = src/bridge/NSArray_OFArray.m; sourceTree = ""; }; 4B187E27163EA3DA0049A832 /* NSArray+OFObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSArray+OFObject.h"; path = "src/bridge/NSArray+OFObject.h"; sourceTree = ""; }; @@ -1818,11 +1818,11 @@ 4B187E36163EA3DA0049A832 /* OFDictionary_NSDictionary.m */, 4B187E37163EA3DA0049A832 /* OFDictionary+NSObject.h */, 4B187E38163EA3DA0049A832 /* OFDictionary+NSObject.m */, 4B187E39163EA3DA0049A832 /* OFString+NSObject.h */, 4B187E3A163EA3DA0049A832 /* OFString+NSObject.m */, - 4B187E22163EA3DA0049A832 /* ObjFW-Bridge.h */, + 4B187E22163EA3DA0049A832 /* ObjFW_Bridge.h */, ); name = Bridge; sourceTree = ""; }; 4B187E5F163EA42A0049A832 /* Supporting Files */ = { @@ -1837,13 +1837,13 @@ 4B3D23771337FBC800DD29B8 /* Products */ = { isa = PBXGroup; children = ( 4BF33AF0133807310059CEF7 /* Tests */, 4B23CA8A133811610047A1D9 /* TestPlugin.bundle */, - 4B187E0E163EA29F0049A832 /* ObjFW-Bridge.framework */, + 4B187E0E163EA29F0049A832 /* ObjFW_Bridge.framework */, 4B2C22B01DA292BE00735907 /* ObjFW.framework */, - 4B0E298B1DA2A8A400323A76 /* ObjFW-Bridge.framework */, + 4B0E298B1DA2A8A400323A76 /* ObjFW_Bridge.framework */, 4B76F4751DA2C2BB00CFF831 /* Tests (iOS).app */, 4B5D70751DA2F87A00B3B2D7 /* TestPlugin.bundle */, ); name = Products; sourceTree = ""; @@ -2261,43 +2261,43 @@ /* Begin PBXHeadersBuildPhase section */ 4B0E29791DA2A8A400323A76 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4B0E297A1DA2A8A400323A76 /* NSArray_OFArray.h in Headers */, 4B0E297B1DA2A8A400323A76 /* NSArray+OFObject.h in Headers */, 4B0E297C1DA2A8A400323A76 /* NSBridging.h in Headers */, - 4B0E297D1DA2A8A400323A76 /* NSDictionary_OFDictionary.h in Headers */, 4B0E297E1DA2A8A400323A76 /* NSDictionary+OFObject.h in Headers */, 4B0E297F1DA2A8A400323A76 /* NSString+OFObject.h in Headers */, - 4B0E29801DA2A8A400323A76 /* OFArray_NSArray.h in Headers */, 4B0E29811DA2A8A400323A76 /* OFArray+NSObject.h in Headers */, 4B0E29821DA2A8A400323A76 /* OFBridging.h in Headers */, - 4B0E29831DA2A8A400323A76 /* OFDictionary_NSDictionary.h in Headers */, 4B0E29841DA2A8A400323A76 /* OFDictionary+NSObject.h in Headers */, 4B0E29851DA2A8A400323A76 /* OFString+NSObject.h in Headers */, - 4B0E29861DA2A8A400323A76 /* ObjFW-Bridge.h in Headers */, + 4B0E29861DA2A8A400323A76 /* ObjFW_Bridge.h in Headers */, + 4B0E297A1DA2A8A400323A76 /* NSArray_OFArray.h in Headers */, + 4B0E297D1DA2A8A400323A76 /* NSDictionary_OFDictionary.h in Headers */, + 4B0E29801DA2A8A400323A76 /* OFArray_NSArray.h in Headers */, + 4B0E29831DA2A8A400323A76 /* OFDictionary_NSDictionary.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; 4B187E0B163EA29F0049A832 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4B187E3F163EA3DA0049A832 /* NSArray_OFArray.h in Headers */, 4B187E42163EA3DA0049A832 /* NSArray+OFObject.h in Headers */, 4B187E45163EA3DA0049A832 /* NSBridging.h in Headers */, - 4B187E46163EA3DA0049A832 /* NSDictionary_OFDictionary.h in Headers */, 4B187E49163EA3DA0049A832 /* NSDictionary+OFObject.h in Headers */, 4B187E4C163EA3DA0049A832 /* NSString+OFObject.h in Headers */, - 4B187E4F163EA3DA0049A832 /* OFArray_NSArray.h in Headers */, 4B187E52163EA3DA0049A832 /* OFArray+NSObject.h in Headers */, 4B187E55163EA3DA0049A832 /* OFBridging.h in Headers */, - 4B187E56163EA3DA0049A832 /* OFDictionary_NSDictionary.h in Headers */, 4B187E59163EA3DA0049A832 /* OFDictionary+NSObject.h in Headers */, 4B187E5C163EA3DA0049A832 /* OFString+NSObject.h in Headers */, - 4B187E3B163EA3DA0049A832 /* ObjFW-Bridge.h in Headers */, + 4B187E3B163EA3DA0049A832 /* ObjFW_Bridge.h in Headers */, + 4B187E3F163EA3DA0049A832 /* NSArray_OFArray.h in Headers */, + 4B187E46163EA3DA0049A832 /* NSDictionary_OFDictionary.h in Headers */, + 4B187E4F163EA3DA0049A832 /* OFArray_NSArray.h in Headers */, + 4B187E56163EA3DA0049A832 /* OFDictionary_NSDictionary.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; 4B23CA88133811610047A1D9 /* Headers */ = { isa = PBXHeadersBuildPhase; @@ -2749,13 +2749,13 @@ runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4B0E296A1DA2A8A400323A76 /* ObjFW-Bridge (iOS) */ = { + 4B0E296A1DA2A8A400323A76 /* ObjFW_Bridge (iOS) */ = { isa = PBXNativeTarget; - buildConfigurationList = 4B0E29881DA2A8A400323A76 /* Build configuration list for PBXNativeTarget "ObjFW-Bridge (iOS)" */; + buildConfigurationList = 4B0E29881DA2A8A400323A76 /* Build configuration list for PBXNativeTarget "ObjFW_Bridge (iOS)" */; buildPhases = ( 4B0E296B1DA2A8A400323A76 /* Sources */, 4B0E29761DA2A8A400323A76 /* Frameworks */, 4B0E29791DA2A8A400323A76 /* Headers */, 4B0E29871DA2A8A400323A76 /* Resources */, @@ -2763,18 +2763,18 @@ buildRules = ( ); dependencies = ( 4B7E83EC1DA2B78900BA5689 /* PBXTargetDependency */, ); - name = "ObjFW-Bridge (iOS)"; + name = "ObjFW_Bridge (iOS)"; productName = "ObjFW-Bridge"; - productReference = 4B0E298B1DA2A8A400323A76 /* ObjFW-Bridge.framework */; + productReference = 4B0E298B1DA2A8A400323A76 /* ObjFW_Bridge.framework */; productType = "com.apple.product-type.framework"; }; - 4B187E0D163EA29F0049A832 /* ObjFW-Bridge (Mac) */ = { + 4B187E0D163EA29F0049A832 /* ObjFW_Bridge (Mac) */ = { isa = PBXNativeTarget; - buildConfigurationList = 4B187E1F163EA29F0049A832 /* Build configuration list for PBXNativeTarget "ObjFW-Bridge (Mac)" */; + buildConfigurationList = 4B187E1F163EA29F0049A832 /* Build configuration list for PBXNativeTarget "ObjFW_Bridge (Mac)" */; buildPhases = ( 4B187E09163EA29F0049A832 /* Sources */, 4B187E0A163EA29F0049A832 /* Frameworks */, 4B187E0B163EA29F0049A832 /* Headers */, 4B187E0C163EA29F0049A832 /* Resources */, @@ -2782,13 +2782,13 @@ buildRules = ( ); dependencies = ( 4B7E83EA1DA2B78100BA5689 /* PBXTargetDependency */, ); - name = "ObjFW-Bridge (Mac)"; + name = "ObjFW_Bridge (Mac)"; productName = "ObjFW-Bridge"; - productReference = 4B187E0E163EA29F0049A832 /* ObjFW-Bridge.framework */; + productReference = 4B187E0E163EA29F0049A832 /* ObjFW_Bridge.framework */; productType = "com.apple.product-type.framework"; }; 4B23CA89133811610047A1D9 /* TestPlugin (Mac) */ = { isa = PBXNativeTarget; buildConfigurationList = 4B23CA8B133811610047A1D9 /* Build configuration list for PBXNativeTarget "TestPlugin (Mac)" */; @@ -2943,12 +2943,12 @@ targets = ( 4BF33AEF133807310059CEF7 /* Tests (Mac) */, 4B76F4741DA2C2BB00CFF831 /* Tests (iOS) */, 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */, 4B2C211B1DA292BE00735907 /* ObjFW (iOS) */, - 4B187E0D163EA29F0049A832 /* ObjFW-Bridge (Mac) */, - 4B0E296A1DA2A8A400323A76 /* ObjFW-Bridge (iOS) */, + 4B187E0D163EA29F0049A832 /* ObjFW_Bridge (Mac) */, + 4B0E296A1DA2A8A400323A76 /* ObjFW_Bridge (iOS) */, 4B23CA89133811610047A1D9 /* TestPlugin (Mac) */, 4B5D706A1DA2F87A00B3B2D7 /* TestPlugin (iOS) */, 4B5D8DDD1099E1B0000896FF /* autoreconf */, 4BDF37AD1338047700F9A81A /* configure */, ); @@ -3685,10 +3685,11 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEFINES_MODULE = YES; DEVELOPMENT_TEAM = MXKNFCKFL6; DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; @@ -3706,12 +3707,13 @@ 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"; + MODULEMAP_FILE = "misc/bridge-module.map"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; - PRODUCT_NAME = "ObjFW-Bridge"; + PRODUCT_NAME = ObjFW_Bridge; SDKROOT = iphoneos; WRAPPER_EXTENSION = framework; }; name = Debug; }; @@ -3722,10 +3724,11 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEFINES_MODULE = YES; DEVELOPMENT_TEAM = MXKNFCKFL6; DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; @@ -3736,12 +3739,13 @@ 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"; + MODULEMAP_FILE = "misc/bridge-module.map"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; - PRODUCT_NAME = "ObjFW-Bridge"; + PRODUCT_NAME = ObjFW_Bridge; SDKROOT = iphoneos; WRAPPER_EXTENSION = framework; }; name = Release; }; @@ -3751,10 +3755,11 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -3769,12 +3774,13 @@ 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"; + MODULEMAP_FILE = "misc/bridge-module.map"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; - PRODUCT_NAME = "ObjFW-Bridge"; + PRODUCT_NAME = ObjFW_Bridge; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; name = Debug; }; @@ -3784,10 +3790,11 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; FRAMEWORK_VERSION = A; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -3795,12 +3802,13 @@ 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"; + MODULEMAP_FILE = "misc/bridge-module.map"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; - PRODUCT_NAME = "ObjFW-Bridge"; + PRODUCT_NAME = ObjFW_Bridge; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; name = Release; }; @@ -4078,20 +4086,20 @@ 1DEB919508733D9F0010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4B0E29881DA2A8A400323A76 /* Build configuration list for PBXNativeTarget "ObjFW-Bridge (iOS)" */ = { + 4B0E29881DA2A8A400323A76 /* Build configuration list for PBXNativeTarget "ObjFW_Bridge (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( 4B0E29891DA2A8A400323A76 /* Debug */, 4B0E298A1DA2A8A400323A76 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4B187E1F163EA29F0049A832 /* Build configuration list for PBXNativeTarget "ObjFW-Bridge (Mac)" */ = { + 4B187E1F163EA29F0049A832 /* Build configuration list for PBXNativeTarget "ObjFW_Bridge (Mac)" */ = { isa = XCConfigurationList; buildConfigurations = ( 4B187E20163EA29F0049A832 /* Debug */, 4B187E21163EA29F0049A832 /* Release */, ); ADDED misc/bridge-module.map Index: misc/bridge-module.map ================================================================== --- misc/bridge-module.map +++ misc/bridge-module.map @@ -0,0 +1,16 @@ +framework module ObjFW_Bridge { + umbrella header "ObjFW_Bridge.h" + + /* + * Categories need to be declared as textual, otherwise the they are + * not picked up. + */ + textual header "NSArray+OFObject.h" + textual header "NSDictionary+OFObject.h" + textual header "NSString+OFObject.h" + textual header "OFArray+NSObject.h" + textual header "OFDictionary+NSObject.h" + textual header "OFString+NSObject.h" + + export * +} Index: misc/module.map ================================================================== --- misc/module.map +++ misc/module.map @@ -1,10 +1,16 @@ framework module ObjFW { umbrella header "ObjFW.h" + + /* + * These are included by atomic.h, but should never be included + * directly. + */ exclude header "atomic_builtins.h" exclude header "atomic_no_threads.h" exclude header "atomic_osatomic.h" exclude header "atomic_powerpc.h" exclude header "atomic_sync_builtins.h" exclude header "atomic_x86.h" + export * } Index: src/bridge/Makefile ================================================================== --- src/bridge/Makefile +++ src/bridge/Makefile @@ -6,27 +6,28 @@ STATIC_LIB = ${OBJFW_BRIDGE_STATIC_LIB} LIB_MAJOR = ${OBJFW_LIB_MAJOR} LIB_MINOR = ${OBJFW_LIB_MINOR} SRCS = OFArray+NSObject.m \ - OFArray_NSArray.m \ OFDictionary+NSObject.m \ - OFDictionary_NSDictionary.m \ OFString+NSObject.m \ NSArray+OFObject.m \ - NSArray_OFArray.m \ NSDictionary+OFObject.m \ - NSDictionary_OFDictionary.m \ NSString+OFObject.m INCLUDES = ${SRCS:.m=.h} \ NSBridging.h \ OFBridging.h \ - ObjFW-Bridge.h + ObjFW_Bridge.h + +SRCS += NSArray_OFArray.m \ + NSDictionary_OFDictionary.m \ + OFArray_NSArray.m \ + OFDictionary_NSDictionary.m \ -includesubdir = ObjFW-Bridge +includesubdir = ObjFW_Bridge include ../../buildsys.mk CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES LD = ${OBJC} LIBS = -L.. -lobjfw -framework Foundation DELETED src/bridge/ObjFW-Bridge.h Index: src/bridge/ObjFW-Bridge.h ================================================================== --- src/bridge/ObjFW-Bridge.h +++ src/bridge/ObjFW-Bridge.h @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 - * Jonathan Schleifer - * - * All rights reserved. - * - * This file is part of ObjFW. It may be distributed under the terms of the - * Q Public License 1.0, which can be found in the file LICENSE.QPL included in - * the packaging of this file. - * - * Alternatively, it may be distributed under the terms of the GNU General - * Public License, either version 2 or 3, which can be found in the file - * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this - * file. - */ - -#import "NSArray+OFObject.h" -#import "NSString+OFObject.h" - -#import "OFArray+NSObject.h" -#import "OFString+NSObject.h" ADDED src/bridge/ObjFW_Bridge.h Index: src/bridge/ObjFW_Bridge.h ================================================================== --- src/bridge/ObjFW_Bridge.h +++ src/bridge/ObjFW_Bridge.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 + * Jonathan Schleifer + * + * All rights reserved. + * + * This file is part of ObjFW. It may be distributed under the terms of the + * Q Public License 1.0, which can be found in the file LICENSE.QPL included in + * the packaging of this file. + * + * Alternatively, it may be distributed under the terms of the GNU General + * Public License, either version 2 or 3, which can be found in the file + * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this + * file. + */ + +#import "NSArray+OFObject.h" +#import "NSDictionary+OFObject.h" +#import "NSString+OFObject.h" + +#import "OFArray+NSObject.h" +#import "OFDictionary+NSObject.h" +#import "OFString+NSObject.h"