gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing directory key GSAdminTools

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24811 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-03-08 02:32:18 +00:00
parent 8d4cc1374c
commit c632fa6fb5
3 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-03-08 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/NSPathUtilities.h (GSAdminToolsDirectory): New directory
key.
* Source/NSPathUtilities.m: Implemented it.
2007-03-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSHTTPURLHandle.m: Mimic MacOS-X behavior and cancel loading

4
Headers/Foundation/NSPathUtilities.h
View file

@ -133,6 +133,7 @@ GS_EXPORT NSString *NSHomeDirectoryForUser(NSString *loginName);
NSAllLibrariesDirectory,
GSLibrariesDirectory,
GSToolsDirectory,
GSAdminToolsDirectory,
GSFontsDirectory,
GSFrameworksDirectory,
GSWebApplicationsDirectory
@ -172,7 +173,8 @@ typedef enum
GSToolsDirectory, /** non-gui programs */
GSFontsDirectory, /** font storage */
GSFrameworksDirectory, /** frameworks */
GSWebApplicationsDirectory /** web applications (GSWeb or SOPE) */
GSWebApplicationsDirectory, /** web applications (GSWeb or SOPE) */
GSAdminToolsDirectory /** admin non-gui programs */
} NSSearchPathDirectory;
/**

34
Source/NSPathUtilities.m
View file

@ -1904,6 +1904,40 @@ if (domainMask & mask) \
}
break;
case GSAdminToolsDirectory:
{
NSString *full = nil;
NSString *part = nil;
if ([gnustep_is_flattened boolValue] == NO
&& gnustep_target_cpu != nil && gnustep_target_os != nil)
{
part = [gnustep_target_cpu stringByAppendingPathComponent:
gnustep_target_os];
if (library_combo != nil)
{
full = [part stringByAppendingPathComponent: library_combo];
}
}
ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminTools);
if (full) ADD_PATH(NSUserDomainMask, gnustepUserAdminTools, full);
if (part) ADD_PATH(NSUserDomainMask, gnustepUserAdminTools, part);
ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminTools);
if (full) ADD_PATH(NSLocalDomainMask, gnustepLocalAdminTools, full);
if (part) ADD_PATH(NSLocalDomainMask, gnustepLocalAdminTools, part);
ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminTools);
if (full) ADD_PATH(NSNetworkDomainMask, gnustepNetworkAdminTools, full);
if (part) ADD_PATH(NSNetworkDomainMask, gnustepNetworkAdminTools, part);
ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminTools);
if (full) ADD_PATH(NSSystemDomainMask, gnustepSystemAdminTools, full);
if (part) ADD_PATH(NSSystemDomainMask, gnustepSystemAdminTools, part);
}
break;
case GSWebApplicationsDirectory:
{
ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserWebApps);