gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 17:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed OrderedSymbolDeclarations.plist writing to take in account that existing

Browse source 
.gsdoc files are usually not regenerated.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32962 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
qmathe 2011-04-30 15:41:08 +00:00
parent 408cec80d5
commit 07a05e9cc6
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-04-30 Quentin Mathe <quentin.mathe@gmail.com>
* Tools/autogsdoc.m: Fixed OrderedSymbolDeclarations.plist content to
take in account that existing .gsdoc files are usually not regenerated.
We now create the plist by merging it with the previously output plist
file.
2011-04-26 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSNumberFormatter.m: Move the body of -init to a method called

30
Tools/autogsdoc.m
View file

@ -650,6 +650,7 @@ main(int argc, char **argv, char **env)
NSMutableArray *gFiles = nil; // GSDOC
NSMutableArray *hFiles = nil; // HTML
NSString *symbolDeclsFile = nil;
NSMutableDictionary *symbolDecls = nil;
NSMutableSet *deps = nil;
#if GS_WITH_GC == 0
NSAutoreleasePool *outer = nil;
@ -672,6 +673,8 @@ main(int argc, char **argv, char **env)
3) Load existing .igsdoc file (PropertyList/Dictionary format) if found,
initializing an AGSIndex from it.
Also load existing OrderedSymbolDeclarations.plist if found.
4) Clean if desired:
4a) Build list of all template files, and remove generated content
@ -690,6 +693,8 @@ main(int argc, char **argv, char **env)
5b) Determine (possibly multiple) dependent .m files corresponding to
a .h and parse them.
5c) Feed parser results to an AGSOutput instance.
Finally write the OrderedSymbolDeclarations.plist built by the parser.
6) Move to "gsdoc files" (including both command-line given ones and
just-generated ones).. and generate the index; for each one:
@ -1018,6 +1023,23 @@ main(int argc, char **argv, char **env)
}
}
/*
* Load old OrderedSymbolDeclarations.plist to merge it later
*/
if ([mgr isReadableFileAtPath: symbolDeclsFile])
{
symbolDecls =
[NSMutableDictionary dictionaryWithContentsOfFile: symbolDeclsFile];
if (symbolDeclsFile == nil)
{
NSLog(@"Unable to read ordered symbols file '%@'", symbolDeclsFile);
}
}
if (symbolDecls == nil)
{
symbolDecls = [NSMutableDictionary dictionary];
}
/*
* 4) Clean if desired:
*/
@ -1496,10 +1518,12 @@ main(int argc, char **argv, char **env)
}
/*
* Ask the parser for the OrderedSymbolDeclarations plist and save it
* Ask the parser for the OrderedSymbolDeclarations plist, merge with
* the previously output plist and save it
*/
[[parser orderedSymbolDeclarationsByUnit] writeToFile: symbolDeclsFile
atomically: YES];
[symbolDecls addEntriesFromDictionary:
[parser orderedSymbolDeclarationsByUnit]];
[symbolDecls writeToFile: symbolDeclsFile atomically: YES];
informalProtocols = RETAIN([output informalProtocols]);
#if GS_WITH_GC == 0