change instanceVarsAtEnd option to default to YES as stated in help instructions

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19592 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
arobert 2004-06-22 22:52:59 +00:00
parent ba86429fb3
commit 88374f1b5a

View file

@ -383,7 +383,7 @@
A boolean value which may be used to specify that the program should A boolean value which may be used to specify that the program should
ignore file modification times and regenerate files anyway. Provided ignore file modification times and regenerate files anyway. Provided
for use in conjunction with the <code>make</code> system, which is for use in conjunction with the <code>make</code> system, which is
expected to manage dependency checking itsself. expected to manage dependency checking itself.
</item> </item>
<item><strong>LocalProjects</strong> <item><strong>LocalProjects</strong>
This value is used to control the automatic inclusion of local This value is used to control the automatic inclusion of local
@ -628,6 +628,7 @@ main(int argc, char **argv, char **env)
BOOL showDependencies = NO; BOOL showDependencies = NO;
BOOL verbose = NO; BOOL verbose = NO;
BOOL warn = NO; BOOL warn = NO;
BOOL instanceVarsAtEnd = YES;
NSArray *files = nil; NSArray *files = nil;
NSMutableArray *sFiles = nil; // Source NSMutableArray *sFiles = nil; // Source
NSMutableArray *gFiles = nil; // GSDOC NSMutableArray *gFiles = nil; // GSDOC
@ -853,6 +854,12 @@ main(int argc, char **argv, char **env)
generateHtml = [defs boolForKey: @"GenerateHtml"]; generateHtml = [defs boolForKey: @"GenerateHtml"];
} }
obj = [defs objectForKey: @"InstanceVariablesAtEnd"];
if (obj != nil)
{
instanceVarsAtEnd = [defs boolForKey: @"InstanceVariablesAtEnd"];
}
declared = [defs stringForKey: @"Declared"]; declared = [defs stringForKey: @"Declared"];
project = [defs stringForKey: @"Project"]; project = [defs stringForKey: @"Project"];
refsName = [[project stringByAppendingPathExtension: @"igsdoc"] copy]; refsName = [[project stringByAppendingPathExtension: @"igsdoc"] copy];
@ -1836,7 +1843,7 @@ main(int argc, char **argv, char **env)
@" (<A HREF=\"%@.html\" TARGET=\"mainFrame\">intro</A>)&nbsp;", @" (<A HREF=\"%@.html\" TARGET=\"mainFrame\">intro</A>)&nbsp;",
project]; project];
[idxIndex appendFormat: [idxIndex appendFormat:
@"&nbsp;(<A HREF=\"%@.html\" TARGET=\"_top\">no frames</A>)\n", @"&nbsp;(<A HREF=\"%@.html\" TARGET=\"_top\">unframe</A>)\n",
project]; project];
[idxIndex appendString: @" </FONT>\n </BODY>\n</HTML>\n"]; [idxIndex appendString: @" </FONT>\n </BODY>\n</HTML>\n"];
[idxIndex writeToFile: [idxIndex writeToFile:
@ -1997,8 +2004,7 @@ main(int argc, char **argv, char **env)
[html setGlobalRefs: globalRefs]; [html setGlobalRefs: globalRefs];
[html setProjectRefs: projectRefs]; [html setProjectRefs: projectRefs];
[html setLocalRefs: localRefs]; [html setLocalRefs: localRefs];
[html setInstanceVariablesAtEnd: [html setInstanceVariablesAtEnd: instanceVarsAtEnd];
[defs boolForKey: @"InstanceVariablesAtEnd"]];
generated = [html outputDocument: root]; generated = [html outputDocument: root];
if ([generated writeToFile: htmlfile atomically: YES] == NO) if ([generated writeToFile: htmlfile atomically: YES] == NO)
{ {
@ -2072,8 +2078,7 @@ main(int argc, char **argv, char **env)
[html setGlobalRefs: globalRefs]; [html setGlobalRefs: globalRefs];
[html setProjectRefs: projectRefs]; [html setProjectRefs: projectRefs];
[html setLocalRefs: nil]; [html setLocalRefs: nil];
[html setInstanceVariablesAtEnd: [html setInstanceVariablesAtEnd: instanceVarsAtEnd];
[defs boolForKey: @"InstanceVariablesAtEnd"]];
s = [NSMutableString stringWithContentsOfFile: src]; s = [NSMutableString stringWithContentsOfFile: src];
l = [s length]; l = [s length];