From 405b712ac9fbfe4d4289e2b4c2f6e73ca5edebfb Mon Sep 17 00:00:00 2001 From: Andrey Yastrebov Date: Thu, 12 Sep 2013 16:13:48 +0400 Subject: [PATCH] Made a static lib target instead of framework --- .gitattributes | 1 + .gitignore | 44 +-- Demo/RevealDemo.xcodeproj/project.pbxproj | 83 ++++-- .../project.pbxproj | 254 ++++++++---------- 4 files changed, 195 insertions(+), 187 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fdbd29f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.pbxproj -crlf -diff -merge diff --git a/.gitignore b/.gitignore index 089be05..27ca547 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,32 @@ -# Mac OS X Finder and whatnot -.DS_Store -*.swp -*~.nib +# Mac OS X +*.DS_Store -# XCode (and ancestors) per-user config (very noisy, and not relevant) -*.mode1 +# Xcode +*.pbxuser *.mode1v3 *.mode2v3 -*.perspective *.perspectivev3 -*.pbxuser +*.xcuserstate +project.xcworkspace/ +xcuserdata/ -# XCode 4 -xcuserdata +# Generated files +*.o +*.pyc -# build products +#Python modules +MANIFEST +dist/ build/ -# Other source repository archive directories (protects when importing) -.hg -.svn -CVS - -# temporary script folders/files -ThirdParty/boost/* +# Backup files +*~.nib +\#*# +.#* -# Eclipse Workspace -.metadata +# AppCode +.idea/ -# Maya temporary -.mayaSwatches/ +# MailCore +*.tmp +*.list.tmp \ No newline at end of file diff --git a/Demo/RevealDemo.xcodeproj/project.pbxproj b/Demo/RevealDemo.xcodeproj/project.pbxproj index 408f2a0..0a12f95 100644 --- a/Demo/RevealDemo.xcodeproj/project.pbxproj +++ b/Demo/RevealDemo.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - F91C4B2B178EF45300F0C49C /* PKRevealController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F91C4B2A178EF45300F0C49C /* PKRevealController.framework */; }; + BCF0593517E1E676001A4C7C /* libPKRevealControllerStaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF0590717E1E472001A4C7C /* libPKRevealControllerStaticLib.a */; }; F94A4E70178B26B8003D323B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F94A4E6F178B26B8003D323B /* InfoPlist.strings */; }; F94A4E7D178B3B04003D323B /* reveal_menu_icon_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = F94A4E79178B3B04003D323B /* reveal_menu_icon_landscape.png */; }; F94A4E7E178B3B04003D323B /* reveal_menu_icon_landscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F94A4E7A178B3B04003D323B /* reveal_menu_icon_landscape@2x.png */; }; @@ -31,8 +31,25 @@ F9C0CD8B177DC90A00CAAB3E /* RightDemoViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C0CD84177DC90A00CAAB3E /* RightDemoViewController~iphone.xib */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + BCF0590617E1E472001A4C7C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BCF0590117E1E471001A4C7C /* PKRevealController.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F9838092177C967700BC5290; + remoteInfo = PKRevealController; + }; + BCF0593217E1E662001A4C7C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BCF0590117E1E471001A4C7C /* PKRevealController.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BCF058DD17E1E354001A4C7C; + remoteInfo = PKRevealController; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ - F91C4B2A178EF45300F0C49C /* PKRevealController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PKRevealController.framework; path = "../../../../../Library/Developer/Xcode/DerivedData/PKRevealControllerWorkspace-eaegnsbsoyautzfgjkwuiihomozi/Build/Products/Debug-iphoneos/PKRevealController.framework"; sourceTree = ""; }; + BCF0590117E1E471001A4C7C /* PKRevealController.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PKRevealController.xcodeproj; path = ../PKRevealController/PKRevealController.xcodeproj; sourceTree = ""; }; F94A4E6F178B26B8003D323B /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = ""; }; F94A4E79178B3B04003D323B /* reveal_menu_icon_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = reveal_menu_icon_landscape.png; sourceTree = ""; }; F94A4E7A178B3B04003D323B /* reveal_menu_icon_landscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "reveal_menu_icon_landscape@2x.png"; sourceTree = ""; }; @@ -68,7 +85,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F91C4B2B178EF45300F0C49C /* PKRevealController.framework in Frameworks */, + BCF0593517E1E676001A4C7C /* libPKRevealControllerStaticLib.a in Frameworks */, F9C0CD7A177DC18500CAAB3E /* QuartzCore.framework in Frameworks */, F98380BD177CA5C100BC5290 /* UIKit.framework in Frameworks */, F98380BF177CA5C100BC5290 /* Foundation.framework in Frameworks */, @@ -79,10 +96,18 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + BCF0590217E1E471001A4C7C /* Products */ = { + isa = PBXGroup; + children = ( + BCF0590717E1E472001A4C7C /* libPKRevealControllerStaticLib.a */, + ); + name = Products; + sourceTree = ""; + }; F98380B0177CA5C100BC5290 = { isa = PBXGroup; children = ( - F91C4B2A178EF45300F0C49C /* PKRevealController.framework */, + BCF0590117E1E471001A4C7C /* PKRevealController.xcodeproj */, F98380C2177CA5C100BC5290 /* RevealDemo */, F98380BB177CA5C100BC5290 /* Frameworks */, F98380BA177CA5C100BC5290 /* Products */, @@ -160,6 +185,7 @@ buildRules = ( ); dependencies = ( + BCF0593317E1E662001A4C7C /* PBXTargetDependency */, ); name = RevealDemo; productName = RevealDemo; @@ -185,6 +211,12 @@ mainGroup = F98380B0177CA5C100BC5290; productRefGroup = F98380BA177CA5C100BC5290 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = BCF0590217E1E471001A4C7C /* Products */; + ProjectRef = BCF0590117E1E471001A4C7C /* PKRevealController.xcodeproj */; + }, + ); projectRoot = ""; targets = ( F98380B8177CA5C100BC5290 /* RevealDemo */, @@ -192,6 +224,17 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + BCF0590717E1E472001A4C7C /* libPKRevealControllerStaticLib.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + name = libPKRevealControllerStaticLib.a; + path = libPKRevealController.a; + remoteRef = BCF0590617E1E472001A4C7C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ F98380B7177CA5C100BC5290 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -229,6 +272,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + BCF0593317E1E662001A4C7C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = PKRevealController; + targetProxy = BCF0593217E1E662001A4C7C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ F98380D4177CA5C100BC5290 /* Debug */ = { isa = XCBuildConfiguration; @@ -292,15 +343,15 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SYSTEM_APPS_DIR)/Spark Inspector.app/Contents/Resources/Frameworks\"", - "\"$(SRCROOT)/../../../../../Library/Developer/Xcode/DerivedData/PKRevealControllerWorkspace-eaegnsbsoyautzfgjkwuiihomozi/Build/Products/Debug-iphoneos\"", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RevealDemo/RevealDemo-Prefix.pch"; + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; INFOPLIST_FILE = "RevealDemo/RevealDemo-Info.plist"; - OTHER_LDFLAGS = "-ObjC"; + OTHER_LDFLAGS = ( + "-ObjC", + "-all_load", + ); PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -310,15 +361,15 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SYSTEM_APPS_DIR)/Spark Inspector.app/Contents/Resources/Frameworks\"", - "\"$(SRCROOT)/../../../../../Library/Developer/Xcode/DerivedData/PKRevealControllerWorkspace-eaegnsbsoyautzfgjkwuiihomozi/Build/Products/Debug-iphoneos\"", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RevealDemo/RevealDemo-Prefix.pch"; + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; INFOPLIST_FILE = "RevealDemo/RevealDemo-Info.plist"; - OTHER_LDFLAGS = "-ObjC"; + OTHER_LDFLAGS = ( + "-ObjC", + "-all_load", + ); PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; diff --git a/PKRevealController/PKRevealController.xcodeproj/project.pbxproj b/PKRevealController/PKRevealController.xcodeproj/project.pbxproj index 2da637f..c0ee5e4 100644 --- a/PKRevealController/PKRevealController.xcodeproj/project.pbxproj +++ b/PKRevealController/PKRevealController.xcodeproj/project.pbxproj @@ -7,33 +7,57 @@ objects = { /* Begin PBXBuildFile section */ - F903802017846F9E001A8B34 /* PKAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = F903801E17846F9E001A8B34 /* PKAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F9038022178470A9001A8B34 /* PKAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = F903801F17846F9E001A8B34 /* PKAnimation.m */; }; - F92AA8391780927100740679 /* CALayer+ConvenienceAnimations.h in Headers */ = {isa = PBXBuildFile; fileRef = F92AA8371780927100740679 /* CALayer+ConvenienceAnimations.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F92AA83A1780927100740679 /* CALayer+ConvenienceAnimations.m in Sources */ = {isa = PBXBuildFile; fileRef = F92AA8381780927100740679 /* CALayer+ConvenienceAnimations.m */; }; - F92AA83D17809D3E00740679 /* NSObject+Blocks.h in Headers */ = {isa = PBXBuildFile; fileRef = F92AA83B17809D3E00740679 /* NSObject+Blocks.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F92AA83E17809D3E00740679 /* NSObject+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = F92AA83C17809D3E00740679 /* NSObject+Blocks.m */; }; - F94A4E6E178B26B1003D323B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F94A4E6D178B26B1003D323B /* InfoPlist.strings */; }; - F94A4E73178B351B003D323B /* CAAnimation+Identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = F94A4E71178B351B003D323B /* CAAnimation+Identifier.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F94A4E74178B351B003D323B /* CAAnimation+Identifier.m in Sources */ = {isa = PBXBuildFile; fileRef = F94A4E72178B351B003D323B /* CAAnimation+Identifier.m */; }; - F951AE271782E177003631A6 /* PKSequentialAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = F951AE251782E177003631A6 /* PKSequentialAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F951AE281782E177003631A6 /* PKSequentialAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = F951AE261782E177003631A6 /* PKSequentialAnimation.m */; }; - F9838096177C967700BC5290 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9838095177C967700BC5290 /* Foundation.framework */; }; - F98380A0177C967700BC5290 /* PKRevealController.m in Sources */ = {isa = PBXBuildFile; fileRef = F983809F177C967700BC5290 /* PKRevealController.m */; }; - F98380A7177C96A500BC5290 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F98380A6177C96A500BC5290 /* QuartzCore.framework */; }; - F98380A9177C96B400BC5290 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F98380A8177C96B400BC5290 /* UIKit.framework */; }; - F98380AD177C973900BC5290 /* UIViewController+PKRevealController.h in Headers */ = {isa = PBXBuildFile; fileRef = F98380AB177C973900BC5290 /* UIViewController+PKRevealController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F98380AE177C973900BC5290 /* UIViewController+PKRevealController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98380AC177C973900BC5290 /* UIViewController+PKRevealController.m */; }; - F98380AF177C9E8900BC5290 /* PKRevealController.h in Headers */ = {isa = PBXBuildFile; fileRef = F983809E177C967700BC5290 /* PKRevealController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F9B95F58178857C40052D84A /* PKLog.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B95F56178857C40052D84A /* PKLog.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F9B95F59178857C40052D84A /* PKLog.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B95F57178857C40052D84A /* PKLog.m */; }; - F9B95F5D178885AC0052D84A /* PKRevealControllerView.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B95F5B178885AC0052D84A /* PKRevealControllerView.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F9B95F5E178885AC0052D84A /* PKRevealControllerView.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B95F5C178885AC0052D84A /* PKRevealControllerView.m */; }; - F9D4C991177F44750084AE74 /* PKLayerAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = F9D4C98F177F44750084AE74 /* PKLayerAnimator.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F9D4C992177F44750084AE74 /* PKLayerAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D4C990177F44750084AE74 /* PKLayerAnimator.m */; }; + BCF058DF17E1E354001A4C7C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9838095177C967700BC5290 /* Foundation.framework */; }; + BCF058EA17E1E3CC001A4C7C /* PKRevealController.m in Sources */ = {isa = PBXBuildFile; fileRef = F983809F177C967700BC5290 /* PKRevealController.m */; }; + BCF058EB17E1E3CC001A4C7C /* PKRevealControllerView.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B95F5C178885AC0052D84A /* PKRevealControllerView.m */; }; + BCF058EC17E1E3CC001A4C7C /* PKLog.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B95F57178857C40052D84A /* PKLog.m */; }; + BCF058ED17E1E3CC001A4C7C /* PKLayerAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D4C990177F44750084AE74 /* PKLayerAnimator.m */; }; + BCF058EE17E1E3CC001A4C7C /* PKAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = F903801F17846F9E001A8B34 /* PKAnimation.m */; }; + BCF058EF17E1E3CC001A4C7C /* PKSequentialAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = F951AE261782E177003631A6 /* PKSequentialAnimation.m */; }; + BCF058F017E1E3CC001A4C7C /* UIViewController+PKRevealController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98380AC177C973900BC5290 /* UIViewController+PKRevealController.m */; }; + BCF058F117E1E3CC001A4C7C /* NSObject+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = F92AA83C17809D3E00740679 /* NSObject+Blocks.m */; }; + BCF058F217E1E3CC001A4C7C /* CALayer+ConvenienceAnimations.m in Sources */ = {isa = PBXBuildFile; fileRef = F92AA8381780927100740679 /* CALayer+ConvenienceAnimations.m */; }; + BCF058F317E1E3CC001A4C7C /* CAAnimation+Identifier.m in Sources */ = {isa = PBXBuildFile; fileRef = F94A4E72178B351B003D323B /* CAAnimation+Identifier.m */; }; + BCF058F417E1E3D8001A4C7C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F98380A6177C96A500BC5290 /* QuartzCore.framework */; }; + BCF058F517E1E3DD001A4C7C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F98380A8177C96B400BC5290 /* UIKit.framework */; }; + BCF058F617E1E410001A4C7C /* PKRevealController.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F983809E177C967700BC5290 /* PKRevealController.h */; }; + BCF058F717E1E410001A4C7C /* PKRevealControllerView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9B95F5B178885AC0052D84A /* PKRevealControllerView.h */; }; + BCF058F817E1E410001A4C7C /* PKLog.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9B95F56178857C40052D84A /* PKLog.h */; }; + BCF058F917E1E410001A4C7C /* PKLayerAnimator.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9D4C98F177F44750084AE74 /* PKLayerAnimator.h */; }; + BCF058FA17E1E410001A4C7C /* PKAnimating.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9B95F5F178A08E00052D84A /* PKAnimating.h */; }; + BCF058FB17E1E410001A4C7C /* PKAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F903801E17846F9E001A8B34 /* PKAnimation.h */; }; + BCF058FC17E1E410001A4C7C /* PKSequentialAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F951AE251782E177003631A6 /* PKSequentialAnimation.h */; }; + BCF058FD17E1E410001A4C7C /* UIViewController+PKRevealController.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F98380AB177C973900BC5290 /* UIViewController+PKRevealController.h */; }; + BCF058FE17E1E410001A4C7C /* NSObject+Blocks.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F92AA83B17809D3E00740679 /* NSObject+Blocks.h */; }; + BCF058FF17E1E410001A4C7C /* CALayer+ConvenienceAnimations.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F92AA8371780927100740679 /* CALayer+ConvenienceAnimations.h */; }; + BCF0590017E1E410001A4C7C /* CAAnimation+Identifier.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F94A4E71178B351B003D323B /* CAAnimation+Identifier.h */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + BCF058DC17E1E354001A4C7C /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/${PRODUCT_NAME}"; + dstSubfolderSpec = 16; + files = ( + BCF058F617E1E410001A4C7C /* PKRevealController.h in CopyFiles */, + BCF058F717E1E410001A4C7C /* PKRevealControllerView.h in CopyFiles */, + BCF058F817E1E410001A4C7C /* PKLog.h in CopyFiles */, + BCF058F917E1E410001A4C7C /* PKLayerAnimator.h in CopyFiles */, + BCF058FA17E1E410001A4C7C /* PKAnimating.h in CopyFiles */, + BCF058FB17E1E410001A4C7C /* PKAnimation.h in CopyFiles */, + BCF058FC17E1E410001A4C7C /* PKSequentialAnimation.h in CopyFiles */, + BCF058FD17E1E410001A4C7C /* UIViewController+PKRevealController.h in CopyFiles */, + BCF058FE17E1E410001A4C7C /* NSObject+Blocks.h in CopyFiles */, + BCF058FF17E1E410001A4C7C /* CALayer+ConvenienceAnimations.h in CopyFiles */, + BCF0590017E1E410001A4C7C /* CAAnimation+Identifier.h in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ + BCF058DE17E1E354001A4C7C /* libPKRevealController.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPKRevealController.a; sourceTree = BUILT_PRODUCTS_DIR; }; F903801E17846F9E001A8B34 /* PKAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PKAnimation.h; sourceTree = ""; }; F903801F17846F9E001A8B34 /* PKAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PKAnimation.m; sourceTree = ""; }; F92AA8371780927100740679 /* CALayer+ConvenienceAnimations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+ConvenienceAnimations.h"; sourceTree = ""; }; @@ -45,7 +69,6 @@ F94A4E72178B351B003D323B /* CAAnimation+Identifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CAAnimation+Identifier.m"; sourceTree = ""; }; F951AE251782E177003631A6 /* PKSequentialAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PKSequentialAnimation.h; sourceTree = ""; }; F951AE261782E177003631A6 /* PKSequentialAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PKSequentialAnimation.m; sourceTree = ""; }; - F9838092177C967700BC5290 /* PKRevealController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework.static; includeInIndex = 0; path = PKRevealController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F9838095177C967700BC5290 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; F9838099177C967700BC5290 /* PKRevealController-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PKRevealController-Info.plist"; sourceTree = ""; }; F983809D177C967700BC5290 /* PKRevealController-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PKRevealController-Prefix.pch"; sourceTree = ""; }; @@ -65,13 +88,13 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - F983808D177C967700BC5290 /* Frameworks */ = { + BCF058DB17E1E354001A4C7C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F98380A9177C96B400BC5290 /* UIKit.framework in Frameworks */, - F98380A7177C96A500BC5290 /* QuartzCore.framework in Frameworks */, - F9838096177C967700BC5290 /* Foundation.framework in Frameworks */, + BCF058F517E1E3DD001A4C7C /* UIKit.framework in Frameworks */, + BCF058F417E1E3D8001A4C7C /* QuartzCore.framework in Frameworks */, + BCF058DF17E1E354001A4C7C /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,7 +113,7 @@ F9838093177C967700BC5290 /* Products */ = { isa = PBXGroup; children = ( - F9838092177C967700BC5290 /* PKRevealController.framework */, + BCF058DE17E1E354001A4C7C /* libPKRevealController.a */, ); name = Products; sourceTree = ""; @@ -189,45 +212,23 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - F983808E177C967700BC5290 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - F98380AD177C973900BC5290 /* UIViewController+PKRevealController.h in Headers */, - F98380AF177C9E8900BC5290 /* PKRevealController.h in Headers */, - F9B95F5D178885AC0052D84A /* PKRevealControllerView.h in Headers */, - F9B95F58178857C40052D84A /* PKLog.h in Headers */, - F9D4C991177F44750084AE74 /* PKLayerAnimator.h in Headers */, - F903802017846F9E001A8B34 /* PKAnimation.h in Headers */, - F951AE271782E177003631A6 /* PKSequentialAnimation.h in Headers */, - F94A4E73178B351B003D323B /* CAAnimation+Identifier.h in Headers */, - F92AA8391780927100740679 /* CALayer+ConvenienceAnimations.h in Headers */, - F92AA83D17809D3E00740679 /* NSObject+Blocks.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ - F9838091177C967700BC5290 /* PKRevealController */ = { + BCF058DD17E1E354001A4C7C /* PKRevealController */ = { isa = PBXNativeTarget; - buildConfigurationList = F98380A3177C967700BC5290 /* Build configuration list for PBXNativeTarget "PKRevealController" */; + buildConfigurationList = BCF058E917E1E354001A4C7C /* Build configuration list for PBXNativeTarget "PKRevealController" */; buildPhases = ( - F983808C177C967700BC5290 /* Sources */, - F983808D177C967700BC5290 /* Frameworks */, - F983808E177C967700BC5290 /* Headers */, - F983808F177C967700BC5290 /* Resources */, - F9838090177C967700BC5290 /* ShellScript */, + BCF058DA17E1E354001A4C7C /* Sources */, + BCF058DB17E1E354001A4C7C /* Frameworks */, + BCF058DC17E1E354001A4C7C /* CopyFiles */, ); buildRules = ( ); dependencies = ( ); name = PKRevealController; - productName = PKRevealController; - productReference = F9838092177C967700BC5290 /* PKRevealController.framework */; - productType = "com.apple.product-type.framework.static"; + productName = PKRevealControllerStaticLib; + productReference = BCF058DE17E1E354001A4C7C /* libPKRevealController.a */; + productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -250,59 +251,58 @@ projectDirPath = ""; projectRoot = ""; targets = ( - F9838091177C967700BC5290 /* PKRevealController */, + BCF058DD17E1E354001A4C7C /* PKRevealController */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - F983808F177C967700BC5290 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - F94A4E6E178B26B1003D323B /* InfoPlist.strings in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - F9838090177C967700BC5290 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /usr/bin/python; - shellScript = "# TAG: BUILD SCRIPT (do not remove this comment)\n# Build script generated using https://github.com/kstenerud/iOS-Universal-Framework Mk 8 (beta 2012-06-16)\nimport logging\n\n\n##############################################################################\n#\n# Configuration\n#\n##############################################################################\n\n# Select which kind of framework to build.\n#\n# Note: Due to issues with Xcode's build process, if you select\n# 'embeddedframework', it will still show the regular framework\n# (as a symlink) along side of the embedded framework. Be sure to\n# instruct your users to copy/move the embedded framework in this case!\n#\n# If your framework contains resources such as images, nibs, momds, plists,\n# zipfiles and such, choose 'embeddedframework'.\n#\n# If your framework contains no resources, choose 'framework'.\n#\nconfig_framework_type = 'framework'\n#config_framework_type = 'embeddedframework'\n\n# Open the build directory in Finder when the universal framework is\n# successfully built.\n#\n# This value can be overridden by setting the UFW_OPEN_BUILD_DIR env variable\n# to True or False.\n#\n# Recommended setting: True\n#\nconfig_open_build_dir = True\n\n# If true, ensures that all public headers are stored in the framework under\n# the same directory hierarchy as they were in the source tree.\n#\n# Xcode by default places all headers at the same top level, but every other\n# build tool in the known universe preserves directory structure. For simple\n# libraries it doesn't really matter much, but for ports of existing software\n# packages or for bigger libraries, it makes sense to have more structure.\n#\n# The default is set to \"False\" since that's what most Xcode users are used to.\n#\n# Recommended setting: True for deep hierarchy projects, False otherwise.\n#\nconfig_deep_header_hierarchy = False\n\n# Specify where the top of the public header hierarchy is. This path is\n# relative to the project's dir (PROJECT_DIR). You can reference environment\n# variables using templating syntax (e.g. \"${TARGET_NAME}/Some/Subdir\")\n#\n# NOTE: Only used if config_deep_header_hierarchy is True.\n#\n# If this is set to None, the script will attempt to figure out for itself\n# where the top of the header hierarchy is by looking for common path prefixes\n# in the public header files. This process can fail if:\n# - You only have one public header file.\n# - Your source header files don't all have a common root.\n#\n# A common approach is to use \"${TARGET_NAME}\", working under the assumption\n# that all of your header files share the common root of a directory under\n# your project with the same name as your target (which is the Xcode default).\n#\n# Recommended setting: \"${TARGET_NAME}\"\n#\nconfig_deep_header_top = \"${TARGET_NAME}\"\n\n# Warn when \"DerivedData\" is detected in any of the header, library, or\n# framework search paths. In almost all cases, references to directories under\n# DerivedData are added as a result of an Xcode bug and must be manually\n# removed.\n#\n# Recommended setting: True\n#\nconfig_warn_derived_data = True\n\n# Warn if no headers were marked public in this framework.\n#\n# Recommended setting: True\n#\nconfig_warn_no_public_headers = True\n\n# Cause the build to fail if any warnings are issued.\n#\n# Recommended setting: True\n#\nconfig_fail_on_warnings = True\n\n# Minimum log level\n#\n# Recommended setting: logging.INFO\n#\nconfig_log_level = logging.INFO\n\n\n##############################################################################\n#\n# Don't touch anything below here unless you know what you're doing.\n#\n##############################################################################\n\nimport collections\nimport json\nimport os\nimport re\nimport shlex\nimport shutil\nimport string\nimport subprocess\nimport sys\nimport time\nimport traceback\n\n\n##############################################################################\n#\n# Globals\n#\n##############################################################################\n\nlog = logging.getLogger('UFW')\n\nissued_warnings = False\n\n\n##############################################################################\n#\n# Classes\n#\n##############################################################################\n\n# Allows the slave build to communicate with the master build.\n#\nclass BuildState:\n\n def __init__(self):\n self.reload()\n\n def reset(self):\n self.slave_platform = None\n self.slave_architectures = []\n self.slave_linked_archive_paths = []\n self.slave_built_fw_path = None\n self.slave_built_embedded_fw_path = None\n\n def set_slave_properties(self, architectures,\n linked_archive_paths,\n built_fw_path,\n built_embedded_fw_path):\n self.slave_platform = os.environ['PLATFORM_NAME']\n self.slave_architectures = architectures\n self.slave_linked_archive_paths = linked_archive_paths\n self.slave_built_fw_path = built_fw_path\n self.slave_built_embedded_fw_path = built_embedded_fw_path\n\n def get_save_path(self):\n return os.path.join(os.environ['PROJECT_TEMP_DIR'], \"ufw_build_state.json\")\n\n def persist(self):\n filename = self.get_save_path()\n parent = os.path.dirname(filename)\n if not os.path.isdir(parent):\n os.makedirs(parent)\n with open(filename, \"w\") as f:\n f.write(json.dumps(self.__dict__))\n\n def reload(self):\n self.reset()\n filename = self.get_save_path()\n if os.path.exists(filename):\n with open(filename, \"r\") as f:\n new_dict = json.loads(f.read())\n if new_dict is not None:\n self.__dict__ = dict(self.__dict__.items() + new_dict.items())\n\n\n# Holds information about the current project and build environment.\n#\nclass Project:\n\n def __init__(self, filename):\n sourcecode_types = ['sourcecode.c.c',\n 'sourcecode.c.objc',\n 'sourcecode.cpp.cpp',\n 'sourcecode.cpp.objcpp',\n 'sourcecode.asm.asm',\n 'sourcecode.asm.llvm',\n 'sourcecode.nasm']\n\n self.build_state = BuildState()\n self.project_data = self.load_from_file(filename)\n self.target = filter(lambda x: x['name'] == os.environ['TARGET_NAME'], self.project_data['targets'])[0]\n self.public_headers = self.get_build_phase_files('PBXHeadersBuildPhase', lambda x: x.get('settings', False) and x['settings'].get('ATTRIBUTES', False) and 'Public' in x['settings']['ATTRIBUTES'])\n self.static_libraries = self.get_build_phase_files('PBXFrameworksBuildPhase', lambda x: x['fileRef']['fileType'] == 'archive.ar' and x['fileRef']['sourceTree'] not in ['DEVELOPER_DIR', 'SDKROOT'])\n self.static_frameworks = self.get_build_phase_files('PBXFrameworksBuildPhase', lambda x: x['fileRef']['fileType'] == 'wrapper.framework' and x['fileRef']['sourceTree'] not in ['DEVELOPER_DIR', 'SDKROOT'])\n self.compilable_sources = self.get_build_phase_files('PBXSourcesBuildPhase', lambda x: x['fileRef']['fileType'] in sourcecode_types)\n self.header_paths = [os.path.join(*x['pathComponents']) for x in self.public_headers]\n\n self.headers_dir = os.path.join(os.environ['TARGET_BUILD_DIR'], os.environ['CONTENTS_FOLDER_PATH'], 'Headers')\n self.libtool_path = os.path.join(os.environ['DT_TOOLCHAIN_DIR'], 'usr', 'bin', 'libtool')\n self.project_filename = os.path.join(os.environ['PROJECT_FILE_PATH'], \"project.pbxproj\")\n self.local_exe_path = os.path.join(os.environ['TARGET_BUILD_DIR'], os.environ['EXECUTABLE_PATH'])\n self.local_architectures = os.environ['ARCHS'].split(' ')\n self.local_built_fw_path = os.path.join(os.environ['TARGET_BUILD_DIR'], os.environ['WRAPPER_NAME'])\n self.local_built_embedded_fw_path = os.path.splitext(self.local_built_fw_path)[0] + \".embeddedframework\"\n self.local_linked_archive_paths = [self.get_linked_ufw_archive_path(arch) for arch in self.local_architectures]\n self.local_platform = os.environ['PLATFORM_NAME']\n other_platforms = os.environ['SUPPORTED_PLATFORMS'].split(' ')\n other_platforms.remove(self.local_platform)\n self.other_platform = other_platforms[0]\n\n sdk_name = os.environ['SDK_NAME']\n if not sdk_name.startswith(self.local_platform):\n raise Exception(\"%s didn't start with %s\" % (sdk_name, self.local_platform))\n self.sdk_version = sdk_name[len(self.local_platform):]\n\n # Load an Xcode project file.\n #\n def load_from_file(self, filename):\n project_file = json.loads(subprocess.check_output([\"plutil\", \"-convert\", \"json\", \"-o\", \"-\", filename]))\n all_objects = project_file['objects']\n del project_file['objects']\n for obj in all_objects.values():\n self.fix_keys(obj)\n self.unpack_objects(self.build_dereference_list(all_objects, None, None, project_file))\n self.unpack_objects(self.build_dereference_list(all_objects, None, None, all_objects.values()))\n project_data = project_file['rootObject']\n self.build_full_paths(project_data, splitpath(os.environ['SOURCE_ROOT']))\n return project_data\n\n def is_key(self, obj): \n return isinstance(obj, basestring) and len(obj) == 24 and re.search('^[0-9a-fA-F]+$', obj) is not None\n \n def build_dereference_list(self, all_objects, parent, key, obj):\n deref_list = []\n if self.is_key(obj):\n dereferenced = all_objects.get(obj, obj)\n if dereferenced is not obj:\n deref_list.append((parent, key, obj, dereferenced))\n elif isinstance(obj, collections.Mapping):\n for k, v in obj.iteritems():\n deref_list += self.build_dereference_list(all_objects, obj, k, v)\n elif isinstance(obj, collections.Iterable) and not isinstance(obj, basestring):\n for item in obj:\n deref_list += self.build_dereference_list(all_objects, obj, None, item)\n return deref_list\n \n def unpack_objects(self, deref_list):\n for parent, key, orig, obj in deref_list:\n if key is None:\n parent.remove(orig)\n parent.append(obj)\n else:\n parent[key] = obj\n\n # Store the full path, separated into components, to a node inside the node\n # as \"pathComponents\". Also recurse into that node if it's a group.\n #\n def build_full_paths(self, node, base_path):\n # Some nodes are relative to a different source tree, specified as an\n # env variable.\n if node.get('sourceTree', '') != '':\n new_base_path = os.environ.get(node['sourceTree'], None)\n if new_base_path:\n base_path = splitpath(new_base_path)\n # Add the current node's path, if any.\n if node.get('path', False):\n base_path = base_path + splitpath(node['path'])\n node['pathComponents'] = base_path\n # Recurse if this is a group.\n if node['isa'] == 'PBXGroup':\n for child in node['children']:\n self.build_full_paths(child, base_path)\n elif node['isa'] == 'PBXProject':\n self.build_full_paths(node['mainGroup'], base_path)\n self.build_full_paths(node['productRefGroup'], base_path)\n for child in node['targets']:\n self.build_full_paths(child, base_path)\n projectRefs = node.get('projectReferences', None)\n if projectRefs is not None:\n for child in projectRefs[0].values():\n self.build_full_paths(child, base_path)\n\n # Fix up any inconvenient keys.\n #\n def fix_keys(self, obj):\n key_remappings = {'lastKnownFileType': 'fileType', 'explicitFileType': 'fileType'}\n for key in list(set(key_remappings.keys()) & set(obj.keys())):\n obj[key_remappings[key]] = obj[key]\n del obj[key]\n\n # Get the files from a build phase.\n #\n def get_build_phase_files(self, build_phase_name, filter_func):\n build_phase = filter(lambda x: x['isa'] == build_phase_name, self.target['buildPhases'])[0]\n build_files = filter(filter_func, build_phase['files'])\n return [x['fileRef'] for x in build_files]\n\n # Get the truncated paths of all headers that start with the specified\n # relative path. Paths are read and returned as fully separated lists.\n # e.g. ['Some', 'Path', 'To', 'A', 'Header'] with relative_path of\n # ['Some', 'Path'] gets truncated to ['To', 'A', 'Header']\n #\n def movable_headers_relative_to(self, relative_path):\n rel_path_length = len(relative_path)\n result = filter(lambda path: len(path) >= rel_path_length and\n path[:rel_path_length] == relative_path, self.header_paths)\n return [path[rel_path_length:] for path in result]\n\n # Get the full path to where a linkable archive (library or framework)\n # is supposed to be.\n #\n def get_linked_archive_path(self, architecture):\n return os.path.join(os.environ['OBJECT_FILE_DIR_%s' % os.environ['CURRENT_VARIANT']],\n architecture,\n os.environ['EXECUTABLE_NAME'])\n\n # Get the full path to our custom linked archive of the project.\n #\n def get_linked_ufw_archive_path(self, architecture):\n return self.get_linked_archive_path(architecture) + \".ufwbuild\"\n\n # Get the full path to the executable of an archive.\n #\n def get_exe_path(self, node):\n path = os.path.join(*node['pathComponents'])\n if node['fileType'] == 'wrapper.framework':\n # Frameworks are directories, so go one deeper\n path = os.path.join(path, os.path.splitext(node['pathComponents'][-1])[0])\n return path\n\n # Get the path to the directory containing the archive.\n #\n def get_containing_path(self, node):\n return os.path.join(*node['pathComponents'])\n \n def get_archive_search_paths(self):\n log.info(\"Search paths = %s\" % set([self.get_containing_path(fw) for fw in self.static_frameworks] + [self.get_containing_path(fw) for fw in self.static_libraries]))\n return set([self.get_containing_path(fw) for fw in self.static_frameworks] + [self.get_containing_path(fw) for fw in self.static_libraries])\n\n # Command to link all objects of a single architecture.\n #\n def get_single_arch_link_command(self, architecture):\n cmd = [self.libtool_path,\n \"-static\",\n \"-arch_only\", architecture,\n \"-syslibroot\", os.environ['SDKROOT'],\n \"-L%s\" % os.environ['TARGET_BUILD_DIR'],\n \"-filelist\", os.environ['LINK_FILE_LIST_%s_%s' % (os.environ['CURRENT_VARIANT'], architecture)]]\n if os.environ.get('OTHER_LDFLAGS', False):\n cmd += [os.environ['OTHER_LDFLAGS']]\n if os.environ.get('WARNING_LDFLAGS', False):\n cmd += [os.environ['WARNING_LDFLAGS']]\n# cmd += [\"-L%s\" % libpath for libpath in self.get_archive_search_paths()]\n cmd += [self.get_exe_path(fw) for fw in self.static_frameworks]\n cmd += [self.get_exe_path(lib) for lib in self.static_libraries]\n cmd += [\"-o\", self.get_linked_ufw_archive_path(architecture)]\n return cmd\n\n # Command to link all local architectures for the current configuration\n # into an archive. This reads all libraries + the UFW-built archives and\n # overwrites the final product.\n #\n def get_local_archs_link_command(self):\n cmd = [self.libtool_path,\n \"-static\"]\n cmd += self.local_linked_archive_paths\n cmd += [self.get_exe_path(fw) for fw in self.static_frameworks]\n cmd += [self.get_exe_path(lib) for lib in self.static_libraries]\n cmd += [\"-o\", os.path.join(os.environ['TARGET_BUILD_DIR'], os.environ['EXECUTABLE_PATH'])]\n return cmd\n\n # Command to link all architectures into a universal archive.\n # This reads all UFW-built archives and overwrites the final product.\n #\n def get_all_archs_link_command(self):\n cmd = [self.libtool_path,\n \"-static\"]\n cmd += self.local_linked_archive_paths + self.build_state.slave_linked_archive_paths\n cmd += [\"-o\", os.path.join(os.environ['TARGET_BUILD_DIR'], os.environ['EXECUTABLE_PATH'])]\n return cmd\n\n # Build up an environment for the slave process. This uses BUILD_ROOT\n # and TEMP_ROOT to convert all environment variables to values suitable\n # for the slave build environment so that xcodebuild doesn't try to build\n # in the project directory under \"build\".\n #\n def get_slave_environment(self):\n ignored = ['LD_MAP_FILE_PATH',\n 'HEADER_SEARCH_PATHS',\n 'LIBRARY_SEARCH_PATHS',\n 'FRAMEWORK_SEARCH_PATHS']\n build_root = os.environ['BUILD_ROOT']\n temp_root = os.environ['TEMP_ROOT']\n newenv = {}\n for key, value in os.environ.items():\n if key not in ignored and not key.startswith('LINK_FILE_LIST_'):\n if build_root in value or temp_root in value:\n newenv[key] = value.replace(self.local_platform, self.other_platform)\n return newenv\n\n # Command to invoke xcodebuild on the slave platform.\n #\n def get_slave_project_build_command(self):\n cmd = [\"xcodebuild\",\n \"-project\",\n os.environ['PROJECT_FILE_PATH'],\n \"-target\",\n os.environ['TARGET_NAME'],\n \"-configuration\",\n os.environ['CONFIGURATION'],\n \"-sdk\",\n self.other_platform + self.sdk_version]\n cmd += [\"%s=%s\" % (key, value) for key, value in self.get_slave_environment().items()]\n cmd += [\"UFW_MASTER_PLATFORM=\" + os.environ['PLATFORM_NAME']]\n cmd += [os.environ['ACTION']]\n return cmd\n\n\n\n##############################################################################\n#\n# Utility Functions\n#\n##############################################################################\n\n# Split a path into a list of path components.\n#\ndef splitpath(path, maxdepth=20):\n (head, tail) = os.path.split(path)\n return splitpath(head, maxdepth - 1) + [tail] if maxdepth and head and head != path else [ head or tail ]\n\n# Remove all subdirectories under a path.\n#\ndef remove_subdirs(path, ignore_files):\n if os.path.exists(path):\n for filename in filter(lambda x: x not in ignore_files, os.listdir(path)):\n fullpath = os.path.join(path, filename)\n if os.path.isdir(fullpath):\n log.info(\"Remove %s\" % fullpath)\n shutil.rmtree(fullpath)\n\n# Make whatever parent paths are necessary for a path to exist.\n#\ndef ensure_path_exists(path):\n if not os.path.isdir(path):\n os.makedirs(path)\n\n# Make whatever parent paths are necessary for a path's parent to exist.\n#\ndef ensure_parent_exists(path):\n parent = os.path.dirname(path)\n if not os.path.isdir(parent):\n os.makedirs(parent)\n\n# Remove a file or dir if it exists.\n#\ndef remove_path(path):\n if os.path.exists(path):\n if os.path.isdir(path):\n shutil.rmtree(path)\n else:\n os.remove(path)\n\n# Move a file or dir, replacing the destination if it exists.\n#\ndef move_file(src, dst):\n if src == dst or not os.path.isfile(src):\n return\n log.info(\"Move %s to %s\" % (src, dst))\n ensure_parent_exists(dst)\n remove_path(dst)\n shutil.move(src, dst)\n\n# Copy a file or dir, replacing the destination if it exists already.\n#\ndef copy_overwrite(src, dst):\n if src != dst:\n remove_path(dst)\n ensure_parent_exists(dst)\n shutil.copytree(src, dst, symlinks=True)\n\n# Attempt to symlink link_path -> link_to.\n# link_to must be a path relative to link_path's parent and must exist.\n# If link_path already exists, do nothing.\n#\ndef attempt_symlink(link_path, link_to):\n # Only allow linking to an existing file\n os.stat(os.path.abspath(os.path.join(link_path, \"..\", link_to)))\n\n # Only make the link if it hasn't already been made\n if not os.path.exists(link_path):\n log.info(\"Symlink %s -> %s\" % (link_path, link_to))\n os.symlink(link_to, link_path)\n\n# Takes the last entry in an array-based path and returns a normal path\n# relative to base_path.\n#\ndef top_level_file_path(base_path, path_list):\n return os.path.join(base_path, os.path.split(path_list[-1])[-1])\n\n# Takes all entries in an array-based path and returns a normal path\n# relative to base_path.\n#\ndef full_file_path(base_path, path_list):\n return os.path.join(*([base_path] + path_list))\n\n# Print a command before executing it.\n# Also print out all output from the command to STDOUT.\n#\ndef print_and_call(cmd):\n log.info(\"Cmd \" + \" \".join(cmd))\n p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)\n result = p.communicate()[0]\n if len(result) > 0:\n log.info(result)\n if p.returncode != 0:\n raise subprocess.CalledProcessError(p.returncode, cmd)\n\n# Special print-and-call command for the slave build that strips out\n# xcodebuild's spammy list of environment variables.\n#\ndef print_and_call_slave_build(cmd, other_platform):\n separator = '=== BUILD NATIVE TARGET '\n p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)\n result = p.communicate()[0].split(separator)\n if len(result) == 1:\n result = result[0]\n else:\n result = separator + result[1]\n log.info(\"Cmd \" + \" \".join(cmd) + \"\\n\" + result)\n if p.returncode != 0:\n raise subprocess.CalledProcessError(p.returncode, cmd)\n\n# Issue a warning and record that a warning has been issued.\n#\ndef issue_warning(msg, *args, **kwargs):\n global issued_warnings\n issued_warnings = True\n log.warn(msg, *args, **kwargs)\n\n\n\n##############################################################################\n#\n# Main Application\n#\n##############################################################################\n\n# Check if we are running as master.\n#\ndef is_master():\n return os.environ.get('UFW_MASTER_PLATFORM', os.environ['PLATFORM_NAME']) == os.environ['PLATFORM_NAME']\n\n# DerivedData should almost never appear in any framework, library, or header\n# search paths. However, Xcode will sometimes add them in, so we check to make\n# sure.\n#\ndef check_for_derived_data_in_search_paths(project):\n search_path_keys = [\"FRAMEWORK_SEARCH_PATHS\", \"LIBRARY_SEARCH_PATHS\", \"HEADER_SEARCH_PATHS\"]\n build_configs = project.target['buildConfigurationList']['buildConfigurations']\n build_settings = filter(lambda x: x['name'] == os.environ['CONFIGURATION'], build_configs)[0]['buildSettings']\n \n found_something = False\n for path_key in filter(lambda x: x in build_settings, search_path_keys):\n path = build_settings[path_key]\n if \"DerivedData\" in path:\n found_something = True\n log.warn(\"Derived data in %s\" % path)\n issue_warning(\"'%s' contains reference to 'DerivedData'.\" % path_key)\n if found_something:\n log.warn(\"Check your build settings and remove any entries that contain paths inside the DerivedData folder.\")\n log.warn(\"Otherwise you can disable this warning by changing 'config_warn_derived_data' in this script.\")\n\n# Link local architectures into their respective archives.\n#\ndef link_local_archs(project):\n for arch in project.local_architectures:\n print_and_call(project.get_single_arch_link_command(arch))\n\n# Link only the local architectures into the final product, not the slave\n# architectures. For iphoneos, this will be armv6, armv7. For simulator, this\n# will be i386.\n#\ndef link_combine_local_archs(project):\n print_and_call(project.get_local_archs_link_command())\n\n# Link all architectures into the final product.\n#\ndef link_combine_all_archs(project):\n print_and_call(project.get_all_archs_link_command())\n\n# Check if we should open the build directory after a successful build.\n#\ndef should_open_build_dir():\n env_setting = os.environ.get('UFW_OPEN_BUILD_DIR', None)\n if env_setting is not None:\n return env_setting\n\n return config_open_build_dir\n\n# Open the build dir in Finder.\n#\ndef open_build_dir():\n print_and_call(['open', os.environ['TARGET_BUILD_DIR']])\n\n# Check if the build was started by selecting \"Archive\" under \"Product\" in\n# Xcode.\n#\ndef is_archive_build():\n # ACTION is always 'build', but perhaps Apple will fix this someday?\n archive_build = os.environ['ACTION'] == 'archive'\n\n if not archive_build:\n # This can be passed in as an env variable when building from command line.\n archive_build = os.environ.get('UFW_ACTION', None) == 'archive'\n\n build_dir = splitpath(os.environ['BUILD_DIR'])\n if not archive_build:\n # This partial path is used when you select \"archive\" from within Xcode.\n archive_build = 'ArchiveIntermediates' in build_dir\n\n # It only counts as a full archive build if this target is being built into\n # its own build dir (not being built as a dependency of another target)\n if archive_build:\n archive_build = os.environ['TARGET_NAME'] in build_dir\n \n return archive_build\n\n# Xcode by default throws all public headers into the top level directory.\n# This function moves them to their expected deep hierarchy.\n#\ndef build_deep_header_hierarchy(project):\n header_path_top = config_deep_header_top\n if not header_path_top:\n header_path_top = os.path.commonprefix(project.header_paths)\n else:\n header_path_top = splitpath(header_path_top)\n\n built_headers_path = os.path.join(os.environ['TARGET_BUILD_DIR'], os.environ['PUBLIC_HEADERS_FOLDER_PATH'])\n movable_headers = project.movable_headers_relative_to(header_path_top)\n\n # Remove subdirs if they only contain files that have been rebuilt\n ignore_headers = filter(lambda x: not os.path.isfile(top_level_file_path(built_headers_path, x)), movable_headers)\n remove_subdirs(built_headers_path, [file[0] for file in ignore_headers])\n\n # Move rebuilt headers into their proper subdirs\n for header in movable_headers:\n move_file(top_level_file_path(built_headers_path, header), full_file_path(built_headers_path, header))\n\n# Add all symlinks needed to make a full framework structure:\n#\n# MyFramework.framework\n# |-- MyFramework -> Versions/Current/MyFramework\n# |-- Headers -> Versions/Current/Headers\n# |-- Resources -> Versions/Current/Resources\n# `-- Versions\n# |-- A\n# | |-- MyFramework\n# | |-- Headers\n# | | `-- MyFramework.h\n# | `-- Resources\n# | |-- Info.plist\n# | |-- MyViewController.nib\n# | `-- en.lproj\n# | `-- InfoPlist.strings\n# `-- Current -> A\n#\ndef add_symlinks_to_framework(project):\n base_dir = project.local_built_fw_path\n attempt_symlink(os.path.join(base_dir, \"Versions\", \"Current\"), os.environ['FRAMEWORK_VERSION'])\n if os.path.isdir(os.path.join(base_dir, \"Versions\", \"Current\", \"Headers\")):\n attempt_symlink(os.path.join(base_dir, \"Headers\"), os.path.join(\"Versions\", \"Current\", \"Headers\"))\n if os.path.isdir(os.path.join(base_dir, \"Versions\", \"Current\", \"Resources\")):\n attempt_symlink(os.path.join(base_dir, \"Resources\"), os.path.join(\"Versions\", \"Current\", \"Resources\"))\n attempt_symlink(os.path.join(base_dir, os.environ['EXECUTABLE_NAME']), os.path.join(\"Versions\", \"Current\", os.environ['EXECUTABLE_NAME']))\n\n# Build an embedded framework structure.\n# An embedded framework contains the actual framework, plus a \"Resources\"\n# directory containing symlinks to all resources found in the actual framework,\n# with the exception of \"Info.plist\" and anything ending in \".lproj\":\n#\n# MyFramework.embeddedframework\n# |-- MyFramework.framework\n# | |-- MyFramework -> Versions/Current/MyFramework\n# | |-- Headers -> Versions/Current/Headers\n# | |-- Resources -> Versions/Current/Resources\n# | `-- Versions\n# | |-- A\n# | | |-- MyFramework\n# | | |-- Headers\n# | | | `-- MyFramework.h\n# | | `-- Resources\n# | | |-- Info.plist\n# | | |-- MyViewController.nib\n# | | `-- en.lproj\n# | | `-- InfoPlist.strings\n# | `-- Current -> A\n# `-- Resources\n# `-- MyViewController.nib -> ../MyFramework.framework/Resources/MyViewController.nib\n#\ndef build_embedded_framework(project):\n fw_path = project.local_built_fw_path\n embedded_path = project.local_built_embedded_fw_path\n fw_name = os.environ['WRAPPER_NAME']\n remove_path(embedded_path)\n ensure_path_exists(embedded_path)\n copy_overwrite(fw_path, os.path.join(embedded_path, fw_name))\n ensure_path_exists(os.path.join(embedded_path, \"Resources\"))\n symlink_source = os.path.join(\"..\", fw_name, \"Resources\")\n symlink_path = os.path.join(embedded_path, \"Resources\")\n if os.path.isdir(os.path.join(fw_path, \"Resources\")):\n for file in filter(lambda x: x != \"Info.plist\" and not x.endswith(\".lproj\"), os.listdir(os.path.join(fw_path, \"Resources\"))):\n attempt_symlink(os.path.join(symlink_path, file), os.path.join(symlink_source, file))\n\n # Remove the normal framework and replace it with a symlink to the copy\n # in the embedded framework. This is needed because Xcode runs its strip\n # phase AFTER the script runs.\n embed_fw_wrapper = os.path.splitext(os.environ['WRAPPER_NAME'])[0] + \".embeddedframework\"\n remove_path(fw_path)\n attempt_symlink(fw_path, os.path.join(embed_fw_wrapper, os.environ['WRAPPER_NAME']))\n\n\n# Run the build process in slave mode to build the other configuration\n# (device/simulator).\n#\ndef run_slave_build(project):\n print_and_call_slave_build(project.get_slave_project_build_command(), project.other_platform)\n\n# Run the build process.\n#\ndef run_build():\n project = Project(os.path.join(os.environ['PROJECT_FILE_PATH'], \"project.pbxproj\"))\n\n # Issue warnings only if we're master.\n if is_master():\n if len(project.compilable_sources) == 0:\n raise Exception(\"No compilable sources found. Please add at least one source file to build target %s.\" % os.environ['TARGET_NAME'])\n\n if config_warn_derived_data:\n check_for_derived_data_in_search_paths(project)\n if config_warn_no_public_headers and len(project.public_headers) == 0:\n issue_warning('No headers in build target %s were marked public. Please move at least one header to \"Public\" in the \"Copy Headers\" build phase.' % os.environ['TARGET_NAME'])\n\n # Only build slave if this is an archive build.\n if is_archive_build():\n if is_master():\n log.debug(\"Building as MASTER\")\n # The slave-side linker tries to include this (nonexistent) path as\n # a library path.\n ensure_path_exists(project.get_slave_environment()['BUILT_PRODUCTS_DIR'])\n project.build_state.persist()\n run_slave_build(project)\n project.build_state.reload()\n else:\n log.debug(\"Building as SLAVE\")\n project.build_state.reload()\n project.build_state.set_slave_properties(project.local_architectures,\n project.local_linked_archive_paths,\n project.local_built_fw_path,\n project.local_built_embedded_fw_path)\n project.build_state.persist()\n\n link_local_archs(project)\n \n # Only do a universal binary when building an archive.\n if is_archive_build() and is_master():\n link_combine_all_archs(project)\n else:\n link_combine_local_archs(project)\n\n if config_deep_header_hierarchy:\n build_deep_header_hierarchy(project)\n\n add_symlinks_to_framework(project)\n \n if is_master():\n if config_framework_type == 'embeddedframework':\n build_embedded_framework(project)\n elif config_framework_type != 'framework':\n raise Exception(\"%s: Unknown framework type for config_framework_type\" % config_framework_type)\n\n\nif __name__ == \"__main__\":\n log_handler = logging.StreamHandler()\n log_handler.setFormatter(logging.Formatter(\"%(name)s (\" + os.environ['PLATFORM_NAME'] + \"): %(levelname)s: %(message)s\"))\n log.addHandler(log_handler)\n log.setLevel(config_log_level)\n\n error_code = 0\n prefix = \"M\" if is_master() else \"S\"\n log_handler.setFormatter(logging.Formatter(\"%(name)s (\" + prefix + \" \" + os.environ['PLATFORM_NAME'] + \"): %(levelname)s: %(message)s\"))\n\n log.debug(\"Begin build process\")\n\n if config_deep_header_top:\n config_deep_header_top = string.Template(config_deep_header_top).substitute(os.environ)\n\n try:\n run_build()\n if issued_warnings:\n if config_fail_on_warnings:\n error_code = 1\n log.warn(\"Build completed with warnings\")\n else:\n log.info(\"Build completed\")\n if not is_archive_build():\n log.info(\"Note: This is *NOT* a universal framework build. To build as a universal framework, do an archive build.\")\n log.info(\"To do an archive build from command line, use \\\"xcodebuild -configuration Release UFW_ACTION=archive clean build\\\"\")\n except Exception:\n traceback.print_exc(file=sys.stdout)\n error_code = 1\n log.error(\"Build failed\")\n finally:\n if error_code == 0 and is_archive_build() and is_master():\n log.info(\"Built framework is in \" + os.environ['TARGET_BUILD_DIR'])\n if should_open_build_dir():\n open_build_dir()\n sys.exit(error_code)\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ - F983808C177C967700BC5290 /* Sources */ = { + BCF058DA17E1E354001A4C7C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F98380A0177C967700BC5290 /* PKRevealController.m in Sources */, - F98380AE177C973900BC5290 /* UIViewController+PKRevealController.m in Sources */, - F9D4C992177F44750084AE74 /* PKLayerAnimator.m in Sources */, - F92AA83A1780927100740679 /* CALayer+ConvenienceAnimations.m in Sources */, - F92AA83E17809D3E00740679 /* NSObject+Blocks.m in Sources */, - F951AE281782E177003631A6 /* PKSequentialAnimation.m in Sources */, - F9038022178470A9001A8B34 /* PKAnimation.m in Sources */, - F9B95F59178857C40052D84A /* PKLog.m in Sources */, - F9B95F5E178885AC0052D84A /* PKRevealControllerView.m in Sources */, - F94A4E74178B351B003D323B /* CAAnimation+Identifier.m in Sources */, + BCF058EA17E1E3CC001A4C7C /* PKRevealController.m in Sources */, + BCF058EB17E1E3CC001A4C7C /* PKRevealControllerView.m in Sources */, + BCF058EC17E1E3CC001A4C7C /* PKLog.m in Sources */, + BCF058ED17E1E3CC001A4C7C /* PKLayerAnimator.m in Sources */, + BCF058EE17E1E3CC001A4C7C /* PKAnimation.m in Sources */, + BCF058EF17E1E3CC001A4C7C /* PKSequentialAnimation.m in Sources */, + BCF058F017E1E3CC001A4C7C /* UIViewController+PKRevealController.m in Sources */, + BCF058F117E1E3CC001A4C7C /* NSObject+Blocks.m in Sources */, + BCF058F217E1E3CC001A4C7C /* CALayer+ConvenienceAnimations.m in Sources */, + BCF058F317E1E3CC001A4C7C /* CAAnimation+Identifier.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + BCF058E717E1E354001A4C7C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DSTROOT = /tmp/PKRevealController.dst; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "PKRevealController/PKRevealController-Prefix.pch"; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + BCF058E817E1E354001A4C7C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DSTROOT = /tmp/PKRevealController.dst; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "PKRevealController/PKRevealController-Prefix.pch"; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Release; + }; F98380A1177C967700BC5290 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -366,67 +366,23 @@ }; name = Release; }; - F98380A4177C967700BC5290 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SYSTEM_APPS_DIR)/Spark Inspector.app/Contents/Resources/Frameworks\"", - ); - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PKRevealController/PKRevealController-Prefix.pch"; - GCC_THUMB_SUPPORT = NO; - INFOPLIST_FILE = "PKRevealController/PKRevealController-Info.plist"; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ""; - WRAPPER_EXTENSION = framework; - }; - name = Debug; - }; - F98380A5177C967700BC5290 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SYSTEM_APPS_DIR)/Spark Inspector.app/Contents/Resources/Frameworks\"", - ); - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PKRevealController/PKRevealController-Prefix.pch"; - GCC_THUMB_SUPPORT = NO; - INFOPLIST_FILE = "PKRevealController/PKRevealController-Info.plist"; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ""; - WRAPPER_EXTENSION = framework; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - F983808B177C967700BC5290 /* Build configuration list for PBXProject "PKRevealController" */ = { + BCF058E917E1E354001A4C7C /* Build configuration list for PBXNativeTarget "PKRevealController" */ = { isa = XCConfigurationList; buildConfigurations = ( - F98380A1177C967700BC5290 /* Debug */, - F98380A2177C967700BC5290 /* Release */, + BCF058E717E1E354001A4C7C /* Debug */, + BCF058E817E1E354001A4C7C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - F98380A3177C967700BC5290 /* Build configuration list for PBXNativeTarget "PKRevealController" */ = { + F983808B177C967700BC5290 /* Build configuration list for PBXProject "PKRevealController" */ = { isa = XCConfigurationList; buildConfigurations = ( - F98380A4177C967700BC5290 /* Debug */, - F98380A5177C967700BC5290 /* Release */, + F98380A1177C967700BC5290 /* Debug */, + F98380A2177C967700BC5290 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release;