Skip to content
Browse files

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

  • Loading branch information...
2 parents 3f0d4c7 + 7f0d33d commit 8cc62e15dde58c2501aed25690588b06abc36e67 @bulusoy bulusoy committed
Showing with 17 additions and 4 deletions.
  1. +1 −1 Developer Notes.markdown
  2. +13 −1 Generating/GBDocSetPublishGenerator.m
  3. +3 −2 Generating/GBGenerator.m
View
2 Developer Notes.markdown
@@ -9,7 +9,7 @@ All low level key components are covered with unit tests, however some higher le
- Create HTML and validate few pages to see it's ok.
- Create documention set and make sure no warning is emitted by appledoc.
- Install documentation set and make sure it's available in Xcode.
-- Publish documentatino set and make sure atom file is updated with new versions and xar file is generated.
+- Publish documentation set and make sure atom file is updated with new versions and xar file is generated.
- Update build number with `ruby ~/Dropbox/Scripts/Custom/git-version.rb` (copy result to GBAppledocStringsProvider's appledocData).
This should provide level of quality big enough to ensure the biggest bugs are caught.
View
14 Generating/GBDocSetPublishGenerator.m
@@ -27,9 +27,21 @@ - (BOOL)generateOutputWithStore:(id)store error:(NSError **)error {
task.reportIndividualLines = YES;
// Get the path to the installed documentation set and extract the name. Then replace the name's extension with .xar.
- NSString *installedDocSetPath = self.inputUserPath;
+ NSString *inputDocSetPath = self.inputUserPath;
NSString *packageName = self.settings.docsetPackageFilename;
NSString *atomName = self.settings.docsetAtomFilename;
+ NSString *installedDocSetPath = inputDocSetPath;
+
+ // If installation was skipped, move the docset folder to a .docset bundle.
+ if (!self.settings.installDocSet) {
+ installedDocSetPath = [self.settings.outputPath stringByAppendingPathComponent:self.settings.docsetBundleFilename];
+ installedDocSetPath = [installedDocSetPath stringByStandardizingPath];
+ GBLogVerbose(@"Moving DocSet files from '%@' to '%@'...", inputDocSetPath, installedDocSetPath);
+ if (![self copyOrMoveItemFromPath:inputDocSetPath toPath:installedDocSetPath error:error]) {
+ GBLogWarn(@"Failed moving DocSet files from '%@' to '%@'!", inputDocSetPath, installedDocSetPath);
+ return NO;
+ }
+ }
// Prepare command line arguments for packaging.
NSString *outputDir = self.outputUserPath;
View
5 Generating/GBGenerator.m
@@ -60,8 +60,9 @@ - (void)setupGeneratorStepsWithStore:(id)store {
[self.outputGenerators addObject:[GBHTMLOutputGenerator generatorWithSettingsProvider:self.settings]];
if (!self.settings.createDocSet) return;
[self.outputGenerators addObject:[GBDocSetOutputGenerator generatorWithSettingsProvider:self.settings]];
- if (!self.settings.installDocSet) return;
- [self.outputGenerators addObject:[GBDocSetInstallGenerator generatorWithSettingsProvider:self.settings]];
+ if (self.settings.installDocSet) {
+ [self.outputGenerators addObject:[GBDocSetInstallGenerator generatorWithSettingsProvider:self.settings]];
+ }
if (!self.settings.publishDocSet) return;
[self.outputGenerators addObject:[GBDocSetPublishGenerator generatorWithSettingsProvider:self.settings]];
}

0 comments on commit 8cc62e1

Please sign in to comment.
Something went wrong with that request. Please try again.