From 10254873ed68d220cfbec0427646414e03aba639 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 24 Jan 2012 10:48:08 -0800 Subject: [PATCH 1/2] Move around some of the paths to be group relative, otherwise seems some are broken after duplicating the tree into another project. --- ShareKit.xcodeproj/project.pbxproj | 43 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/ShareKit.xcodeproj/project.pbxproj b/ShareKit.xcodeproj/project.pbxproj index 19e0b98f..2d98c495 100755 --- a/ShareKit.xcodeproj/project.pbxproj +++ b/ShareKit.xcodeproj/project.pbxproj @@ -336,8 +336,8 @@ 7AF78BB214B71FD8008ACA5D /* SHKFormControllerLargeTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKFormControllerLargeTextField.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* ShareKit-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ShareKit-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; 90E765A51418F2480026B656 /* ShareKit.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ShareKit.bundle; sourceTree = ""; }; - A57772B214BA0748003FC744 /* SSKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSKeychain.h; path = Submodules/sskeychain/SSKeychain.h; sourceTree = SOURCE_ROOT; }; - A57772B314BA0748003FC744 /* SSKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSKeychain.m; path = Submodules/sskeychain/SSKeychain.m; sourceTree = SOURCE_ROOT; }; + A57772B214BA0748003FC744 /* SSKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSKeychain.h; sourceTree = ""; }; + A57772B314BA0748003FC744 /* SSKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSKeychain.m; sourceTree = ""; }; A57772B614BA1900003FC744 /* ObjectiveFlickr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectiveFlickr.h; sourceTree = ""; }; A57772B714BA1900003FC744 /* ObjectiveFlickr.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectiveFlickr.m; sourceTree = ""; }; A57772B814BA1900003FC744 /* OFUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OFUtilities.h; sourceTree = ""; }; @@ -361,8 +361,8 @@ AAACE05A13CCBED400A2118F /* NSData_LFHTTPFormExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSData_LFHTTPFormExtensions.m; sourceTree = ""; }; AAACE06013CCBED400A2118F /* SHKFlickr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKFlickr.h; sourceTree = ""; }; AAACE06113CCBED400A2118F /* SHKFlickr.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKFlickr.m; sourceTree = ""; }; - BA465F1D14CC3C5A00B52394 /* SHKPrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHKPrint.h; path = Print/SHKPrint.h; sourceTree = ""; }; - BA465F1E14CC3C5A00B52394 /* SHKPrint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SHKPrint.m; path = Print/SHKPrint.m; sourceTree = ""; }; + BA465F1D14CC3C5A00B52394 /* SHKPrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKPrint.h; sourceTree = ""; }; + BA465F1E14CC3C5A00B52394 /* SHKPrint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKPrint.m; sourceTree = ""; }; C0276D7414336ACC00C93FAA /* NSError+SHKFoursquareV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+SHKFoursquareV2.h"; sourceTree = ""; }; C0276D7514336ACC00C93FAA /* NSError+SHKFoursquareV2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+SHKFoursquareV2.m"; sourceTree = ""; }; C0276D7614336ACD00C93FAA /* SHKFoursquareV2CheckInForm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKFoursquareV2CheckInForm.h; sourceTree = ""; }; @@ -382,16 +382,16 @@ C0AD00F4142B7B6D000862D9 /* SHKLinkedInOAMutableURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKLinkedInOAMutableURLRequest.h; sourceTree = ""; }; C0AD00F5142B7B6D000862D9 /* SHKLinkedInOAMutableURLRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKLinkedInOAMutableURLRequest.m; sourceTree = ""; }; C0D3077A147BDC8100E74EA3 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - E68738BE1416795C00D8C3DD /* SHKLogout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHKLogout.h; path = "Logout of All Services/SHKLogout.h"; sourceTree = ""; }; - E68738BF1416795C00D8C3DD /* SHKLogout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SHKLogout.m; path = "Logout of All Services/SHKLogout.m"; sourceTree = ""; }; + E68738BE1416795C00D8C3DD /* SHKLogout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKLogout.h; sourceTree = ""; }; + E68738BF1416795C00D8C3DD /* SHKLogout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKLogout.m; sourceTree = ""; }; F92EF479148E8F1B0070F913 /* JSONKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONKit.h; sourceTree = ""; }; F92EF47A148E8F1B0070F913 /* JSONKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONKit.m; sourceTree = ""; }; F92EF487148E915E0070F913 /* SHKiOS5Twitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKiOS5Twitter.h; sourceTree = ""; }; F92EF488148E915E0070F913 /* SHKiOS5Twitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKiOS5Twitter.m; sourceTree = ""; }; - FA5AA3B6149625460064DB24 /* SHKVkontakteOAuthView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SHKVkontakteOAuthView.m; path = Vkontakte/SHKVkontakteOAuthView.m; sourceTree = ""; }; - FA5AA3B7149625460064DB24 /* SHKVkontakteOAuthView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHKVkontakteOAuthView.h; path = Vkontakte/SHKVkontakteOAuthView.h; sourceTree = ""; }; - FA5AA3BA149625460064DB24 /* SHKVkontakte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SHKVkontakte.m; path = Vkontakte/SHKVkontakte.m; sourceTree = ""; }; - FA5AA3BB149625460064DB24 /* SHKVkontakte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHKVkontakte.h; path = Vkontakte/SHKVkontakte.h; sourceTree = ""; }; + FA5AA3B6149625460064DB24 /* SHKVkontakteOAuthView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKVkontakteOAuthView.m; sourceTree = ""; }; + FA5AA3B7149625460064DB24 /* SHKVkontakteOAuthView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKVkontakteOAuthView.h; sourceTree = ""; }; + FA5AA3BA149625460064DB24 /* SHKVkontakte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKVkontakte.m; sourceTree = ""; }; + FA5AA3BB149625460064DB24 /* SHKVkontakte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKVkontakte.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -685,7 +685,8 @@ A57772B214BA0748003FC744 /* SSKeychain.h */, A57772B314BA0748003FC744 /* SSKeychain.m */, ); - path = Keychain; + name = Keychain; + path = ../../../../Submodules/sskeychain; sourceTree = ""; }; 43A5367F11DBE3B9004A1712 /* OAuth */ = { @@ -997,8 +998,8 @@ A57772BB14BA1900003FC744 /* OFXMLMapper.m */, ); name = ObjectiveFlickr; - path = Submodules/objectiveflickr/Source; - sourceTree = SOURCE_ROOT; + path = ../../../../../Submodules/objectiveflickr/Source; + sourceTree = ""; }; AAACE01413CCB1F500A2118F /* Configuration */ = { isa = PBXGroup; @@ -1011,8 +1012,8 @@ AAACE01A13CCB1F500A2118F /* SHKConfiguration.m */, ); name = Configuration; - path = Classes/ShareKit/Configuration; - sourceTree = SOURCE_ROOT; + path = ../Configuration; + sourceTree = ""; }; AAACE05313CCBED400A2118F /* Flickr */ = { isa = PBXGroup; @@ -1037,7 +1038,7 @@ BA465F1D14CC3C5A00B52394 /* SHKPrint.h */, BA465F1E14CC3C5A00B52394 /* SHKPrint.m */, ); - name = Print; + path = Print; sourceTree = ""; }; C042A61D1430AB4D00DF9AF6 /* FoursquareV2 */ = { @@ -1079,6 +1080,7 @@ E68738BF1416795C00D8C3DD /* SHKLogout.m */, ); name = Logout; + path = "Logout of All Services"; sourceTree = ""; }; F92EF477148E8F1A0070F913 /* JSONKit */ = { @@ -1088,8 +1090,8 @@ F92EF47A148E8F1B0070F913 /* JSONKit.m */, ); name = JSONKit; - path = Submodules/JSONKit; - sourceTree = SOURCE_ROOT; + path = ../../Submodules/JSONKit; + sourceTree = ""; }; FA5AA3B4149625010064DB24 /* Vkontakte */ = { isa = PBXGroup; @@ -1097,9 +1099,9 @@ FA5AA3B6149625460064DB24 /* SHKVkontakteOAuthView.m */, FA5AA3B7149625460064DB24 /* SHKVkontakteOAuthView.h */, FA5AA3BA149625460064DB24 /* SHKVkontakte.m */, - FA5AA3BB149625460064DB24 /* SHKVkontakte.h */, + FA5AA3BB149625460064DB24 /* SHKVkontakte.m */, ); - name = Vkontakte; + path = Vkontakte; sourceTree = ""; }; /* End PBXGroup section */ @@ -1292,7 +1294,6 @@ A57772BD14BA1900003FC744 /* OFUtilities.m in Sources */, A57772BE14BA1900003FC744 /* OFXMLMapper.m in Sources */, AA511B8014C893A10022332B /* SHKFormOptionController.m in Sources */, - 7A0861D914A36E5A00FF509F /* SHKFormControllerLargeTextField.m in Sources */, BA465F1F14CC3C5A00B52394 /* SHKPrint.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; From fbfc8542bb060fd8d656b52dd12cc752d1632ae5 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 24 Jan 2012 10:58:34 -0800 Subject: [PATCH 2/2] Repair SHKVkontakte.h which was broken in projectbuild rework --- ShareKit.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShareKit.xcodeproj/project.pbxproj b/ShareKit.xcodeproj/project.pbxproj index 2d98c495..c4c7bf7b 100755 --- a/ShareKit.xcodeproj/project.pbxproj +++ b/ShareKit.xcodeproj/project.pbxproj @@ -391,7 +391,7 @@ FA5AA3B6149625460064DB24 /* SHKVkontakteOAuthView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKVkontakteOAuthView.m; sourceTree = ""; }; FA5AA3B7149625460064DB24 /* SHKVkontakteOAuthView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKVkontakteOAuthView.h; sourceTree = ""; }; FA5AA3BA149625460064DB24 /* SHKVkontakte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKVkontakte.m; sourceTree = ""; }; - FA5AA3BB149625460064DB24 /* SHKVkontakte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKVkontakte.m; sourceTree = ""; }; + FA5AA3BB149625460064DB24 /* SHKVkontakte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKVkontakte.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1099,7 +1099,7 @@ FA5AA3B6149625460064DB24 /* SHKVkontakteOAuthView.m */, FA5AA3B7149625460064DB24 /* SHKVkontakteOAuthView.h */, FA5AA3BA149625460064DB24 /* SHKVkontakte.m */, - FA5AA3BB149625460064DB24 /* SHKVkontakte.m */, + FA5AA3BB149625460064DB24 /* SHKVkontakte.h */, ); path = Vkontakte; sourceTree = "";