Permalink
Browse files

Updates and fixes for Xcode 4 and clang 2.0.

  • Loading branch information...
1 parent 389709d commit d7c96213742509eb0a65554c6bd9ff734f9f6e27 @davidmorford committed May 12, 2011
Showing with 422 additions and 364 deletions.
  1. +9 −0 Projects/Libraries/NavigatorKit/Configurations/Debug.xcconfig
  2. +3 −3 Projects/Libraries/NavigatorKit/Configurations/Library.xcconfig
  3. +1 −2 Projects/Libraries/NavigatorKit/Configurations/Project.xcconfig
  4. +9 −0 Projects/Libraries/NavigatorKit/Configurations/Release.xcconfig
  5. +7 −59 Projects/Libraries/NavigatorKit/NavigatorKit.xcodeproj/project.pbxproj
  6. +7 −0 Projects/Libraries/NavigatorKit/NavigatorKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  7. +58 −0 Projects/Libraries/NavigatorKit/NavigatorKit.xcodeproj/xcshareddata/xcschemes/NavigatorKit.xcscheme
  8. +0 −1 Projects/Libraries/NavigatorKit/Source/Categories/Foundation/NSObject+NKAssociatedObject.h
  9. +1 −1 Projects/Libraries/NavigatorKit/Source/Classes/Map/NKNavigatorPattern.h
  10. +307 −287 Projects/Libraries/NavigatorKit/Source/Classes/Map/NKNavigatorPattern.m
  11. +2 −2 Projects/Libraries/NavigatorKit/Source/Classes/Navigator/NKNavigator.h
  12. +3 −1 Projects/Libraries/NavigatorKit/Source/Classes/Navigator/NKNavigator.m
  13. +1 −0 Projects/Libraries/NavigatorKit/Source/Classes/SplitViewController/NKSplitViewController.m
  14. +4 −2 Projects/Libraries/NavigatorKit/Source/Classes/ViewControllers/NKAlertViewController.m
  15. +8 −4 Projects/Libraries/NavigatorKit/Source/Classes/ViewControllers/NKPopupViewController.m
  16. +1 −1 Projects/Libraries/NavigatorKit/Source/Classes/ViewControllers/NKViewControllerProxy.m
  17. +1 −1 Projects/Libraries/NavigatorKit/Source/Project/Library/NavigatorKitLibrary.h
@@ -0,0 +1,9 @@
+
+//
+// NavigatorKit/Configurations/Debug.xcconfig
+//
+// Customize with settings specific to debug
+//
+
+#include "Library.xcconfig"
+#include "../../../Configurations/Debug.xcconfig"
@@ -7,13 +7,13 @@
#include "../../../Configurations/Libraries.xcconfig"
// Product Name
-PRODUCT_NAME = NavigatorKit
+PRODUCT_NAME = NavigatorKit
// Library Version
-BUILD_LIBRARY_VERSION = A
+BUILD_LIBRARY_VERSION = A
// Library Resource Bundle
-LIBRARY_RESOURCE_BUNDLE_NAME = NavigatorKit.bundle
+LIBRARY_RESOURCE_BUNDLE_NAME = NavigatorKit.bundle
// Clang
RUN_CLANG_STATIC_ANALYZER = YES
@@ -3,7 +3,6 @@
// NavigatorKit/Configurations/Project.xcconfig
//
+#include "../../../Configurations/Paths.xcconfig"
#include "../../../Configurations/Platform.xcconfig"
#include "../../../Configurations/Project.xcconfig"
-
-CODE_SIGN_IDENTITY = iPhone Developer
@@ -0,0 +1,9 @@
+
+//
+// NavigatorKit/Configurations/Release.xcconfig
+//
+// Customize with settings specific to release mode
+//
+
+#include "Library.xcconfig"
+#include "../../../Configurations/Release.xcconfig"
@@ -83,6 +83,8 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ 632D40DF137AECD60030B9BF /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+ 632D40E0137AECD60030B9BF /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
634EC8C311966F44003426E7 /* NavigatorKitLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorKitLibrary.h; sourceTree = "<group>"; };
634EC8C411966F44003426E7 /* NavigatorKitLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavigatorKitLibrary.m; sourceTree = "<group>"; };
63843AB91041214400D29404 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Developer/Library/Frameworks/SenTestingKit.framework; sourceTree = SDKROOT; };
@@ -122,7 +124,6 @@
63AB87D8124587D100BD8093 /* NKNavigatorPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NKNavigatorPath.m; sourceTree = "<group>"; };
63AB87D9124587D100BD8093 /* NKPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NKPathUtilities.h; path = Source/Classes/Map/NKPathUtilities.h; sourceTree = SOURCE_ROOT; };
63AB87DA124587D100BD8093 /* NKPathUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NKPathUtilities.m; sourceTree = "<group>"; };
- 63B6A8911041465B0049EC9C /* Settings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Settings.xcconfig; path = Configurations/Settings.xcconfig; sourceTree = SOURCE_ROOT; };
63BFC979120521D30048F1D3 /* NKNavigatorMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NKNavigatorMap.h; sourceTree = "<group>"; };
63BFC97A120521D30048F1D3 /* NKNavigatorMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NKNavigatorMap.m; sourceTree = "<group>"; };
63BFC97D120521D30048F1D3 /* NKNavigatorPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NKNavigatorPattern.h; sourceTree = "<group>"; };
@@ -215,13 +216,6 @@
name = UnitTest;
sourceTree = "<group>";
};
- 63843AB81041213200D29404 /* Project */ = {
- isa = PBXGroup;
- children = (
- );
- name = Project;
- sourceTree = "<group>";
- };
638654001204C703002ED89B /* Categories */ = {
isa = PBXGroup;
children = (
@@ -301,8 +295,6 @@
isa = PBXGroup;
children = (
0867D69AFE84028FC02AAC07 /* Frameworks */,
- 63894C11103BE467007C9CC9 /* Libraries */,
- 63843AB81041213200D29404 /* Project */,
63843AB71041212700D29404 /* UnitTest */,
);
name = References;
@@ -311,9 +303,10 @@
63894BE2103BD59B007C9CC9 /* Configurations */ = {
isa = PBXGroup;
children = (
- 63894BE4103BD59B007C9CC9 /* Library.xcconfig */,
- 63B6A8911041465B0049EC9C /* Settings.xcconfig */,
63894BE5103BD59B007C9CC9 /* Project.xcconfig */,
+ 63894BE4103BD59B007C9CC9 /* Library.xcconfig */,
+ 632D40DF137AECD60030B9BF /* Debug.xcconfig */,
+ 632D40E0137AECD60030B9BF /* Release.xcconfig */,
);
path = Configurations;
sourceTree = SOURCE_ROOT;
@@ -346,13 +339,6 @@
path = Source/Resources/Bundles;
sourceTree = SOURCE_ROOT;
};
- 63894C11103BE467007C9CC9 /* Libraries */ = {
- isa = PBXGroup;
- children = (
- );
- name = Libraries;
- sourceTree = "<group>";
- };
639ED1C9120A0D6B00119A97 /* SplitViewController */ = {
isa = PBXGroup;
children = (
@@ -594,16 +580,14 @@
/* Begin XCBuildConfiguration section */
1DEB921F08733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 63894BE4103BD59B007C9CC9 /* Library.xcconfig */;
+ baseConfigurationReference = 632D40DF137AECD60030B9BF /* Debug.xcconfig */;
buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
};
name = Debug;
};
1DEB922008733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 63894BE4103BD59B007C9CC9 /* Library.xcconfig */;
+ baseConfigurationReference = 632D40E0137AECD60030B9BF /* Release.xcconfig */;
buildSettings = {
};
name = Release;
@@ -612,7 +596,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63894BE5103BD59B007C9CC9 /* Project.xcconfig */;
buildSettings = {
- GCC_OPTIMIZATION_LEVEL = 0;
};
name = Debug;
};
@@ -623,47 +606,14 @@
};
name = Release;
};
- 63894C01103BE1FD007C9CC9 /* Profile */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63894BE5103BD59B007C9CC9 /* Project.xcconfig */;
- buildSettings = {
- GCC_OPTIMIZATION_LEVEL = 0;
- };
- name = Profile;
- };
- 63894C02103BE1FD007C9CC9 /* Profile */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63894BE4103BD59B007C9CC9 /* Library.xcconfig */;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- };
- name = Profile;
- };
- 63894C04103BE202007C9CC9 /* Distribution */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63894BE5103BD59B007C9CC9 /* Project.xcconfig */;
- buildSettings = {
- };
- name = Distribution;
- };
- 63894C05103BE202007C9CC9 /* Distribution */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63894BE4103BD59B007C9CC9 /* Library.xcconfig */;
- buildSettings = {
- };
- name = Distribution;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "NavigatorKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB921F08733DC00010E9CD /* Debug */,
- 63894C02103BE1FD007C9CC9 /* Profile */,
1DEB922008733DC00010E9CD /* Release */,
- 63894C05103BE202007C9CC9 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -672,9 +622,7 @@
isa = XCConfigurationList;
buildConfigurations = (
1DEB922308733DC00010E9CD /* Debug */,
- 63894C01103BE1FD007C9CC9 /* Profile */,
1DEB922408733DC00010E9CD /* Release */,
- 63894C04103BE202007C9CC9 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
Oops, something went wrong.
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "D2AAC07D0554694100DB518D"
+ BuildableName = "libNavigatorKit.a"
+ BlueprintName = "NavigatorKit"
+ ReferencedContainer = "container:NavigatorKit.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ displayScaleIsEnabled = "NO"
+ displayScale = "1.00"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ displayScaleIsEnabled = "NO"
+ displayScale = "1.00"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
@@ -2,7 +2,6 @@
/*!
@project NavigatorKit
@header NSObject+NKAssociatedObject.h
-@copyright (c) 2010 - 2011, Semantap
@shoutout Andy Matuschak for the orginial idea.
*/
@@ -149,7 +149,7 @@ enum {
-(BOOL) matchURL:(NSURL *)aURL;
-(id) invoke:(id)target withURL:(NSURL *)aURL query:(NSDictionary *)aQuery;
--(id) createObjectFromURL:(NSURL *)aURL query:(NSDictionary *)aQuery /*NS_RETURNS_RETAINED*/;
+-(id) createObjectFromURL:(NSURL *)aURL query:(NSDictionary *)aQuery;
@end
Oops, something went wrong.

0 comments on commit d7c9621

Please sign in to comment.