From ab07f23fbc6cf92793742ea89cbe00fed500a9e9 Mon Sep 17 00:00:00 2001 From: Olivier Poitrey Date: Tue, 23 Oct 2012 15:50:53 +0200 Subject: [PATCH] Fix #200 crash on archived builds --- .../SDWebImage Demo.xcodeproj/project.pbxproj | 100 +++--------------- SDWebImage.xcodeproj/project.pbxproj | 5 +- 2 files changed, 15 insertions(+), 90 deletions(-) diff --git a/Examples/SDWebImage Demo.xcodeproj/project.pbxproj b/Examples/SDWebImage Demo.xcodeproj/project.pbxproj index cc6863ca..6b57c233 100644 --- a/Examples/SDWebImage Demo.xcodeproj/project.pbxproj +++ b/Examples/SDWebImage Demo.xcodeproj/project.pbxproj @@ -17,42 +17,11 @@ 537612B0155AB74D005750A4 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 537612AF155AB74D005750A4 /* DetailViewController.m */; }; 537612B3155AB74D005750A4 /* MasterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B1155AB74D005750A4 /* MasterViewController.xib */; }; 537612B6155AB74D005750A4 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 537612B4155AB74D005750A4 /* DetailViewController.xib */; }; - 53A2B4FC155B096D00B12423 /* libSDWebImageARC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53A2B4F9155B095800B12423 /* libSDWebImageARC.a */; }; + 539D3C6D16323DB900DC792F /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 539D3C6C16323DB900DC792F /* SDWebImage.framework */; }; 53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; }; 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 5357A29C157ECDB300894652 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 531041E0157EAFA400BBABC3; - remoteInfo = "SDWebImage ARC+MKAnnotation"; - }; - 53A2B4F6155B095800B12423 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 53922D6F148C55820056699D; - remoteInfo = SDWebImage; - }; - 53A2B4F8155B095800B12423 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 53761325155AD0D5005750A4; - remoteInfo = "SDWebImage ARC"; - }; - 53A2B4FA155B096700B12423 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 53761307155AD0D5005750A4; - remoteInfo = "SDWebImage ARC"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 53761295155AB74D005750A4 /* SDWebImage Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SDWebImage Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 53761299155AB74D005750A4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -69,11 +38,9 @@ 537612AF155AB74D005750A4 /* DetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DetailViewController.m; sourceTree = ""; }; 537612B2155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MasterViewController.xib; sourceTree = ""; }; 537612B5155AB74D005750A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController.xib; sourceTree = ""; }; - 537612CD155AB8F4005750A4 /* libSDWebImage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDWebImage.a; path = "../build/Release-iphoneos/libSDWebImage.a"; sourceTree = ""; }; 537612E3155ABA3C005750A4 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; 537612E6155ABA44005750A4 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; - 53761326155AD28E005750A4 /* libSDWebImage ARC.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libSDWebImage ARC.a"; path = "../build/Release-iphoneos/libSDWebImage ARC.a"; sourceTree = ""; }; - 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDWebImage.xcodeproj; path = ../SDWebImage.xcodeproj; sourceTree = ""; }; + 539D3C6C16323DB900DC792F /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDWebImage.framework; sourceTree = ""; }; 53A2B50B155B155A00B12423 /* placeholder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = placeholder.png; sourceTree = ""; }; 53A2B50C155B155A00B12423 /* placeholder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placeholder@2x.png"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -83,11 +50,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 53A2B4FC155B096D00B12423 /* libSDWebImageARC.a in Frameworks */, 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */, 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */, 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */, 5376129E155AB74D005750A4 /* CoreGraphics.framework in Frameworks */, + 539D3C6D16323DB900DC792F /* SDWebImage.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -97,7 +64,6 @@ 5376128A155AB74D005750A4 = { isa = PBXGroup; children = ( - 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */, 5376129F155AB74D005750A4 /* SDWebImage Demo */, 53761298155AB74D005750A4 /* Frameworks */, 53761296155AB74D005750A4 /* Products */, @@ -115,10 +81,9 @@ 53761298155AB74D005750A4 /* Frameworks */ = { isa = PBXGroup; children = ( + 539D3C6C16323DB900DC792F /* SDWebImage.framework */, 537612E6155ABA44005750A4 /* ImageIO.framework */, 537612E3155ABA3C005750A4 /* MapKit.framework */, - 537612CD155AB8F4005750A4 /* libSDWebImage.a */, - 53761326155AD28E005750A4 /* libSDWebImage ARC.a */, 53761299155AB74D005750A4 /* UIKit.framework */, 5376129B155AB74D005750A4 /* Foundation.framework */, 5376129D155AB74D005750A4 /* CoreGraphics.framework */, @@ -154,16 +119,6 @@ name = "Supporting Files"; sourceTree = ""; }; - 53A2B4EF155B095800B12423 /* Products */ = { - isa = PBXGroup; - children = ( - 53A2B4F7155B095800B12423 /* libSDWebImage.a */, - 53A2B4F9155B095800B12423 /* libSDWebImageARC.a */, - 5357A29D157ECDB300894652 /* libSDWebImageARC+MKAnnotation.a */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -178,7 +133,6 @@ buildRules = ( ); dependencies = ( - 53A2B4FB155B096700B12423 /* PBXTargetDependency */, ); name = "SDWebImage Demo"; productName = "SDWebImage Demo"; @@ -204,12 +158,6 @@ mainGroup = 5376128A155AB74D005750A4; productRefGroup = 53761296155AB74D005750A4 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 53A2B4EF155B095800B12423 /* Products */; - ProjectRef = 53A2B4EE155B095800B12423 /* SDWebImage.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 53761294155AB74D005750A4 /* SDWebImage Demo */, @@ -217,30 +165,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 5357A29D157ECDB300894652 /* libSDWebImageARC+MKAnnotation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libSDWebImageARC+MKAnnotation.a"; - remoteRef = 5357A29C157ECDB300894652 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 53A2B4F7155B095800B12423 /* libSDWebImage.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDWebImage.a; - remoteRef = 53A2B4F6155B095800B12423 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 53A2B4F9155B095800B12423 /* libSDWebImageARC.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSDWebImageARC.a; - remoteRef = 53A2B4F8155B095800B12423 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 53761293155AB74D005750A4 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -269,14 +193,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 53A2B4FB155B096700B12423 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "SDWebImage ARC"; - targetProxy = 53A2B4FA155B096700B12423 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ 537612B1155AB74D005750A4 /* MasterViewController.xib */ = { isa = PBXVariantGroup; @@ -345,6 +261,10 @@ 537612BA155AB74D005750A4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SDWebImage Demo/SDWebImage Demo-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; @@ -363,6 +283,10 @@ 537612BB155AB74D005750A4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SDWebImage Demo/SDWebImage Demo-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ""; diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index 01997313..ec15b02d 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -531,7 +531,7 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = SDWebImage; SKIP_INSTALL = YES; - STRIP_STYLE = "non-global"; + STRIP_STYLE = debugging; }; name = Debug; }; @@ -550,7 +550,7 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = SDWebImage; SKIP_INSTALL = YES; - STRIP_STYLE = "non-global"; + STRIP_STYLE = debugging; }; name = Release; }; @@ -712,6 +712,7 @@ 539F912E16316D2D00160719 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ };