Index: .gitignore ================================================================== --- .gitignore +++ .gitignore @@ -21,17 +21,18 @@ DerivedData docs extra.mk generators/gen_tables generators/gen_tables.exe -Info.plist ObjFW.xcodeproj/*.mode1v3 ObjFW.xcodeproj/*.pbxuser ObjFW.xcodeproj/project.xcworkspace ObjFW.xcodeproj/xcuserdata src/objfw-defs.h src/ObjFW +support/Bridge-Info.plist +support/Info.plist tests/*.map tests/tests tests/tests.arm9 tests/tests.exe tests/tests.nds DELETED Info.plist.in Index: Info.plist.in ================================================================== --- Info.plist.in +++ Info.plist.in @@ -1,22 +0,0 @@ - - - - - CFBundleExecutable - ObjFW - CFBundleName - ObjFW - CFBundleIdentifier - org.webkeks.objfw - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - OBJFW - CFBundleVersion - @PACKAGE_VERSION@ - CFBundleShortVersionString - @PACKAGE_VERSION@ - - Index: ObjFW.xcodeproj/project.pbxproj ================================================================== --- ObjFW.xcodeproj/project.pbxproj +++ ObjFW.xcodeproj/project.pbxproj @@ -583,11 +583,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 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = src/bridge/Info.plist; sourceTree = ""; }; + 4B187E23163EA3DA0049A832 /* Bridge-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Bridge-Info.plist"; path = "support/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 = ""; }; @@ -639,11 +639,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; path = Info.plist; sourceTree = SOURCE_ROOT; }; + 4B3D23BB1337FC5800DD29B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = support/Info.plist; sourceTree = SOURCE_ROOT; }; 4B3D5693139A617D0010A78F /* OFSerializationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSerializationTests.m; path = tests/OFSerializationTests.m; sourceTree = ""; }; 4B40EC1A189FE2650031E19E /* socket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = socket.m; path = src/socket.m; sourceTree = ""; }; 4B45355113DCFE1E0037AB4D /* OFCountedSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFCountedSet.h; path = src/OFCountedSet.h; sourceTree = ""; }; 4B45355213DCFE1E0037AB4D /* OFCountedSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFCountedSet.m; path = src/OFCountedSet.m; sourceTree = ""; }; 4B48B95214DC23B100546D39 /* OFXMLProcessingInstructions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFXMLProcessingInstructions.h; path = src/OFXMLProcessingInstructions.h; sourceTree = ""; }; @@ -906,11 +906,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"; path = module.map; sourceTree = SOURCE_ROOT; }; + 4BEAF52519A8107500B61868 /* module.map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = module.map; path = support/module.map; sourceTree = SOURCE_ROOT; }; 4BF0749512DFAFCA00A4ADD1 /* OFURLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFURLTests.m; path = tests/OFURLTests.m; sourceTree = SOURCE_ROOT; }; 4BF1BCBF11C9663F0025511F /* objfw-defs.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "objfw-defs.h.in"; path = "src/objfw-defs.h.in"; sourceTree = ""; }; 4BF1BCC011C9663F0025511F /* OFHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFHash.h; path = src/OFHash.h; sourceTree = ""; }; 4BF1BCC211C9663F0025511F /* OFMD5Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMD5Hash.h; path = src/OFMD5Hash.h; sourceTree = ""; }; 4BF1BCC311C9663F0025511F /* OFMD5Hash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMD5Hash.m; path = src/OFMD5Hash.m; sourceTree = ""; }; @@ -1142,11 +1142,11 @@ sourceTree = ""; }; 4B187E5F163EA42A0049A832 /* Supporting Files */ = { isa = PBXGroup; children = ( - 4B187E23163EA3DA0049A832 /* Info.plist */, + 4B187E23163EA3DA0049A832 /* Bridge-Info.plist */, 4B187E24163EA3DA0049A832 /* Makefile */, ); name = "Supporting Files"; sourceTree = ""; }; @@ -2222,11 +2222,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 = src/bridge/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/support/Bridge-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = framework; }; name = Debug; }; @@ -2246,11 +2246,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 = src/bridge/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/support/Bridge-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = framework; }; name = Release; }; @@ -2282,11 +2282,11 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/support/Info.plist"; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); @@ -2299,11 +2299,11 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 7; DYLIB_CURRENT_VERSION = 7; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/support/Info.plist"; OTHER_LDFLAGS = ( "-Wl,-reexport-lobjc", "-lobjc", "-lm", ); Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -1087,13 +1087,13 @@ AC_SUBST(TESTS_LIBS) AC_CONFIG_FILES([ buildsys.mk extra.mk - Info.plist utils/objfw-config - src/bridge/Info.plist + support/Info.plist + support/Bridge-Info.plist ]) AC_CONFIG_HEADERS([config.h src/objfw-defs.h]) AC_OUTPUT AS_IF([test x"$old_compiler" = x"yes"], [ DELETED module.map Index: module.map ================================================================== --- module.map +++ module.map @@ -1,5 +0,0 @@ -framework module ObjFW { - umbrella header "ObjFW.h" - - export * -} DELETED src/bridge/Info.plist.in Index: src/bridge/Info.plist.in ================================================================== --- src/bridge/Info.plist.in +++ src/bridge/Info.plist.in @@ -1,22 +0,0 @@ - - - - - CFBundleExecutable - ObjFW-Bridge - CFBundleName - ObjFW-Bridge - CFBundleIdentifier - org.webkeks.objfw-bridge - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - OFBRI - CFBundleVersion - @PACKAGE_VERSION@ - CFBundleShortVersionString - @PACKAGE_VERSION@ - - ADDED support/Bridge-Info.plist.in Index: support/Bridge-Info.plist.in ================================================================== --- support/Bridge-Info.plist.in +++ support/Bridge-Info.plist.in @@ -0,0 +1,22 @@ + + + + + CFBundleExecutable + ObjFW-Bridge + CFBundleName + ObjFW-Bridge + CFBundleIdentifier + org.webkeks.objfw-bridge + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + OFBRI + CFBundleVersion + @PACKAGE_VERSION@ + CFBundleShortVersionString + @PACKAGE_VERSION@ + + ADDED support/Info.plist.in Index: support/Info.plist.in ================================================================== --- support/Info.plist.in +++ support/Info.plist.in @@ -0,0 +1,22 @@ + + + + + CFBundleExecutable + ObjFW + CFBundleName + ObjFW + CFBundleIdentifier + org.webkeks.objfw + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + OBJFW + CFBundleVersion + @PACKAGE_VERSION@ + CFBundleShortVersionString + @PACKAGE_VERSION@ + + ADDED support/module.map Index: support/module.map ================================================================== --- support/module.map +++ support/module.map @@ -0,0 +1,5 @@ +framework module ObjFW { + umbrella header "ObjFW.h" + + export * +}