Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixes an issue affecting docset bundle filename when using --publish-…

…doc-set and --no-install-docset
  • Loading branch information...
commit f4c4158f8715b51f3d5f3bfb2bb625897e80448b 1 parent 4da264e
@baarde baarde authored
Showing with 13 additions and 1 deletion.
  1. +13 −1 Generating/GBDocSetPublishGenerator.m
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;
Please sign in to comment.
Something went wrong with that request. Please try again.