Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing bug where xml package url was incorrect.

  • Loading branch information...
commit 553cd82eb31d414676c163949efff849f3517964 1 parent 3377667
@bjtitus bjtitus authored
View
11 Generating/GBDocSetPublishGenerator.m
@@ -102,13 +102,15 @@ - (BOOL)generateOutputWithStore:(id)store error:(NSError **)error {
}
if(self.settings.docsetFeedFormats & GBPublishedFeedFormatXML)
- {
+ {
+ NSString *extension = @"tgz";
+
NSMutableArray *args = [NSMutableArray array];
[args addObject:@"tar"];
[args addObject:@"--exclude"];
[args addObject:@".DS_Store"];
[args addObject:@"-czPf"];
- [args addObject:[[outputDocSetPath stringByStandardizingPath] stringByAppendingString:@".tgz"]];
+ [args addObject:[[outputDocSetPath stringByStandardizingPath] stringByAppendingPathExtension:extension]];
[args addObject:installedDocSetPath];
// Run the task.
@@ -130,7 +132,10 @@ - (BOOL)generateOutputWithStore:(id)store error:(NSError **)error {
if (error) *error = [NSError errorWithCode:GBErrorDocSetUtilIndexingFailed description:[NSString stringWithFormat:@"failed to read the xml template document in %@!", xmlTemplatePath] reason:task.lastStandardError];
return NO;
}
- xmlString = [xmlString stringByReplacingOccurrencesOfString:@"${DOCSET_FEED_URL}" withString:self.settings.docsetFeedURL];
+ NSString *tarURL = self.settings.docsetPackageURL;
+ tarURL = [[tarURL stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
+
+ xmlString = [xmlString stringByReplacingOccurrencesOfString:@"${DOCSET_PACKAGE_URL}" withString:tarURL];
xmlString = [xmlString stringByReplacingOccurrencesOfString:@"${DOCSET_FEED_VERSION}" withString:self.settings.projectVersion];
result = [self writeString:xmlString toFile:[outputXMLPath stringByStandardizingPath] error:error];
if(!result)
View
2  Templates/publish/xml-template.xml
@@ -1,4 +1,4 @@
<entry>
<version>${DOCSET_FEED_VERSION}</version>
- <url>${DOCSET_FEED_URL}</url>
+ <url>${DOCSET_PACKAGE_URL}</url>
</entry>
Please sign in to comment.
Something went wrong with that request. Please try again.