From f756ff6a6f088de9b0677d59c79a1a94912d759f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Mon, 7 Feb 2011 15:28:32 +0100 Subject: [PATCH 1/5] Strengthen staticframework regex --- link-fmwk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link-fmwk.sh b/link-fmwk.sh index b03103d..edd1106 100755 --- a/link-fmwk.sh +++ b/link-fmwk.sh @@ -176,7 +176,7 @@ pbxproj_files_arr=(`ls -1 *.xcodeproj/project.pbxproj`) for pbxproj_file in ${pbxproj_files_arr[@]} do # Locate framework paths in this project file - pbxproj_frameworks=`cat "$pbxproj_file" | grep "/StaticFrameworks/"` + pbxproj_frameworks=`cat "$pbxproj_file" | grep "/StaticFrameworks\/.*\.staticframework"` # Identify bad links for pbxproj_framework in ${pbxproj_frameworks[@]} From 9ac0727559788057c109f0e310b990034342c16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Wed, 9 Mar 2011 11:03:05 +0100 Subject: [PATCH 2/5] Delete Resources directory if empty --- make-fmwk.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/make-fmwk.sh b/make-fmwk.sh index b5446b1..e4c11b8 100755 --- a/make-fmwk.sh +++ b/make-fmwk.sh @@ -597,6 +597,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..." From eef6f83ae3fef3a3bf82b89d0bcd93f14567ccf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Wed, 9 Mar 2011 14:20:17 +0100 Subject: [PATCH 3/5] Renamed asi_http_request into ASINetworking --- .../1.8/.gitignore | 0 .../1.8/ASINetworking}/.gitignore | 0 .../ASINetworking.xcodeproj}/project.pbxproj | 48 +++++++++---------- .../ASINetworking/ASINetworking_Prefix.pch} | 0 .../1.8/ASINetworking}/publicHeaders.txt | 0 .../1.8/generate.sh | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) rename adapters/{asi_http_request => ASINetworking}/1.8/.gitignore (100%) rename adapters/{asi_http_request/1.8/asi_http_request => ASINetworking/1.8/ASINetworking}/.gitignore (100%) rename adapters/{asi_http_request/1.8/asi_http_request/asi_http_request.xcodeproj => ASINetworking/1.8/ASINetworking/ASINetworking.xcodeproj}/project.pbxproj (95%) rename adapters/{asi_http_request/1.8/asi_http_request/asi_http_request_Prefix.pch => ASINetworking/1.8/ASINetworking/ASINetworking_Prefix.pch} (100%) rename adapters/{asi_http_request/1.8/asi_http_request => ASINetworking/1.8/ASINetworking}/publicHeaders.txt (100%) rename adapters/{asi_http_request => ASINetworking}/1.8/generate.sh (96%) diff --git a/adapters/asi_http_request/1.8/.gitignore b/adapters/ASINetworking/1.8/.gitignore similarity index 100% rename from adapters/asi_http_request/1.8/.gitignore rename to adapters/ASINetworking/1.8/.gitignore diff --git a/adapters/asi_http_request/1.8/asi_http_request/.gitignore b/adapters/ASINetworking/1.8/ASINetworking/.gitignore similarity index 100% rename from adapters/asi_http_request/1.8/asi_http_request/.gitignore rename to adapters/ASINetworking/1.8/ASINetworking/.gitignore diff --git a/adapters/asi_http_request/1.8/asi_http_request/asi_http_request.xcodeproj/project.pbxproj b/adapters/ASINetworking/1.8/ASINetworking/ASINetworking.xcodeproj/project.pbxproj similarity index 95% rename from adapters/asi_http_request/1.8/asi_http_request/asi_http_request.xcodeproj/project.pbxproj rename to adapters/ASINetworking/1.8/ASINetworking/ASINetworking.xcodeproj/project.pbxproj index 2d2adca..5ac47e3 100644 --- a/adapters/asi_http_request/1.8/asi_http_request/asi_http_request.xcodeproj/project.pbxproj +++ b/adapters/ASINetworking/1.8/ASINetworking/ASINetworking.xcodeproj/project.pbxproj @@ -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 */ @@ -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 */ @@ -155,12 +155,12 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - D2AAC07E0554694100DB518D /* libasi_http_request.a */, + D2AAC07E0554694100DB518D /* libASINetworking.a */, ); name = Products; sourceTree = ""; }; - 0867D691FE84028FC02AAC07 /* asi_http_request */ = { + 0867D691FE84028FC02AAC07 /* ASINetworking */ = { isa = PBXGroup; children = ( 6F5DFE7F12B231DD007B70D9 /* Sources */, @@ -168,7 +168,7 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, ); - name = asi_http_request; + name = ASINetworking; sourceTree = ""; }; 0867D69AFE84028FC02AAC07 /* Frameworks */ = { @@ -189,7 +189,7 @@ 32C88DFF0371C24200C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - AA747D9E0F9514B9006C5449 /* asi_http_request_Prefix.pch */, + AA747D9E0F9514B9006C5449 /* ASINetworking_Prefix.pch */, ); name = "Other Sources"; sourceTree = ""; @@ -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 */, @@ -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 */, @@ -338,9 +338,9 @@ ); 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 */ @@ -348,7 +348,7 @@ /* 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; @@ -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 */ @@ -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; }; @@ -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; }; @@ -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 */, @@ -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 */, diff --git a/adapters/asi_http_request/1.8/asi_http_request/asi_http_request_Prefix.pch b/adapters/ASINetworking/1.8/ASINetworking/ASINetworking_Prefix.pch similarity index 100% rename from adapters/asi_http_request/1.8/asi_http_request/asi_http_request_Prefix.pch rename to adapters/ASINetworking/1.8/ASINetworking/ASINetworking_Prefix.pch diff --git a/adapters/asi_http_request/1.8/asi_http_request/publicHeaders.txt b/adapters/ASINetworking/1.8/ASINetworking/publicHeaders.txt similarity index 100% rename from adapters/asi_http_request/1.8/asi_http_request/publicHeaders.txt rename to adapters/ASINetworking/1.8/ASINetworking/publicHeaders.txt diff --git a/adapters/asi_http_request/1.8/generate.sh b/adapters/ASINetworking/1.8/generate.sh similarity index 96% rename from adapters/asi_http_request/1.8/generate.sh rename to adapters/ASINetworking/1.8/generate.sh index 6734d19..d131997 100755 --- a/adapters/asi_http_request/1.8/generate.sh +++ b/adapters/ASINetworking/1.8/generate.sh @@ -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" From 98174655e2264be9a016bfb5b9532cbc5d17553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Wed, 9 Mar 2011 16:39:44 +0100 Subject: [PATCH 4/5] Loosen constraint on product lib name --- make-fmwk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-fmwk.sh b/make-fmwk.sh index e4c11b8..e596178 100755 --- a/make-fmwk.sh +++ b/make-fmwk.sh @@ -467,8 +467,8 @@ 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/"* \ + "$BUILD_DIR/$configuration_name-iphoneos/"* \ -o "$dot_framework_output_dir/$framework_name" # Load the public header file list into an array (remove blank lines if anys) From 21df9ee3dbe9f76c7c30b7e3857a38414ef33232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Wed, 9 Mar 2011 20:58:37 +0100 Subject: [PATCH 5/5] Slightly less loose binary lookup for lipo command. Fixed .gitignore --- adapters/ASINetworking/1.8/ASINetworking/.gitignore | 6 +++--- make-fmwk.sh | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/adapters/ASINetworking/1.8/ASINetworking/.gitignore b/adapters/ASINetworking/1.8/ASINetworking/.gitignore index 2af3cd1..b1ca9a3 100644 --- a/adapters/ASINetworking/1.8/ASINetworking/.gitignore +++ b/adapters/ASINetworking/1.8/ASINetworking/.gitignore @@ -1,5 +1,5 @@ build/ Sources/ -asi_http_request.xcodeproj/*.pbxuser -asi_http_request.xcodeproj/*.perspectivev3 -asi_http_request.xcodeproj/*.mode1v3 +ASINetworking.xcodeproj/*.pbxuser +ASINetworking.xcodeproj/*.perspectivev3 +ASINetworking.xcodeproj/*.mode1v3 diff --git a/make-fmwk.sh b/make-fmwk.sh index e596178..865050a 100755 --- a/make-fmwk.sh +++ b/make-fmwk.sh @@ -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/"* \ - "$BUILD_DIR/$configuration_name-iphoneos/"* \ +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)