Index: .gitignore ================================================================== --- .gitignore +++ .gitignore @@ -22,30 +22,31 @@ DerivedData docs extra.mk generators/gen_tables generators/gen_tables.exe -misc/Bridge-Info.plist -misc/Info.plist -misc/Tests-Info.plist ObjFW.xcodeproj/*.mode1v3 ObjFW.xcodeproj/*.pbxuser ObjFW.xcodeproj/project.xcworkspace ObjFW.xcodeproj/xcuserdata +src/Info.plist +src/ObjFW.framework +src/bridge/Info.plist src/objfw-defs.h src/runtime/ppcinline.h tests/*.map +tests/EBOOT.PBP +tests/Info.plist +tests/PARAM.SFO +tests/objc_sync/objc_sync tests/tests tests/tests.3dsx tests/tests.arm9 tests/tests.exe tests/tests.nds -tests/EBOOT.PBP -tests/PARAM.SFO -tests/objc_sync/objc_sync utils/objfw-config utils/ofhash/ofhash utils/ofhash/ofhash.exe utils/ofhttp/ofhttp utils/ofhttp/ofhttp.exe utils/ofzip/ofzip utils/ofzip/ofzip.exe Index: ObjFW.xcodeproj/project.pbxproj ================================================================== --- ObjFW.xcodeproj/project.pbxproj +++ ObjFW.xcodeproj/project.pbxproj @@ -829,10 +829,13 @@ 4B6D0A8A1D4459D900901D8D /* OFHMAC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6D0A881D4459D900901D8D /* OFHMAC.m */; }; 4B7161AD17A6FC7600B74970 /* OFHTTPResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B7161AB17A6FC7600B74970 /* OFHTTPResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B7161AE17A6FC7600B74970 /* OFHTTPResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7161AC17A6FC7600B74970 /* OFHTTPResponse.m */; }; 4B72F7DE1AD9311B00CE253C /* OFStatItemFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B72F7DC1AD9311B00CE253C /* OFStatItemFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B72F7DF1AD9311B00CE253C /* OFStatItemFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B72F7DD1AD9311B00CE253C /* OFStatItemFailedException.m */; }; + 4B7327771F93EC3A00E1607F /* module.map in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B7327731F93EBC400E1607F /* module.map */; }; + 4B7327791F93EC5700E1607F /* module.map in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BEAF52519A8107500B61868 /* module.map */; }; + 4B73277B1F93EC6A00E1607F /* module.map in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B7327731F93EBC400E1607F /* module.map */; }; 4B745BA5168B25E600A6C20E /* OFSystemInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B745BA3168B25E600A6C20E /* OFSystemInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B745BA6168B25E600A6C20E /* OFSystemInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B745BA4168B25E600A6C20E /* OFSystemInfo.m */; }; 4B7769ED1895C07D00D12284 /* resolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B7769EB1895C07D00D12284 /* resolver.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B7769EE1895C07D00D12284 /* resolver.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7769EC1895C07D00D12284 /* resolver.m */; }; 4B7769F11895ED0C00D12284 /* OFUDPSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B7769EF1895ED0C00D12284 /* OFUDPSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1159,10 +1162,40 @@ dstSubfolderSpec = 7; files = ( 4B5D707A1DA2F96200B3B2D7 /* TestPlugin.bundle in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; + }; + 4B7327761F93EC1E00E1607F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ObjFW_Bridge.framework; + dstSubfolderSpec = 16; + files = ( + 4B7327771F93EC3A00E1607F /* module.map in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 4B7327781F93EC4100E1607F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ObjFW.framework; + dstSubfolderSpec = 16; + files = ( + 4B7327791F93EC5700E1607F /* module.map in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 4B73277A1F93EC6100E1607F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ObjFW_Bridge.framework; + dstSubfolderSpec = 16; + files = ( + 4B73277B1F93EC6A00E1607F /* module.map in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; }; 4BD9CA2E1DA2CF1D00E5AD52 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; @@ -1275,11 +1308,11 @@ 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 = ""; }; - 4B187E23163EA3DA0049A832 /* Bridge-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Bridge-Info.plist"; path = "misc/Bridge-Info.plist"; sourceTree = ""; }; + 4B187E23163EA3DA0049A832 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = src/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 = ""; }; 4B187E28163EA3DA0049A832 /* NSArray+OFObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSArray+OFObject.m"; path = "src/bridge/NSArray+OFObject.m"; sourceTree = ""; }; @@ -1360,11 +1393,11 @@ 4B3B0796166978780044E634 /* OFMapTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMapTable.h; path = src/OFMapTable.h; sourceTree = ""; }; 4B3B0797166978780044E634 /* OFMapTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMapTable.m; path = src/OFMapTable.m; sourceTree = ""; }; 4B3D236D1337FB5800DD29B8 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = src/base64.h; sourceTree = ""; }; 4B3D236E1337FB5800DD29B8 /* base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = base64.m; path = src/base64.m; sourceTree = ""; }; 4B3D23761337FBC800DD29B8 /* ObjFW.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjFW.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B3D23BB1337FC5800DD29B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = misc/Info.plist; sourceTree = SOURCE_ROOT; }; + 4B3D23BB1337FC5800DD29B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = src/Info.plist; sourceTree = SOURCE_ROOT; }; 4B3D5693139A617D0010A78F /* OFSerializationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSerializationTests.m; path = tests/OFSerializationTests.m; sourceTree = ""; }; 4B3DE1231F5F4F2F0090AA3E /* OFMutablePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMutablePair.h; path = src/OFMutablePair.h; sourceTree = ""; }; 4B3DE1241F5F4F2F0090AA3E /* OFMutablePair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMutablePair.m; path = src/OFMutablePair.m; sourceTree = ""; }; 4B3DE1251F5F4F2F0090AA3E /* OFPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFPair.h; path = src/OFPair.h; sourceTree = ""; }; 4B3DE1261F5F4F2F0090AA3E /* OFPair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFPair.m; path = src/OFPair.m; sourceTree = ""; }; @@ -1536,10 +1569,11 @@ 4B6EF685123535C80076B512 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = tests/objc_sync/test.m; sourceTree = SOURCE_ROOT; }; 4B7161AB17A6FC7600B74970 /* OFHTTPResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFHTTPResponse.h; path = src/OFHTTPResponse.h; sourceTree = ""; }; 4B7161AC17A6FC7600B74970 /* OFHTTPResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFHTTPResponse.m; path = src/OFHTTPResponse.m; sourceTree = ""; }; 4B72F7DC1AD9311B00CE253C /* OFStatItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFStatItemFailedException.h; path = src/exceptions/OFStatItemFailedException.h; sourceTree = ""; }; 4B72F7DD1AD9311B00CE253C /* OFStatItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFStatItemFailedException.m; path = src/exceptions/OFStatItemFailedException.m; sourceTree = ""; }; + 4B7327731F93EBC400E1607F /* module.map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = module.map; path = src/bridge/module.map; sourceTree = ""; }; 4B745BA3168B25E600A6C20E /* OFSystemInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSystemInfo.h; path = src/OFSystemInfo.h; sourceTree = ""; }; 4B745BA4168B25E600A6C20E /* OFSystemInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSystemInfo.m; path = src/OFSystemInfo.m; sourceTree = ""; }; 4B76F4751DA2C2BB00CFF831 /* Tests (iOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Tests (iOS).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 4B7769EB1895C07D00D12284 /* resolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resolver.h; path = src/resolver.h; sourceTree = ""; }; 4B7769EC1895C07D00D12284 /* resolver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = resolver.m; path = src/resolver.m; sourceTree = ""; }; @@ -1548,11 +1582,11 @@ 4B7DD58118942FE200990FD6 /* socket_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_helpers.h; path = src/socket_helpers.h; sourceTree = ""; }; 4B7DD5831894358400990FD6 /* OFMoveItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMoveItemFailedException.h; path = src/exceptions/OFMoveItemFailedException.h; sourceTree = ""; }; 4B7DD5841894358400990FD6 /* OFMoveItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMoveItemFailedException.m; path = src/exceptions/OFMoveItemFailedException.m; sourceTree = ""; }; 4B7DD58718943D4A00990FD6 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = src/socket.h; sourceTree = ""; }; 4B7DD58918944A7900990FD6 /* apple-forwarding-arm64.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = "apple-forwarding-arm64.S"; path = "src/forwarding/apple-forwarding-arm64.S"; sourceTree = ""; }; - 4B7E83ED1DA2B9AB00BA5689 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "misc/Tests-Info.plist"; sourceTree = ""; }; + 4B7E83ED1DA2B9AB00BA5689 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = tests/Info.plist; sourceTree = ""; }; 4B7FF3B2133CED6100000324 /* OFConditionStillWaitingException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFConditionStillWaitingException.h; path = src/exceptions/OFConditionStillWaitingException.h; sourceTree = ""; }; 4B7FF3B3133CED6100000324 /* OFConditionStillWaitingException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFConditionStillWaitingException.m; path = src/exceptions/OFConditionStillWaitingException.m; sourceTree = ""; }; 4B837D7716829C5F007A3E83 /* block.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = block.h; path = src/block.h; sourceTree = ""; }; 4B837D7816829C5F007A3E83 /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instance.h; path = src/instance.h; sourceTree = ""; }; 4B8385121951BF9500D5358A /* OFSettings_INIFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSettings_INIFile.h; path = src/OFSettings_INIFile.h; sourceTree = ""; }; @@ -1693,11 +1727,11 @@ 4BE5F0D812DF4225005C7A0C /* OFConstantString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFConstantString.m; path = src/OFConstantString.m; sourceTree = SOURCE_ROOT; }; 4BE5F0D912DF4225005C7A0C /* OFDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFDate.h; path = src/OFDate.h; sourceTree = SOURCE_ROOT; }; 4BE5F0DA12DF4225005C7A0C /* OFDate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFDate.m; path = src/OFDate.m; sourceTree = SOURCE_ROOT; }; 4BE5F0E412DF4259005C7A0C /* OFBlockTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFBlockTests.m; path = tests/OFBlockTests.m; sourceTree = SOURCE_ROOT; }; 4BE5F0E512DF4259005C7A0C /* OFDateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFDateTests.m; path = tests/OFDateTests.m; sourceTree = SOURCE_ROOT; }; - 4BEAF52519A8107500B61868 /* module.map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = module.map; path = misc/module.map; sourceTree = SOURCE_ROOT; }; + 4BEAF52519A8107500B61868 /* module.map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = module.map; path = src/module.map; sourceTree = SOURCE_ROOT; }; 4BEC83B719B7CB7100E4BB08 /* OFRIPEMD160Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFRIPEMD160Hash.h; path = src/OFRIPEMD160Hash.h; sourceTree = ""; }; 4BEC83B819B7CB7100E4BB08 /* OFRIPEMD160Hash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFRIPEMD160Hash.m; path = src/OFRIPEMD160Hash.m; sourceTree = ""; }; 4BEC83BB19B7CBDE00E4BB08 /* OFRIPEMD160HashTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFRIPEMD160HashTests.m; path = tests/OFRIPEMD160HashTests.m; sourceTree = ""; }; 4BF0749512DFAFCA00A4ADD1 /* OFURLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFURLTests.m; path = tests/OFURLTests.m; sourceTree = SOURCE_ROOT; }; 4BF0DD731D44645D001D9949 /* OFHMACTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFHMACTests.m; path = tests/OFHMACTests.m; sourceTree = ""; }; @@ -1981,12 +2015,13 @@ sourceTree = ""; }; 4B187E5F163EA42A0049A832 /* Supporting Files */ = { isa = PBXGroup; children = ( - 4B187E23163EA3DA0049A832 /* Bridge-Info.plist */, + 4B187E23163EA3DA0049A832 /* Info.plist */, 4B187E24163EA3DA0049A832 /* Makefile */, + 4B7327731F93EBC400E1607F /* module.map */, ); name = "Supporting Files"; sourceTree = ""; }; 4B1F61B11F66239200278BCB /* Invocation */ = { @@ -2459,11 +2494,11 @@ }; 4BF33B4113380CB60059CEF7 /* Supporting Files */ = { isa = PBXGroup; children = ( 4B19023D1338D6D5000374C9 /* Makefile */, - 4B7E83ED1DA2B9AB00BA5689 /* Tests-Info.plist */, + 4B7E83ED1DA2B9AB00BA5689 /* Info.plist */, 4BAE7353139C507F00F682ED /* serialization.xml */, 4BF33B4213380CD40059CEF7 /* testfile.bin */, 4B5B02C218B289ED00CE6AE4 /* testfile.ini */, 4BF33B4313380CD40059CEF7 /* testfile.txt */, ); @@ -3006,11 +3041,11 @@ buildConfigurationList = 4B0E29881DA2A8A400323A76 /* Build configuration list for PBXNativeTarget "ObjFW_Bridge (iOS)" */; buildPhases = ( 4B0E296B1DA2A8A400323A76 /* Sources */, 4B0E29761DA2A8A400323A76 /* Frameworks */, 4B0E29791DA2A8A400323A76 /* Headers */, - 4B0E29871DA2A8A400323A76 /* Resources */, + 4B73277A1F93EC6100E1607F /* CopyFiles */, ); buildRules = ( ); dependencies = ( 4B7E83EC1DA2B78900BA5689 /* PBXTargetDependency */, @@ -3025,11 +3060,11 @@ buildConfigurationList = 4B187E1F163EA29F0049A832 /* Build configuration list for PBXNativeTarget "ObjFW_Bridge (Mac)" */; buildPhases = ( 4B187E09163EA29F0049A832 /* Sources */, 4B187E0A163EA29F0049A832 /* Frameworks */, 4B187E0B163EA29F0049A832 /* Headers */, - 4B187E0C163EA29F0049A832 /* Resources */, + 4B7327761F93EC1E00E1607F /* CopyFiles */, ); buildRules = ( ); dependencies = ( 4B7E83EA1DA2B78100BA5689 /* PBXTargetDependency */, @@ -3081,10 +3116,11 @@ buildConfigurationList = 4B3D23861337FBC800DD29B8 /* Build configuration list for PBXNativeTarget "ObjFW (Mac)" */; buildPhases = ( 4B3D23711337FBC800DD29B8 /* Sources */, 4B3D23721337FBC800DD29B8 /* Frameworks */, 4B3D23731337FBC800DD29B8 /* Headers */, + 4B7327781F93EC4100E1607F /* CopyFiles */, ); buildRules = ( ); dependencies = ( 4B8BA41C133805A700E65070 /* PBXTargetDependency */, @@ -3205,24 +3241,10 @@ ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 4B0E29871DA2A8A400323A76 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B187E0C163EA29F0049A832 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4B76F4731DA2C2BB00CFF831 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( 4BD9CA281DA2C9C300E5AD52 /* serialization.xml in Resources */, @@ -4029,11 +4051,10 @@ 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*]" = ""; - DEFINES_MODULE = YES; DEVELOPMENT_TEAM = MXKNFCKFL6; DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; @@ -4049,13 +4070,12 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; 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"; + INFOPLIST_FILE = "$(SRCROOT)/src/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; SDKROOT = iphoneos; WRAPPER_EXTENSION = framework; }; @@ -4068,11 +4088,10 @@ 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*]" = ""; - DEFINES_MODULE = YES; DEVELOPMENT_TEAM = MXKNFCKFL6; DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; @@ -4081,13 +4100,12 @@ GCC_PREPROCESSOR_DEFINITIONS = OF_BRIDGE_LOCAL_INCLUDES; 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"; + INFOPLIST_FILE = "$(SRCROOT)/src/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; SDKROOT = iphoneos; WRAPPER_EXTENSION = framework; }; @@ -4099,11 +4117,10 @@ 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; @@ -4117,12 +4134,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; 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"; + INFOPLIST_FILE = "$(SRCROOT)/src/bridge/Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; PRODUCT_NAME = ObjFW_Bridge; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; @@ -4134,11 +4150,10 @@ 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; @@ -4145,12 +4160,11 @@ GCC_PREPROCESSOR_DEFINITIONS = OF_BRIDGE_LOCAL_INCLUDES; 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"; + INFOPLIST_FILE = "$(SRCROOT)/src/bridge/Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.bridge; PRODUCT_NAME = ObjFW_Bridge; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; @@ -4185,19 +4199,17 @@ 4B2C22AE1DA292BE00735907 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - 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"; + INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist"; INSTALL_PATH = "@executable_path/Frameworks"; - MODULEMAP_FILE = misc/module.map; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -4211,19 +4223,17 @@ 4B2C22AF1DA292BE00735907 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - 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"; + INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist"; INSTALL_PATH = "@executable_path/Frameworks"; - MODULEMAP_FILE = misc/module.map; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -4235,16 +4245,14 @@ 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; + INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist"; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -4256,16 +4264,14 @@ 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; + INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist"; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -4354,11 +4360,11 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = STDOUT_SIMPLE; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "$(SRCROOT)/misc/Tests-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/tests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.tests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -4384,11 +4390,11 @@ ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = STDOUT_SIMPLE; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "$(SRCROOT)/misc/Tests-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/tests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw.tests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -4412,11 +4418,11 @@ }; 4BF33AF7133807310059CEF7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = STDOUT_SIMPLE; - INFOPLIST_FILE = "$(SRCROOT)/misc/Tests-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/tests/Info.plist"; INSTALL_PATH = ""; PRODUCT_NAME = Tests; SDKROOT = macosx; }; name = Debug; @@ -4423,11 +4429,11 @@ }; 4BF33AF8133807310059CEF7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = STDOUT_SIMPLE; - INFOPLIST_FILE = "$(SRCROOT)/misc/Tests-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/tests/Info.plist"; INSTALL_PATH = ""; PRODUCT_NAME = Tests; SDKROOT = macosx; }; name = Release; Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -1546,13 +1546,13 @@ AC_SUBST(TESTS_LIBS) AC_CONFIG_FILES([ buildsys.mk extra.mk - misc/Bridge-Info.plist - misc/Info.plist - misc/Tests-Info.plist + src/Info.plist + src/bridge/Info.plist + tests/Info.plist utils/objfw-config ]) AC_CONFIG_HEADERS([config.h src/objfw-defs.h]) AC_OUTPUT DELETED misc/Bridge-Info.plist.in Index: misc/Bridge-Info.plist.in ================================================================== --- misc/Bridge-Info.plist.in +++ misc/Bridge-Info.plist.in @@ -1,20 +0,0 @@ - - - - - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleName - $(PRODUCT_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleVersion - @PACKAGE_VERSION@ - CFBundleShortVersionString - @PACKAGE_VERSION@ - - DELETED misc/Info.plist.in Index: misc/Info.plist.in ================================================================== --- misc/Info.plist.in +++ misc/Info.plist.in @@ -1,20 +0,0 @@ - - - - - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleName - $(PRODUCT_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleVersion - @PACKAGE_VERSION@ - CFBundleShortVersionString - @PACKAGE_VERSION@ - - DELETED misc/Tests-Info.plist.in Index: misc/Tests-Info.plist.in ================================================================== --- misc/Tests-Info.plist.in +++ misc/Tests-Info.plist.in @@ -1,36 +0,0 @@ - - - - - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleName - $(PRODUCT_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleVersion - @PACKAGE_VERSION@ - CFBundleShortVersionString - @PACKAGE_VERSION@ - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - DELETED misc/bridge-module.map Index: misc/bridge-module.map ================================================================== --- misc/bridge-module.map +++ misc/bridge-module.map @@ -1,5 +0,0 @@ -framework module ObjFW_Bridge { - umbrella header "ObjFW_Bridge.h" - - export * -} DELETED misc/module.map Index: misc/module.map ================================================================== --- misc/module.map +++ misc/module.map @@ -1,16 +0,0 @@ -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 * -} ADDED src/Info.plist.in Index: src/Info.plist.in ================================================================== --- src/Info.plist.in +++ src/Info.plist.in @@ -0,0 +1,20 @@ + + + + + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleName + $(PRODUCT_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleVersion + @PACKAGE_VERSION@ + CFBundleShortVersionString + @PACKAGE_VERSION@ + + Index: src/Makefile ================================================================== --- src/Makefile +++ src/Makefile @@ -6,10 +6,11 @@ SHARED_LIB = ${OBJFW_SHARED_LIB} STATIC_LIB = ${OBJFW_STATIC_LIB} LIB_MAJOR = ${OBJFW_LIB_MAJOR} LIB_MINOR = ${OBJFW_LIB_MINOR} +FRAMEWORK = ObjFW.framework SRCS = OFApplication.m \ OFArray.m \ OFAutoreleasePool.m \ OFBlock.m \ @@ -182,12 +183,17 @@ LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A} \ ${EXCEPTIONS_EXCEPTIONS_LIB_A} \ ${ENCODINGS_ENCODINGS_LIB_A} \ ${FORWARDING_FORWARDING_LIB_A} \ ${INVOCATION_INVOCATION_LIB_A} +${RUNTIME_RUNTIME_A} ${RUNTIME_RUNTIME_LIB_A}: runtime +${EXCEPTIONS_EXCEPTIONS_A} ${EXCEPTIONS_EXCEPTIONS_LIB_A}: exceptions +${ENCODINGS_ENCODINGS_A} ${ENCODINGS_ENCODINGS_LIB_A}: encodings +${FORWARDING_FORWARDING_A} ${FORWARDING_FORWARDING_LIB_A}: forwarding +${INVOCATION_INVOCATION_A} ${INVOCATION_INVOCATION_LIB_A}: invocation include ../buildsys.mk CPPFLAGS += -I. -I.. -Iexceptions -Iruntime LD = ${OBJC} LDFLAGS += ${REEXPORT_RUNTIME} LIBS += -Lruntime ${RUNTIME_LIBS} ADDED src/bridge/Info.plist.in Index: src/bridge/Info.plist.in ================================================================== --- src/bridge/Info.plist.in +++ src/bridge/Info.plist.in @@ -0,0 +1,20 @@ + + + + + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleName + $(PRODUCT_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleVersion + @PACKAGE_VERSION@ + CFBundleShortVersionString + @PACKAGE_VERSION@ + + ADDED src/bridge/module.map Index: src/bridge/module.map ================================================================== --- src/bridge/module.map +++ src/bridge/module.map @@ -0,0 +1,5 @@ +framework module ObjFW_Bridge { + umbrella header "ObjFW_Bridge/ObjFW_Bridge.h" + + export * +} ADDED src/module.map Index: src/module.map ================================================================== --- src/module.map +++ src/module.map @@ -0,0 +1,16 @@ +framework module ObjFW { + umbrella header "ObjFW/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 * +} ADDED tests/Info.plist.in Index: tests/Info.plist.in ================================================================== --- tests/Info.plist.in +++ tests/Info.plist.in @@ -0,0 +1,36 @@ + + + + + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleName + $(PRODUCT_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleVersion + @PACKAGE_VERSION@ + CFBundleShortVersionString + @PACKAGE_VERSION@ + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + +