mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 08:21:25 +00:00
Allow listing of tools
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10624 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d8ebb20e61
commit
31d2bf6598
4 changed files with 32 additions and 12 deletions
|
@ -512,6 +512,7 @@ NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory directoryKey,
|
|||
NSString *devDir = @"Developer";
|
||||
NSString *libraryDir = @"Library";
|
||||
NSString *libsDir = @"Libraries";
|
||||
NSString *toolsDir = @"Tools";
|
||||
NSString *docDir = @"Documentation";
|
||||
NSMutableArray *paths = [NSMutableArray new];
|
||||
NSString *path;
|
||||
|
@ -563,7 +564,7 @@ if (domainMask & mask) \
|
|||
{
|
||||
NSString *devAppsDir = [devDir stringByAppendingPathComponent: appsDir];
|
||||
|
||||
/* FIXME - why not NSUserDomainMask ? */
|
||||
ADD_PATH (NSUserDomainMask, gnustep_local_root, devAppsDir);
|
||||
ADD_PATH (NSLocalDomainMask, gnustep_local_root, devAppsDir);
|
||||
ADD_PATH (NSNetworkDomainMask, gnustep_network_root, devAppsDir);
|
||||
ADD_PATH (NSSystemDomainMask, gnustep_system_root, devAppsDir);
|
||||
|
@ -571,8 +572,8 @@ if (domainMask & mask) \
|
|||
if (directoryKey == NSAdminApplicationDirectory
|
||||
|| directoryKey == NSAllApplicationsDirectory)
|
||||
{
|
||||
NSString *devAdminDir = [devDir stringByAppendingPathComponent:
|
||||
adminDir];
|
||||
NSString *devAdminDir = [devDir stringByAppendingPathComponent: adminDir];
|
||||
|
||||
/* FIXME - NSUserDomainMask ? - users have no Administrator directory */
|
||||
ADD_PATH (NSLocalDomainMask, gnustep_local_root, devAdminDir);
|
||||
ADD_PATH (NSNetworkDomainMask, gnustep_network_root, devAdminDir);
|
||||
|
@ -588,7 +589,7 @@ if (domainMask & mask) \
|
|||
}
|
||||
if (directoryKey == NSDeveloperDirectory)
|
||||
{
|
||||
/* FIXME - why not NSUserDomainMask ? */
|
||||
ADD_PATH (NSUserDomainMask, gnustep_local_root, devDir);
|
||||
ADD_PATH (NSLocalDomainMask, gnustep_local_root, devDir);
|
||||
ADD_PATH (NSNetworkDomainMask, gnustep_network_root, devDir);
|
||||
ADD_PATH (NSSystemDomainMask, gnustep_system_root, devDir);
|
||||
|
@ -616,6 +617,13 @@ if (domainMask & mask) \
|
|||
ADD_PATH (NSNetworkDomainMask, gnustep_network_root, libsDir);
|
||||
ADD_PATH (NSSystemDomainMask, gnustep_system_root, libsDir);
|
||||
}
|
||||
if (directoryKey == GSToolsDirectory)
|
||||
{
|
||||
ADD_PATH (NSUserDomainMask, gnustep_user_root, toolsDir);
|
||||
ADD_PATH (NSLocalDomainMask, gnustep_local_root, toolsDir);
|
||||
ADD_PATH (NSNetworkDomainMask, gnustep_network_root, toolsDir);
|
||||
ADD_PATH (NSSystemDomainMask, gnustep_system_root, toolsDir);
|
||||
}
|
||||
#undef ADD_PATH
|
||||
|
||||
fm = [NSFileManager defaultManager];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue