gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-05 12:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12148 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-01-21 09:21:14 +00:00
parent 7187922021
commit e3ea2e71af
1 changed files with 58 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
Tools/make_services.m
View file

@ -106,7 +106,9 @@ main(int argc, char** argv, char **env_c)
for (index = 1; index < [args count]; index++) for (index = 1; index < [args count]; index++)
{ {
if ([[args objectAtIndex: index] isEqual: @"--verbose"]) if ([[args objectAtIndex: index] isEqual: @"--verbose"])
verbose = YES; {
verbose = YES;
}
if ([[args objectAtIndex: index] isEqual: @"--help"]) if ([[args objectAtIndex: index] isEqual: @"--help"])
{ {
printf( printf(
@ -115,7 +117,9 @@ main(int argc, char** argv, char **env_c)
"This cache is stored in '%s' in the users GNUstep directory.\n" "This cache is stored in '%s' in the users GNUstep directory.\n"
"\n" "\n"
"You may use 'make_services --test filename' to test that the property list\n" "You may use 'make_services --test filename' to test that the property list\n"
"in 'filename' contains a valid services definition.\n", [cacheName cString]); "in 'filename' contains a valid services definition.\n"
"You may use 'make_services --verbose' to produce descriptive output.\n",
[cacheName cString]);
exit(0); exit(0);
} }
if ([[args objectAtIndex: index] isEqual: @"--test"]) if ([[args objectAtIndex: index] isEqual: @"--test"])
@ -186,9 +190,13 @@ main(int argc, char** argv, char **env_c)
*/ */
str = [env objectForKey: @"GNUSTEP_USER_ROOT"]; str = [env objectForKey: @"GNUSTEP_USER_ROOT"];
if (str != nil) if (str != nil)
usrRoot = str; {
usrRoot = str;
}
else else
usrRoot = [sClass stringWithFormat: @"%@/GNUstep", NSHomeDirectory()]; {
usrRoot = [sClass stringWithFormat: @"%@/GNUstep", NSHomeDirectory()];
}
mgr = [NSFileManager defaultManager]; mgr = [NSFileManager defaultManager];
if (([mgr fileExistsAtPath: usrRoot isDirectory: &isDir] && isDir) == 0) if (([mgr fileExistsAtPath: usrRoot isDirectory: &isDir] && isDir) == 0)
@ -220,25 +228,35 @@ main(int argc, char** argv, char **env_c)
* Ensure that the user root (or default user root) is in the path. * Ensure that the user root (or default user root) is in the path.
*/ */
if ([roots containsObject: str] == NO) if ([roots containsObject: str] == NO)
[roots addObject: str]; {
[roots addObject: str];
}
/* /*
* Ensure that the local root (or default local root) is in the path. * Ensure that the local root (or default local root) is in the path.
*/ */
str = [env objectForKey: @"GNUSTEP_LOCAL_ROOT"]; str = [env objectForKey: @"GNUSTEP_LOCAL_ROOT"];
if (str == nil) if (str == nil)
str = @"/usr/GNUstep/Local"; {
str = @"/usr/GNUstep/Local";
}
if ([roots containsObject: str] == NO) if ([roots containsObject: str] == NO)
[roots addObject: str]; {
[roots addObject: str];
}
/* /*
* Ensure that the system root (or default system root) is in the path. * Ensure that the system root (or default system root) is in the path.
*/ */
str = [env objectForKey: @"GNUSTEP_SYSTEM_ROOT"]; str = [env objectForKey: @"GNUSTEP_SYSTEM_ROOT"];
if (str == nil) if (str == nil)
str = @"/usr/GNUstep"; {
str = @"/usr/GNUstep";
}
if ([roots containsObject: str] == NO) if ([roots containsObject: str] == NO)
[roots addObject: str]; {
[roots addObject: str];
}
} }
/* /*
@ -455,9 +473,9 @@ scanDirectory(NSMutableDictionary *services, NSString *path)
NSString *newPath; NSString *newPath;
BOOL isDir; BOOL isDir;
if (ext != nil && if (ext != nil
([ext isEqualToString: @"app"] || [ext isEqualToString: @"debug"] && ([ext isEqualToString: @"app"] || [ext isEqualToString: @"debug"]
|| [ext isEqualToString: @"profile"])) || [ext isEqualToString: @"profile"]))
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
@ -482,7 +500,7 @@ scanDirectory(NSMutableDictionary *services, NSString *path)
* precedence. * precedence.
*/ */
NSLog(@"duplicate app (%@) at '%@' and '%@'\n", NSLog(@"duplicate app (%@) at '%@' and '%@'\n",
name, oldPath, newPath); name, oldPath, newPath);
continue; continue;
} }
@ -652,7 +670,7 @@ validateEntry(id svcs, NSString *path)
else else
{ {
NSLog(@"NSServices entry %u not a dictionary - %@\n", NSLog(@"NSServices entry %u not a dictionary - %@\n",
pos, path); pos, path);
} }
} }
return newServices; return newServices;
@ -712,7 +730,8 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
{ {
if ([obj isKindOfClass: sClass] == NO) if ([obj isKindOfClass: sClass] == NO)
{ {
NSLog(@"NSServices entry %u field %@ is not a string - %@\n", pos, k, path); NSLog(@"NSServices entry %u field %@ is not a string "
@"- %@\n", pos, k, path);
return nil; return nil;
} }
[result setObject: obj forKey: k]; [result setObject: obj forKey: k];
@ -723,13 +742,15 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
if ([obj isKindOfClass: aClass] == NO) if ([obj isKindOfClass: aClass] == NO)
{ {
NSLog(@"NSServices entry %u field %@ is not an array - %@\n", pos, k, path); NSLog(@"NSServices entry %u field %@ is not an array "
@"- %@\n", pos, k, path);
return nil; return nil;
} }
a = (NSArray*)obj; a = (NSArray*)obj;
if ([a count] == 0) if ([a count] == 0)
{ {
NSLog(@"NSServices entry %u field %@ is an empty array - %@\n", pos, k, path); NSLog(@"NSServices entry %u field %@ is an empty array "
@"- %@\n", pos, k, path);
} }
else else
{ {
@ -739,7 +760,8 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
{ {
if ([[a objectAtIndex: i] isKindOfClass: sClass] == NO) if ([[a objectAtIndex: i] isKindOfClass: sClass] == NO)
{ {
NSLog(@"NSServices entry %u field %@ element %u is not a string - %@\n", pos, k, i, path); NSLog(@"NSServices entry %u field %@ element %u is "
@"not a string - %@\n", pos, k, i, path);
return nil; return nil;
} }
} }
@ -752,13 +774,15 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
if ([obj isKindOfClass: dClass] == NO) if ([obj isKindOfClass: dClass] == NO)
{ {
NSLog(@"NSServices entry %u field %@ is not a dictionary - %@\n", pos, k, path); NSLog(@"NSServices entry %u field %@ is not a dictionary "
@"- %@\n", pos, k, path);
return nil; return nil;
} }
d = (NSDictionary*)obj; d = (NSDictionary*)obj;
if ([d objectForKey: @"default"] == nil) if ([d objectForKey: @"default"] == nil)
{ {
NSLog(@"NSServices entry %u field %@ has no default value - %@\n", pos, k, path); NSLog(@"NSServices entry %u field %@ has no default value "
@"- %@\n", pos, k, path);
} }
else else
{ {
@ -768,7 +792,8 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
{ {
if ([obj isKindOfClass: sClass] == NO) if ([obj isKindOfClass: sClass] == NO)
{ {
NSLog(@"NSServices entry %u field %@ contains non-string value - %@\n", pos, k, path); NSLog(@"NSServices entry %u field %@ contains "
@"non-string value - %@\n", pos, k, path);
return nil; return nil;
} }
} }
@ -835,7 +860,9 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
if (used == NO) if (used == NO)
{ {
if (verbose) if (verbose)
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result); {
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result);
}
return nil; /* Ignore - already got service with this name */ return nil; /* Ignore - already got service with this name */
} }
} }
@ -898,7 +925,9 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
if (used == NO) if (used == NO)
{ {
if (verbose) if (verbose)
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result); {
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result);
}
return nil; /* Ignore - already got filter for types. */ return nil; /* Ignore - already got filter for types. */
} }
} }
@ -939,7 +968,9 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
if (used == NO) if (used == NO)
{ {
if (verbose) if (verbose)
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result); {
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result);
}
return nil; /* Ignore - already got filter with this name */ return nil; /* Ignore - already got filter with this name */
} }
} }
@ -972,7 +1003,9 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
if (used == NO) if (used == NO)
{ {
if (verbose) if (verbose)
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result); {
NSLog(@"Ignoring entry %u in %@ -\n%@\n", pos, path, result);
}
return nil; /* Ignore - already got speller with language. */ return nil; /* Ignore - already got speller with language. */
} }
} }