Skip to content

Commit

Permalink
Merge branch '0xced-merge'
Browse files Browse the repository at this point in the history
  • Loading branch information
@defagos
defagos committed Mar 9, 2011
2 parents e9f1048 + 21df9ee commit 197c644
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 32 deletions.
0 adapters/asi_http_request/1.8/.gitignore → adapters/ASINetworking/1.8/.gitignore
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions adapters/ASINetworking/1.8/ASINetworking/.gitignore
View file
@@ -0,0 +1,5 @@
build/
Sources/
ASINetworking.xcodeproj/*.pbxuser
ASINetworking.xcodeproj/*.perspectivev3
ASINetworking.xcodeproj/*.mode1v3
48 changes: 24 additions & 24 deletions ...si_http_request.xcodeproj/project.pbxproj → ...g/ASINetworking.xcodeproj/project.pbxproj
View file
Expand Up @@ -65,7 +65,7 @@
6F7FD69D129317340005DD9A /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F7FD69C129317340005DD9A /* libxml2.dylib */; };
6F7FD69F129317340005DD9A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F7FD69E129317340005DD9A /* libz.dylib */; };
6F7FD6A3129317A60005DD9A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F7FD6A2129317A60005DD9A /* UIKit.framework */; };
AA747D9F0F9514B9006C5449 /* asi_http_request_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* asi_http_request_Prefix.pch */; };
AA747D9F0F9514B9006C5449 /* ASINetworking_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* ASINetworking_Prefix.pch */; };
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -128,9 +128,9 @@
6F7FD69C129317340005DD9A /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
6F7FD69E129317340005DD9A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
6F7FD6A2129317A60005DD9A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
AA747D9E0F9514B9006C5449 /* asi_http_request_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asi_http_request_Prefix.pch; sourceTree = SOURCE_ROOT; };
AA747D9E0F9514B9006C5449 /* ASINetworking_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASINetworking_Prefix.pch; sourceTree = SOURCE_ROOT; };
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
D2AAC07E0554694100DB518D /* libasi_http_request.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libasi_http_request.a; sourceTree = BUILT_PRODUCTS_DIR; };
D2AAC07E0554694100DB518D /* libASINetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASINetworking.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -155,20 +155,20 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
D2AAC07E0554694100DB518D /* libasi_http_request.a */,
D2AAC07E0554694100DB518D /* libASINetworking.a */,
);
name = Products;
sourceTree = "<group>";
};
0867D691FE84028FC02AAC07 /* asi_http_request */ = {
0867D691FE84028FC02AAC07 /* ASINetworking */ = {
isa = PBXGroup;
children = (
6F5DFE7F12B231DD007B70D9 /* Sources */,
32C88DFF0371C24200C91783 /* Other Sources */,
0867D69AFE84028FC02AAC07 /* Frameworks */,
034768DFFF38A50411DB9C8B /* Products */,
);
name = asi_http_request;
name = ASINetworking;
sourceTree = "<group>";
};
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
Expand All @@ -189,7 +189,7 @@
32C88DFF0371C24200C91783 /* Other Sources */ = {
isa = PBXGroup;
children = (
AA747D9E0F9514B9006C5449 /* asi_http_request_Prefix.pch */,
AA747D9E0F9514B9006C5449 /* ASINetworking_Prefix.pch */,
);
name = "Other Sources";
sourceTree = "<group>";
Expand Down Expand Up @@ -291,7 +291,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
AA747D9F0F9514B9006C5449 /* asi_http_request_Prefix.pch in Headers */,
AA747D9F0F9514B9006C5449 /* ASINetworking_Prefix.pch in Headers */,
6F5DFEB712B231DD007B70D9 /* ASIAuthenticationDialog.h in Headers */,
6F5DFEB912B231DD007B70D9 /* ASICacheDelegate.h in Headers */,
6F5DFEBA12B231DD007B70D9 /* ASIDataCompressor.h in Headers */,
Expand Down Expand Up @@ -326,9 +326,9 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
D2AAC07D0554694100DB518D /* asi_http_request */ = {
D2AAC07D0554694100DB518D /* ASINetworking */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "asi_http_request" */;
buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "ASINetworking" */;
buildPhases = (
D2AAC07A0554694100DB518D /* Headers */,
D2AAC07B0554694100DB518D /* Sources */,
Expand All @@ -338,17 +338,17 @@
);
dependencies = (
);
name = asi_http_request;
productName = asi_http_request;
productReference = D2AAC07E0554694100DB518D /* libasi_http_request.a */;
name = ASINetworking;
productName = ASINetworking;
productReference = D2AAC07E0554694100DB518D /* libASINetworking.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "asi_http_request" */;
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ASINetworking" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
Expand All @@ -358,12 +358,12 @@
French,
German,
);
mainGroup = 0867D691FE84028FC02AAC07 /* asi_http_request */;
mainGroup = 0867D691FE84028FC02AAC07 /* ASINetworking */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
D2AAC07D0554694100DB518D /* asi_http_request */,
D2AAC07D0554694100DB518D /* ASINetworking */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -408,15 +408,15 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/asi_http_request.dst;
DSTROOT = /tmp/ASINetworking.dst;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = asi_http_request_Prefix.pch;
GCC_PREFIX_HEADER = ASINetworking_Prefix.pch;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = asi_http_request;
PRODUCT_NAME = ASINetworking;
};
name = Debug;
};
Expand All @@ -425,12 +425,12 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
DSTROOT = /tmp/asi_http_request.dst;
DSTROOT = /tmp/ASINetworking.dst;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = asi_http_request_Prefix.pch;
GCC_PREFIX_HEADER = ASINetworking_Prefix.pch;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = asi_http_request;
PRODUCT_NAME = ASINetworking;
};
name = Release;
};
Expand Down Expand Up @@ -466,7 +466,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "asi_http_request" */ = {
1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "ASINetworking" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB921F08733DC00010E9CD /* Debug */,
Expand All @@ -475,7 +475,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "asi_http_request" */ = {
1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ASINetworking" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB922308733DC00010E9CD /* Debug */,
Expand Down
0 ..._http_request/asi_http_request_Prefix.pch → ....8/ASINetworking/ASINetworking_Prefix.pch
View file
File renamed without changes.
0 ...st/1.8/asi_http_request/publicHeaders.txt → ...rking/1.8/ASINetworking/publicHeaders.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion adapters/asi_http_request/1.8/generate.sh → adapters/ASINetworking/1.8/generate.sh
View file
Expand Up @@ -3,7 +3,7 @@
SCRIPT_FILE_DIR=`dirname $0`
SCRIPT_FILE_DIR=`cd $SCRIPT_FILE_DIR; pwd`
CHECKOUT_DIR="$SCRIPT_FILE_DIR/checkout/asi-http-request"
GENERATED_PROJECT_DIR="$SCRIPT_FILE_DIR/asi_http_request"
GENERATED_PROJECT_DIR="$SCRIPT_FILE_DIR/ASINetworking"
GENERATED_SOURCE_DIR="$GENERATED_PROJECT_DIR/Sources"
MAKE_SCRIPT="$SCRIPT_FILE_DIR/../../../make-fmwk.sh"

Expand Down
5 changes: 0 additions & 5 deletions adapters/asi_http_request/1.8/asi_http_request/.gitignore
View file

This file was deleted.

6 changes: 4 additions & 2 deletions make-fmwk.sh
View file
Expand Up @@ -467,8 +467,7 @@ mkdir -p "$headers_output_dir"
# Packing static libraries as universal binaries. For the linker to be able to find the static unversal binaries in the
# framework bundle, the universal binaries must bear the exact same name as the framework
echo "Packing binaries..."
lipo -create "$BUILD_DIR/$configuration_name-iphonesimulator/lib$project_name.a" \
"$BUILD_DIR/$configuration_name-iphoneos/lib$project_name.a" \
lipo -create "$BUILD_DIR/$configuration_name-iphonesimulator/"*.a "$BUILD_DIR/$configuration_name-iphoneos/"*.a \
-o "$dot_framework_output_dir/$framework_name"

# Load the public header file list into an array (remove blank lines if anys)
Expand Down Expand Up @@ -597,6 +596,9 @@ do
fi
done

# Delete Resources directory if empty
rmdir "$resources_output_dir" 2> /dev/null

# Copy only sources if desired (useful for debugging purposes)
if $param_source_files; then
echo "Copying source code..."
Expand Down

0 comments on commit 197c644

Please sign in to comment.