kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-24 04:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updates to simplify integration with Derived Data

Browse Source 
Conflicts:

	RestKit.xcodeproj/project.pbxproj
This commit is contained in:
Blake Watters
2011-03-18 07:52:47 -04:00
parent d6f0a1f3cc
commit cb0f30c470
5 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
View File

@@ -438,6 +438,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = iphoneos;
SYMROOT = Build;
};
name = Debug;
};
@@ -453,6 +454,7 @@
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PREBINDING = NO;
SDKROOT = iphoneos;
SYMROOT = Build;
};
name = Release;
};

28
README.md
View File

@@ -97,19 +97,17 @@ To add RestKit to your project (you're using git, right?):
Xcode 4.x (Git Submodule)
-------------------------
Xcode 4 has introduced significant changes to the build process that make building and linking against a static library more complicated than under Xcode 3. In
particular, Xcode now favors the use of an external "Derived Data" directory rather than individual per-project build paths. This causes pain with RestKit because
it is difficult to know exactly what path the static libraries and headers will wind up being built to ahead of time. These install instructions are designed to
work if you are using an external DerivedData directory or using the per-target build settings (see "File" menu > "Project Settings" in Xcode).
XCode 4 has introduced significant changes to the build process and how cross-project references work. RestKit has been updated to take advantage of
the flexibility offered in Xcode 4. This has introduced a forked world between how projects are configured. You need to determine if you are going to
utilize the "Derived Data" Build Location support introduced in Xcode 4. To do so, open the Project/Workspace setting via the "File" menu > "Project Settings"
in Xcode.
**NOTE** - These install instructions assume you have checked out the submodule to the root directory of your project. Paths that read "$(SOURCE_ROOT)/RestKit" reflect this assumption. If you have changed the checkout path, be sure to update the paths appropriately or your will have header include and/or linking errors. The paths to pay attention to are:
* If your "Build Location" is set to "Place build products in derived data location", read the instructions below.
* If you "Build Location" is set to "Place build products in locations specified by targets", follow the Xcode 3.x instructions above.
* Header Search Path: `"$(SOURCE_ROOT)/RestKit/Build"`
* Library Search Path: `"$(SOURCE_ROOT)/RestKit/Build/$(BUILD_STYLE)-$(PLATFORM_NAME)"`
*Derived Data is the recommended & preferred installation method for Xcode 4 projects!*
For example, if you checked the submodule out to the 'Libraries' subdirectory of your project, your Header Search Path would be `"$(SOURCE_ROOT)/Libraries/RestKit/Build"` and your Library Search Path would be `"$(SOURCE_ROOT)/Libraries/RestKit/Build/$(BUILD_STYLE)-$(PLATFORM_NAME)"`
To add RestKit to your project:
To add RestKit to a Derived Data project:
1. Add the submodule: `git submodule add git://github.com/twotoasters/RestKit.git RestKit`
1. Open the project you wish to add RestKit to in Xcode.
@@ -118,8 +116,6 @@ To add RestKit to your project:
1. Drag the RestKit.xcodeproj file from the RestKit project window and drop it on your "<Your Project's Name>".xcodeproj. A dialog will appear -- make sure "Copy items" is unchecked and "Reference Type" is "Relative to Project" before clicking "Add".
1. Click on your project's name in the sidebar on the left to open the project settings view in the right pane of the window.
1. In the middle pain you will see **PROJECT** and **TARGETS** headers for your project. Click on your project name, then select **Build Settings** along the top to open the Build Settings editor for your entire project.
1. Find the **Header Search Paths** entry and double click it. Use the **+** button to add a new path. Enter the following path, including the quotes: `"$(SOURCE_ROOT)/RestKit/Build"`. Dismiss the editor with the **Done** button.
1. Find the **Library Search Paths** entry and double click it. Use the **+** button to add a new path. Enter the following path, including the quotes: `"$(SOURCE_ROOT)/RestKit/Build/$(BUILD_STYLE)-$(PLATFORM_NAME)"`. Dismiss the editor with the **Done** button.
1. Find the **Other Linker Flags** entry and double click it. Use the **+** button to add a new entry and enter `-ObjC -all_load`. Dismiss the editor with the **Done** button.
1. Locate the target you wish to add RestKit to in the **TARGETS** list in the middle of the editor pane. Select it to open the target settings editor in the right pane of the window.
1. Click the **Build Phases** tab along the top of the window to open the Build Phases editor.
@@ -146,6 +142,14 @@ You now only need to add includes for the RestKit libraries at the appropriate p
Please see the Examples/ directory for details on utilizing the library.
Upgrading to Xcode 4.x Derived Data Installation
--------------------------------------------------
If you are upgrading an existing RestKit project to Xcode 4 derived data builds, you need to remove the RestKit header search path
from your project/targets. Failure to do so will result in redefinition errors from the header imports during build time.
Be sure to completely clear your build directory when performing an update as Xcode is easily confused.
Contributing
-------------------------

105
RestKit.xcodeproj/project.pbxproj
View File

@@ -13,7 +13,7 @@
buildPhases = (
25956979126DF0E3004BAC4C /* Copy Headers */,
25956980126DF159004BAC4C /* Protect Copied Headers */,
250D1769130B648100539F86 /* ShellScript */,
250F87BE13337518002F4590 /* Copy Headers to Legacy Location */,
);
dependencies = (
2595695A126DF0B4004BAC4C /* PBXTargetDependency */,
@@ -203,6 +203,13 @@
remoteGlobalIDString = C7D4F29310BDA39C00B00019;
remoteInfo = Specs;
};
250F87761333725C002F4590 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 2523360411E79F090048F9B4;
remoteInfo = RestKitThree20;
};
25956959126DF0B4004BAC4C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -259,27 +266,6 @@
remoteGlobalIDString = C76EB5D20F74586B00EF8398;
remoteInfo = UISpec;
};
259D5553132856A400897272 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 259D5548132856A400897272 /* UISpec.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C7D4F29310BDA39C00B00019;
remoteInfo = Specs;
};
259D5555132856B700897272 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 259D5548132856A400897272 /* UISpec.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = C76EB5D10F74586B00EF8398;
remoteInfo = UISpec;
};
3F4BC8F212DE4C7F00048E71 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 2523360411E79F090048F9B4;
remoteInfo = RestKitThree20;
};
73FE56A8126CB83400E0F30B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -293,7 +279,7 @@
25956979126DF0E3004BAC4C /* Copy Headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = $BUILD_ROOT/RestKit;
dstPath = "$(CONFIGURATION_BUILD_DIR)/include/RestKit";
dstSubfolderSpec = 0;
files = (
257FF0C2126F441700424BC0 /* RestKit.h in Copy Headers */,
@@ -1325,7 +1311,6 @@
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = Specs.app;
remoteRef = 259D5553132856A400897272 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -1341,18 +1326,19 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
250D1769130B648100539F86 /* ShellScript */ = {
250F87BE13337518002F4590 /* Copy Headers to Legacy Location */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Headers to Legacy Location";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "IFS=$'\\n'\n\nif [ ${BUILD_ROOT} != ${SRCROOT}/Build ]; then\n rm -rf ${SRCROOT}/Build/RestKit\n cp -R ${BUILD_ROOT}/RestKit ${SRCROOT}/Build\n\n cd ${SRCROOT}/Build/RestKit\n find * -name '*.h' | xargs chmod a-w\nfi\n\nexit 0";
shellPath = "/bin/sh Scripts/CopyHeadersToLegacyBuildDir.command";
shellScript = "";
};
25956980126DF159004BAC4C /* Protect Copied Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -1540,12 +1526,11 @@
259D5556132856B700897272 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = UISpec;
targetProxy = 259D5555132856B700897272 /* PBXContainerItemProxy */;
};
3F4BC8F312DE4C7F00048E71 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 2523360411E79F090048F9B4 /* RestKitThree20 */;
targetProxy = 3F4BC8F212DE4C7F00048E71 /* PBXContainerItemProxy */;
targetProxy = 250F87761333725C002F4590 /* PBXContainerItemProxy */;
};
73FE56A9126CB83400E0F30B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
@@ -1569,7 +1554,7 @@
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SYMROOT = "$(SOURCE_ROOT)/Build";
SYMROOT = Build;
};
name = Debug;
};
@@ -1586,7 +1571,7 @@
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
SDKROOT = iphoneos;
SYMROOT = "$(SOURCE_ROOT)/Build";
SYMROOT = Build;
};
name = Release;
};
@@ -1599,7 +1584,6 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
@@ -1614,8 +1598,10 @@
AppKit,
);
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Three20/Private;
PRODUCT_NAME = RestKitThree20;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Three20;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Three20;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "";
};
name = Debug;
@@ -1629,7 +1615,6 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
../three20/Build/Products/three20,
@@ -1643,8 +1628,10 @@
AppKit,
);
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Three20/Private;
PRODUCT_NAME = RestKitThree20;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Three20;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Three20;
SKIP_INSTALL = YES;
ZERO_LINK = NO;
};
name = Release;
@@ -1659,8 +1646,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Network/Private;
PRODUCT_NAME = RestKitNetwork;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Network;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Network;
SKIP_INSTALL = YES;
};
name = Debug;
};
@@ -1674,8 +1663,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Network/Private;
PRODUCT_NAME = RestKitNetwork;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Network;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Network;
SKIP_INSTALL = YES;
ZERO_LINK = NO;
};
name = Release;
@@ -1690,8 +1681,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/ObjectMapping/Private;
PRODUCT_NAME = RestKitObjectMapping;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/ObjectMapping;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/ObjectMapping;
SKIP_INSTALL = YES;
};
name = Debug;
};
@@ -1705,8 +1698,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/ObjectMapping/Private;
PRODUCT_NAME = RestKitObjectMapping;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/ObjectMapping;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/ObjectMapping;
SKIP_INSTALL = YES;
ZERO_LINK = NO;
};
name = Release;
@@ -1721,8 +1716,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Support/Private;
PRODUCT_NAME = RestKitSupport;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Support;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Support;
SKIP_INSTALL = YES;
};
name = Debug;
};
@@ -1736,8 +1733,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Support/Private;
PRODUCT_NAME = RestKitSupport;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Support;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Support;
SKIP_INSTALL = YES;
ZERO_LINK = NO;
};
name = Release;
@@ -1751,8 +1750,10 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/CoreData/Private;
PRODUCT_NAME = RestKitCoreData;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/CoreData;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/CoreData;
SKIP_INSTALL = YES;
};
name = Debug;
};
@@ -1765,8 +1766,10 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/CoreData/Private;
PRODUCT_NAME = RestKitCoreData;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/CoreData;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/CoreData;
SKIP_INSTALL = YES;
ZERO_LINK = NO;
};
name = Release;
@@ -1788,8 +1791,10 @@
"-ObjC",
);
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = ../include/RestKit/Support/JSON/YAJL/Private;
PRODUCT_NAME = RestKitJSONParserYAJL;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Support/JSON/YAJL;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Support/JSON/YAJL;
SKIP_INSTALL = YES;
YAJL_GENERAL_OTHER_CFLAGS = "-Wdiv-by-zero -Wbad-function-cast -Wnested-externs -Wold-style-definition";
};
name = Debug;
@@ -1811,8 +1816,10 @@
"-ObjC",
);
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = ../include/RestKit/Support/JSON/YAJL/Private;
PRODUCT_NAME = RestKitJSONParserYAJL;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Support/JSON/YAJL;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Support/JSON/YAJL;
SKIP_INSTALL = YES;
YAJL_GENERAL_OTHER_CFLAGS = "-Wdiv-by-zero -Wbad-function-cast -Wnested-externs -Wold-style-definition";
ZERO_LINK = NO;
};
@@ -1828,8 +1835,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Support/JSON/SBJSON/Private;
PRODUCT_NAME = RestKitJSONParserSBJSON;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Support/JSON/SBJSON;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Support/JSON/SBJSON;
SKIP_INSTALL = YES;
};
name = Debug;
};
@@ -1843,8 +1852,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
PRIVATE_HEADERS_FOLDER_PATH = include/RestKit/Support/JSON/SBJSON/Private;
PRODUCT_NAME = RestKitJSONParserSBJSON;
PUBLIC_HEADERS_FOLDER_PATH = ../RestKit/Support/JSON/SBJSON;
PUBLIC_HEADERS_FOLDER_PATH = include/RestKit/Support/JSON/SBJSON;
SKIP_INSTALL = YES;
ZERO_LINK = NO;
};
name = Release;

11
Scripts/CopyHeadersToLegacyBuildDir.command Normal file
View File

@@ -0,0 +1,11 @@
# This script copies the headers from the configuration
# build directory to their legacy location at Build/RestKit
# under the project root. This is the include path for Xcode
# 3 projects and Xcode 4 projects not using derived data
IFS=$'\n'
if [ -d "${CONFIGURATION_BUILD_DIR}/include/RestKit" ]; then
rsync -av --delete "${CONFIGURATION_BUILD_DIR}/include/RestKit" "${SOURCE_ROOT}/Build"
else
echo "Configuration include path does not exist, likely perform a Build & Archive operation..."
fi

8
Scripts/Protect.command
View File

@@ -4,8 +4,12 @@
# Ignore whitespace characters in paths
IFS=$'\n'
cd ${CONFIGURATION_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
if [ -d "${CONFIGURATION_BUILD_DIR}/include/RestKit" ]; then
cd ${CONFIGURATION_BUILD_DIR}/include/RestKit
find * -name '*.h' | xargs chmod a-w
find * -name '*.h' | xargs chmod a-w
else
echo "Configuration include path does not exist, likely perform a Build & Archive operation..."
fi
exit 0