Overview
Comment: | Xcode project: Separate configure target for iOS |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
a730c8752f67b0025a364fa75c7a4858 |
User & Date: | js on 2017-06-11 12:50:54 |
Other Links: | manifest | tags |
Context
2017-06-11
| ||
12:59 | bridge: Fix include path for when installed check-in: 2d48270ce7 user: js tags: trunk | |
12:50 | Xcode project: Separate configure target for iOS check-in: a730c8752f user: js tags: trunk | |
11:12 | runtime/arc.m: Call -[copy] on block check-in: 1070063543 user: js tags: trunk | |
Changes
Modified ObjFW.xcodeproj/project.pbxproj from [1e282b3918] to [d187573a43].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ 4B5D8DDD1099E1B0000896FF /* autoreconf */ = { isa = PBXAggregateTarget; buildConfigurationList = 4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autoreconf" */; buildPhases = ( 4B5D8DE11099E1BF000896FF /* ShellScript */, ); dependencies = ( ); name = autoreconf; productName = autoreconf; }; | > > > > > > > > > > > > | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ 4B596D8D1EED62A500A6D140 /* configure (iOS) */ = { isa = PBXAggregateTarget; buildConfigurationList = 4B596D911EED62A500A6D140 /* Build configuration list for PBXAggregateTarget "configure (iOS)" */; buildPhases = ( 4B596D901EED62A500A6D140 /* Run Script */, ); dependencies = ( 4B596D8E1EED62A500A6D140 /* PBXTargetDependency */, ); name = "configure (iOS)"; productName = configure; }; 4B5D8DDD1099E1B0000896FF /* autoreconf */ = { isa = PBXAggregateTarget; buildConfigurationList = 4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autoreconf" */; buildPhases = ( 4B5D8DE11099E1BF000896FF /* ShellScript */, ); dependencies = ( ); name = autoreconf; productName = autoreconf; }; 4BDF37AD1338047700F9A81A /* configure (Mac) */ = { isa = PBXAggregateTarget; buildConfigurationList = 4BDF37AE1338047700F9A81A /* Build configuration list for PBXAggregateTarget "configure (Mac)" */; buildPhases = ( 4BDF37B11338047D00F9A81A /* Run Script */, ); dependencies = ( 4BDF37B31338049600F9A81A /* PBXTargetDependency */, ); name = "configure (Mac)"; productName = configure; }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ 4B0256E4172B60400062B5F1 /* OFStdIOStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B0256E2172B60400062B5F1 /* OFStdIOStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B0256E5172B60400062B5F1 /* OFStdIOStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0256E3172B60400062B5F1 /* OFStdIOStream.m */; }; |
︙ | ︙ | |||
1012 1013 1014 1015 1016 1017 1018 | 4B23CA90133811BA0047A1D9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 4B3D23751337FBC800DD29B8; remoteInfo = ObjFW; }; | | > > > > > > > | | | 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 | 4B23CA90133811BA0047A1D9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 4B3D23751337FBC800DD29B8; remoteInfo = ObjFW; }; 4B596D8F1EED62A500A6D140 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 4B5D8DDD1099E1B0000896FF; remoteInfo = autoreconf; }; 4B596D941EED62B300A6D140 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 4B596D8D1EED62A500A6D140; remoteInfo = "configure (iOS)"; }; 4B7E83E91DA2B78100BA5689 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 4B3D23751337FBC800DD29B8; remoteInfo = "ObjFW (Mac)"; |
︙ | ︙ | |||
2917 2918 2919 2920 2921 2922 2923 | 4B2C21D51DA292BE00735907 /* Frameworks */, 4B2C21D61DA292BE00735907 /* Headers */, 4B2C22AB1DA292BE00735907 /* CopyFiles */, ); buildRules = ( ); dependencies = ( | | | 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 | 4B2C21D51DA292BE00735907 /* Frameworks */, 4B2C21D61DA292BE00735907 /* Headers */, 4B2C22AB1DA292BE00735907 /* CopyFiles */, ); buildRules = ( ); dependencies = ( 4B596D951EED62B300A6D140 /* PBXTargetDependency */, ); name = "ObjFW (iOS)"; productName = ObjFW; productReference = 4B2C22B01DA292BE00735907 /* ObjFW.framework */; productType = "com.apple.product-type.framework"; }; 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */ = { |
︙ | ︙ | |||
3048 3049 3050 3051 3052 3053 3054 | 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */, 4B2C211B1DA292BE00735907 /* ObjFW (iOS) */, 4B187E0D163EA29F0049A832 /* ObjFW_Bridge (Mac) */, 4B0E296A1DA2A8A400323A76 /* ObjFW_Bridge (iOS) */, 4B23CA89133811610047A1D9 /* TestPlugin (Mac) */, 4B5D706A1DA2F87A00B3B2D7 /* TestPlugin (iOS) */, 4B5D8DDD1099E1B0000896FF /* autoreconf */, | | > | 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 | 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */, 4B2C211B1DA292BE00735907 /* ObjFW (iOS) */, 4B187E0D163EA29F0049A832 /* ObjFW_Bridge (Mac) */, 4B0E296A1DA2A8A400323A76 /* ObjFW_Bridge (iOS) */, 4B23CA89133811610047A1D9 /* TestPlugin (Mac) */, 4B5D706A1DA2F87A00B3B2D7 /* TestPlugin (iOS) */, 4B5D8DDD1099E1B0000896FF /* autoreconf */, 4BDF37AD1338047700F9A81A /* configure (Mac) */, 4B596D8D1EED62A500A6D140 /* configure (iOS) */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ 4B0E29871DA2A8A400323A76 /* Resources */ = { isa = PBXResourcesBuildPhase; |
︙ | ︙ | |||
3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 | 4BD9CA2B1DA2C9C300E5AD52 /* testfile.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ 4B5D8DE11099E1BF000896FF /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); | > > > > > > > > > > > > > > | 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 | 4BD9CA2B1DA2C9C300E5AD52 /* testfile.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ 4B596D901EED62A500A6D140 /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "if [ \"configure\" -nt \"buildsys.mk\" -o \"buildsys.mk.in\" -nt \"buildsys.mk\" ]; then\n ./configure --host=arm-apple-darwin OBJC=\"xcrun clang -arch arm64\" || exit 1\nfi"; }; 4B5D8DE11099E1BF000896FF /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); |
︙ | ︙ | |||
3108 3109 3110 3111 3112 3113 3114 | inputPaths = ( ); name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; | | | 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 | inputPaths = ( ); name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "if [ \"configure\" -nt \"buildsys.mk\" -o \"buildsys.mk.in\" -nt \"buildsys.mk\" ]; then\n ./configure || exit 1\nfi"; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ 4B0E296B1DA2A8A400323A76 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; |
︙ | ︙ | |||
3667 3668 3669 3670 3671 3672 3673 | targetProxy = 4B23CA8E133811B20047A1D9 /* PBXContainerItemProxy */; }; 4B23CA91133811BA0047A1D9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */; targetProxy = 4B23CA90133811BA0047A1D9 /* PBXContainerItemProxy */; }; | | > > > > > | | | | 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 | targetProxy = 4B23CA8E133811B20047A1D9 /* PBXContainerItemProxy */; }; 4B23CA91133811BA0047A1D9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */; targetProxy = 4B23CA90133811BA0047A1D9 /* PBXContainerItemProxy */; }; 4B596D8E1EED62A500A6D140 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B5D8DDD1099E1B0000896FF /* autoreconf */; targetProxy = 4B596D8F1EED62A500A6D140 /* PBXContainerItemProxy */; }; 4B596D951EED62B300A6D140 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B596D8D1EED62A500A6D140 /* configure (iOS) */; targetProxy = 4B596D941EED62B300A6D140 /* PBXContainerItemProxy */; }; 4B7E83EA1DA2B78100BA5689 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B3D23751337FBC800DD29B8 /* ObjFW (Mac) */; targetProxy = 4B7E83E91DA2B78100BA5689 /* PBXContainerItemProxy */; }; 4B7E83EC1DA2B78900BA5689 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B2C211B1DA292BE00735907 /* ObjFW (iOS) */; targetProxy = 4B7E83EB1DA2B78900BA5689 /* PBXContainerItemProxy */; }; 4B8BA41C133805A700E65070 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4BDF37AD1338047700F9A81A /* configure (Mac) */; targetProxy = 4B8BA41B133805A700E65070 /* PBXContainerItemProxy */; }; 4BA2FD2F1DA2FA8B0089E945 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4B2C211B1DA292BE00735907 /* ObjFW (iOS) */; targetProxy = 4BA2FD2E1DA2FA8B0089E945 /* PBXContainerItemProxy */; }; |
︙ | ︙ | |||
4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 | ); PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw; PRODUCT_NAME = ObjFW; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; name = Release; }; 4B5D70731DA2F87A00B3B2D7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; ENABLE_BITCODE = NO; | > > > > > > > > > > > > > > > > | 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 | ); PRODUCT_BUNDLE_IDENTIFIER = zone.heap.objfw; PRODUCT_NAME = ObjFW; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; name = Release; }; 4B596D921EED62A500A6D140 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; }; name = Debug; }; 4B596D931EED62A500A6D140 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; }; name = Release; }; 4B5D70731DA2F87A00B3B2D7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; ENABLE_BITCODE = NO; |
︙ | ︙ | |||
4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 | isa = XCConfigurationList; buildConfigurations = ( 4B3D23871337FBC800DD29B8 /* Debug */, 4B3D23881337FBC800DD29B8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 4B5D70721DA2F87A00B3B2D7 /* Build configuration list for PBXNativeTarget "TestPlugin (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( 4B5D70731DA2F87A00B3B2D7 /* Debug */, 4B5D70741DA2F87A00B3B2D7 /* Release */, ); | > > > > > > > > > | 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 | isa = XCConfigurationList; buildConfigurations = ( 4B3D23871337FBC800DD29B8 /* Debug */, 4B3D23881337FBC800DD29B8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 4B596D911EED62A500A6D140 /* Build configuration list for PBXAggregateTarget "configure (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( 4B596D921EED62A500A6D140 /* Debug */, 4B596D931EED62A500A6D140 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 4B5D70721DA2F87A00B3B2D7 /* Build configuration list for PBXNativeTarget "TestPlugin (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( 4B5D70731DA2F87A00B3B2D7 /* Debug */, 4B5D70741DA2F87A00B3B2D7 /* Release */, ); |
︙ | ︙ | |||
4286 4287 4288 4289 4290 4291 4292 | buildConfigurations = ( 4B76F4891DA2C2BB00CFF831 /* Debug */, 4B76F48A1DA2C2BB00CFF831 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; | | | 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 | buildConfigurations = ( 4B76F4891DA2C2BB00CFF831 /* Debug */, 4B76F48A1DA2C2BB00CFF831 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 4BDF37AE1338047700F9A81A /* Build configuration list for PBXAggregateTarget "configure (Mac)" */ = { isa = XCConfigurationList; buildConfigurations = ( 4BDF37AF1338047700F9A81A /* Debug */, 4BDF37B01338047700F9A81A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; |
︙ | ︙ |
Modified src/platform.h from [8c9d997773] to [fb66e8de0c].
︙ | ︙ | |||
69 70 71 72 73 74 75 | # define OF_SPARC #endif #if defined(__APPLE__) # include <TargetConditionals.h> # if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE # define OF_IOS | < < < < | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | # define OF_SPARC #endif #if defined(__APPLE__) # include <TargetConditionals.h> # if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE # define OF_IOS # else # define OF_MACOS # endif #elif defined(__linux__) # define OF_LINUX #elif defined(_WIN32) # define OF_WINDOWS |
︙ | ︙ |