Permalink
Browse files

Fixed docsetutil support with Xcode 4.3, thanks to @BloodDragon. Addr…

…esses #181 and #182.
  • Loading branch information...
1 parent 1f96175 commit 303359ae260074e2906f3af10f1410be44f27c2e @tomaz committed Feb 22, 2012
Showing with 9 additions and 1 deletion.
  1. +5 −0 Application/GBApplicationSettingsProvider.m
  2. +3 −1 appledoc.xcodeproj/project.pbxproj
  3. +1 −0 appledoc_Prefix.pch
@@ -8,6 +8,7 @@
#include "mkdio.h"
#import <objc/runtime.h>
+#import <Cocoa/Cocoa.h>
#import "RegexKitLite.h"
#import "GBDataObjects.h"
#import "GBApplicationSettingsProvider.h"
@@ -69,6 +70,10 @@ - (id)init {
self.templatesPath = nil;
self.docsetInstallPath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Developer/Shared/Documentation/DocSets"];
self.docsetUtilPath = @"/Developer/usr/bin/docsetutil";
+ if (![[NSFileManager defaultManager] fileExistsAtPath:self.docsetUtilPath]) {
+ NSString *xcodePath = [[NSWorkspace sharedWorkspace] fullPathForApplication:@"Xcode"];
+ self.docsetUtilPath = [xcodePath stringByAppendingPathComponent:@"Contents/Developer/usr/bin/docsetutil"];
+ }
self.indexDescriptionPath = nil;
self.includePaths = [NSMutableSet set];
self.ignoredPaths = [NSMutableSet set];
@@ -176,6 +176,7 @@
73E0CF46131047E700FAFEC0 /* GBCommentsProcessor-MarkdownTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 73E0CF45131047E700FAFEC0 /* GBCommentsProcessor-MarkdownTesting.m */; };
73E1B7D4130BE72100E3D710 /* GBCommentsProcessor-RegistrationsTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 73E1B7D3130BE72100E3D710 /* GBCommentsProcessor-RegistrationsTesting.m */; };
73E1B7D6130BE7C000E3D710 /* GBCommentsProcessor-PreprocessingTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 73E1B7D5130BE7C000E3D710 /* GBCommentsProcessor-PreprocessingTesting.m */; };
+ 73E4A42714F51EC400C0620F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D8E98B11FCC97100966C4A /* Cocoa.framework */; };
73F2CA74123E4161009B406B /* GBCommentsProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 73F2CA71123E4161009B406B /* GBCommentsProcessor.m */; };
73F2CA75123E4161009B406B /* GBProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 73F2CA73123E4161009B406B /* GBProcessor.m */; };
73F2CA76123E4161009B406B /* GBCommentsProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 73F2CA71123E4161009B406B /* GBCommentsProcessor.m */; };
@@ -514,9 +515,10 @@
buildActionMask = 2147483647;
files = (
8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */,
- 73FC6FAB11FCE93400AAD0B9 /* libParseKitLib.a in Frameworks */,
+ 73E4A42714F51EC400C0620F /* Cocoa.framework in Frameworks */,
73F5689D12A2244300A72BB2 /* SystemConfiguration.framework in Frameworks */,
73F568D312A22CFF00A72BB2 /* CoreServices.framework in Frameworks */,
+ 73FC6FAB11FCE93400AAD0B9 /* libParseKitLib.a in Frameworks */,
7355E12E1312736D00B9C000 /* libmarkdown.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
View
@@ -7,6 +7,7 @@
//
#ifdef __OBJC__
+ #import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import "NSObject+GBObject.h"
#import "NSString+GBString.h"

0 comments on commit 303359a

Please sign in to comment.