Permalink
Browse files

Merge branch 'master' of github.com:tomaz/appledoc

  • Loading branch information...
2 parents f53b1aa + 9b1e361 commit d22b72c4a8514179d5ea1f80d8b280a20321d246 @tomaz committed Jul 13, 2012
View
16 Application/GBAppledocApplication.m
@@ -496,6 +496,16 @@ - (void)injectGlobalSettingsFromArguments:(NSArray *)arguments {
self.templatesFound = YES;
return;
}
+
+ #ifdef COMPILE_TIME_DEFAULT_TEMPLATE_PATH
+ path = COMPILE_TIME_DEFAULT_TEMPLATE_PATH;
+ if ([self validateTemplatesPath:path error:nil]) {
+ [self overrideSettingsWithGlobalSettingsFromPath:path];
+ self.settings.templatesPath = path;
+ self.templatesFound = YES;
+ return;
+ }
+ #endif
}
}
@@ -651,16 +661,16 @@ - (void)setInstallDocset:(BOOL)value {
self.settings.createHTML = YES;
self.settings.createDocSet = YES;
- } else {
- self.settings.publishDocSet = NO;
+ // } else {
+ // self.settings.publishDocSet = NO;
}
}
- (void)setPublishDocset:(BOOL)value {
self.settings.publishDocSet = value;
if (value) {
self.settings.createHTML = YES;
self.settings.createDocSet = YES;
- self.settings.installDocSet = YES;
+ // self.settings.installDocSet = YES;
}
}
- (void)setNoCleanOutput:(BOOL)value { self.settings.cleanupOutputPathBeforeRunning = !value; }
View
1 Model/GBMethodData.m
@@ -74,7 +74,6 @@ + (id)propertyDataWithAttributes:(NSArray *)attributes components:(NSArray *)com
nextComponentIsPropertyName = YES;
} else if ([component isEqualToString:@"id"]) {
[results addObject:component];
- nextComponentIsPropertyName = YES;
} else if ([component isMatchedByRegex:@"^[_a-zA-Z][_a-zA-Z0-9]$"]) {
if (results.count == 0 || inProtocolsList) {
[results addObject:component];
View
6 Readme.markdown
@@ -41,6 +41,12 @@ You can also use install-appledoc.sh script to perform quick installation. Open
It compiles appledoc and installs its binary to /usr/local/bin and templatest to - ~/.appledoc by default. You can override this directories with -b and -t options respectively. For example:
sudo sh install-appledoc.sh -b /usr/bin -t ~/Library/Application\ Support/appledoc
+
+**Alternatively with Homebrew:**
+
+ brew install appledoc
+
+Homebrew puts your templates in `~/Libarary/Application Support/appledoc`.
Using appledoc
==============
View
4 Testing/GBObjectiveCParser-MethodsParsingTesting.m
@@ -283,12 +283,12 @@ - (void)testParseObjectsFromString_shouldRegisterComplexPropertyDefinition2 {
GBObjectiveCParser *parser = [GBObjectiveCParser parserWithSettingsProvider:[GBTestObjectsRegistry mockSettingsProvider]];
GBStore *store = [[GBStore alloc] init];
// execute
- [parser parseObjectsFromString:@"@interface MyClass @property (weak) IBOutlet id delegate; @end" sourceFile:@"filename.h" toStore:store];
+ [parser parseObjectsFromString:@"@interface MyClass @property (weak) IBOutlet id<Protocol> delegate; @end" sourceFile:@"filename.h" toStore:store];
// verify
GBClassData *class = [[store classes] anyObject];
NSArray *methods = [[class methods] methods];
assertThatInteger([methods count], equalToInteger(1));
- [self assertMethod:[methods objectAtIndex:0] matchesPropertyComponents:@"weak", @"IBOutlet", @"id", @"delegate", nil];
+ [self assertMethod:[methods objectAtIndex:0] matchesPropertyComponents:@"weak", @"IBOutlet", @"id", @"<", @"Protocol", @">", @"delegate", nil];
}
- (void)testParseObjectsFromString_shouldRegisterBlockPropertyDefinition {

0 comments on commit d22b72c

Please sign in to comment.