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

improve definition/detection of mingw/msys

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37601 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-01-14 07:21:10 +00:00
parent b955c25bb1
commit 9dc6cb8ef2
3 changed files with 89 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,11 @@
2014-01-14 Richard Frith-Macdonald <rfm@gnu.org>
* Source\NSPathUtilities.m:
* Documentation\Base.gsdoc:
Add GNUSTEP_DEVELOPER_DIR to allow definition of the native path
to the msys/mingw development tools on windows.
Also improve/fix lookup heuristics.
2014-01-13 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: Revert last change to get -isAbsolutePath working
@ -23,10 +31,10 @@
* Source/NSPathUtilities.m: The NSDeveloperDirectory key is deprecated
on OSX, but lets use it for the development system root.
On windows systems this should be the root of the msys filesystem
found relative to the current process if possible, but otherwise
with the GNUstep packages installed, found relative to the
installation directory.
On windows systems this should be the native windows path at which
the msys system is installed, found relative to the current process
if possible, but otherwise with the GNUstep packages installed,
found relative to the package installation directory.
In other cases (no specific development environment found) the
system root directory is returned.

31
Documentation/Base.gsdoc
View file

@ -416,13 +416,16 @@ notice and this notice are preserved.
<term>HOMEDRIVE</term>
<desc>
<p>
Used on ms-windows to locate the home directory.
Used on ms-windows to locate the home directory if the
HOMEPATH environment variable is also used.
</p>
</desc>
<term>HOMEPATH</term>
<desc>
<p>
Used on ms-windows to locate the home directory.
Used on ms-windows to locate the home directoryb in
conjunction with HOMEDRIVE. If this is just a backslash
then the USERPROFILE variable is used if possible.
</p>
</desc>
<term>LANGUAGES</term>
@ -506,6 +509,14 @@ notice and this notice are preserved.
mechanism is to use the 'Local Time Zone' value from the
user defaults system.
</p>
<term>USERPROFILE</term>
<desc>
<p>
Used on windows to identify the home directory of the
current used (unless HOMEPATH and HOMEDRIVE are set to
point to an individual user's home).
</p>
</desc>
</deflist>
@ -521,7 +532,10 @@ notice and this notice are preserved.
configured and/or what operating system it was configured on.
On a GNU/Linux system, the default would be
/etc/GNUstep/GNUstep.conf for instance, while on mswindows
it would be ./GNUstep.conf.
it would be ./GNUstep.conf (the leading './' here indicates
that the file is located relative to the base library, on
windows this is the location of the base library DLL, which
is normally the same location as command line tools).
</p>
<p>
If setting up GNUstep in a sandbox for packaging it as part
@ -542,8 +556,8 @@ notice and this notice are preserved.
(ie in a target/deployment environment).<br />
In particular it is normal for the two files to differ on
mswindows (where the build environment is an UNIX-like MSYS
shell, using unix style paths, but the deployment environment
is native-windows using windows style paths).
shell, using the its own paths, but the deployment environment
is native-windows using real windows paths).
</p>
<p>
The location of the GNUstep configuration file can be specified
@ -642,6 +656,13 @@ notice and this notice are preserved.
'%i' is replaced by the user ID<br />
'%%' is replaced by a single '%'<br />
</p>
<p>
The GNUSTEP_DEVELOPER_DIR path may be used to specify where
the development system is located. On most systems this
should be the default value of '/', but on windows it should
be the location of the msys/mingw filesystem (so that msys
development tools can be found).
</p>
<p>
Other paths for each user are defined by the following:
</p>

124
Source/NSPathUtilities.m
View file

@ -200,6 +200,8 @@ static NSString *gnustepUserDocumentation = nil;
static NSString *gnustepUserDocumentationInfo = nil;
static NSString *gnustepUserDocumentationMan = nil;
static NSString *gnustepDeveloperDir = nil;
/* These are the same as the corresponding User variables, but
* they hold the path before GNUSTEP_HOME is prepended. It's what
* we read from config files.
@ -396,7 +398,7 @@ getPathConfig(NSDictionary *dict, NSString *key)
NSLog(@"GNUstep configuration file entry '%@' ('%@') is not "
@"an absolute path. Please fix your configuration file",
key, [dict objectForKey: key]);
#if defined(__MINGW32_)
#if defined(__MINGW_)
if ([path length] > 2)
{
unichar buf[3];
@ -433,6 +435,9 @@ static void ExtractValuesFromConfig(NSDictionary *config)
ASSIGN_PATH(gnustepMakefiles, c,
@"GNUSTEP_MAKEFILES");
ASSIGN_PATH(gnustepDeveloperDir, c,
@"GNUSTEP_DEVELOPER_DIR");
ASSIGN_PATH(gnustepSystemUsersDir, c,
@"GNUSTEP_SYSTEM_USERS_DIR");
ASSIGN_PATH(gnustepNetworkUsersDir, c,
@ -979,7 +984,7 @@ GNUstepConfig(NSDictionary *newConfig)
@"an absolute path. Please rebuild GNUstep-base "
@"specifying a valid path to the config file.", file);
}
#if defined(__MINGW32_)
#if defined(__MINGW_)
if ([file length] > 2)
{
unichar buf[3];
@ -1254,6 +1259,8 @@ static void ShutdownPathUtilities(void)
DESTROY(gnustepLocalDocumentationMan);
DESTROY(gnustepLocalDocumentationInfo);
DESTROY(gnustepDeveloperDir);
DESTROY(gnustepUserApps);
DESTROY(gnustepUserAdminApps);
DESTROY(gnustepUserWebApps);
@ -2093,8 +2100,8 @@ NSOpenStepRootDirectory(void)
#if defined(__MINGW__)
/* The developer root on a windows system (where we have an msys environment
* set up) is the point in the filesystem where we can reference bin/make ...
* simple heuristic to let us find the native windows path to the msys root.
* set up) is the point in the filesystem where we can reference make.exe via
* msys/.../bin/. That is, it's the windows path at which msys is installed.
*/
static NSString*
devroot(NSFileManager *manager, NSString *path)
@ -2104,66 +2111,38 @@ devroot(NSFileManager *manager, NSString *path)
while (NO == [tmp isEqual: path])
{
NSString *pb;
NSString *msys;
BOOL isDir;
pb = [path stringByAppendingPathComponent: @"bin/make.exe"];
if ([manager isExecutableFileAtPath: pb])
msys = [path stringByAppendingPathComponent: @"msys"];
if (YES == [manager fileExistsAtPath: msys isDirectory: &isDir]
&& YES == isDir)
{
return path;
}
tmp = path;
path = [tmp stringByDeletingLastPathComponent];
}
NSEnumerator *e;
NSString *file;
return nil;
}
/* Like devroot(), but also checks for msys/version subdirectories
* as found inside the GNUstep windows package installations.
*/
static NSString*
idevroot(NSFileManager *manager, NSString *path)
{
NSString *pb;
NSString *tmp;
NSString *msys;
BOOL isDir;
if (nil != (tmp = devroot(manager, path)))
{
return tmp;
}
msys = [path stringByAppendingPathComponent: @"msys"];
if (YES == [manager fileExistsAtPath: msys isDirectory: &isDir]
&& YES == isDir)
{
NSEnumerator *e;
NSString *best = nil;
NSString *file;
float maxVersion = 0.0;
e = [[manager directoryContentsAtPath: msys] objectEnumerator];
while (nil != (file = [e nextObject]))
{
if (isdigit([file characterAtIndex: 0]))
e = [[manager directoryContentsAtPath: msys] objectEnumerator];
while (nil != (file = [e nextObject]))
{
float v = atof([file UTF8String]);
if (isdigit([file characterAtIndex: 0]))
{
float v = atof([file UTF8String]);
if (v <= maxVersion)
{
continue;
}
file = [msys stringByAppendingPathComponent: file];
pb = [file stringByAppendingPathComponent: @"bin/make.exe"];
if ([manager isExecutableFileAtPath: pb])
{
best = file;
if (v <= 0)
{
continue;
}
file = [msys stringByAppendingPathComponent: file];
pb = [file stringByAppendingPathComponent: @"bin/make.exe"];
if ([manager isExecutableFileAtPath: pb])
{
return path;
}
}
}
}
if (nil != best)
{
return [best stringByStandardizingPath];
}
tmp = path;
path = [tmp stringByDeletingLastPathComponent];
}
return nil;
}
@ -2308,10 +2287,8 @@ if (domainMask & mask) \
case NSDeveloperDirectory:
{
static NSString *root = nil;
#if defined(__MINGW__)
if (nil == root)
if (nil == gnustepDeveloperDir)
{
NSString *path = nil;
NSString *bpath = nil;
@ -2321,10 +2298,10 @@ if (domainMask & mask) \
mgr = [NSFileManager defaultManager];
/* First see if we can find the developer root above the
/* See if we can find the developer root above the
* system tools directory of the current running process.
*/
path = devroot(mgr, gnustepSystemTools);
path = devroot(mgr, gnustepSystemTools);
/* Failing that, try looking above the base library.
*/
@ -2382,7 +2359,7 @@ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\GNUstep",
ipath = [NSString stringWithCharacters: buf
length: wcslen(buf)];
path = idevroot(mgr, ipath);
path = devroot(mgr, ipath);
}
RegCloseKey(regKey);
}
@ -2395,31 +2372,32 @@ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\GNUstep",
path = devroot(mgr, mpath);
}
}
ASSIGNCOPY(root, path);
if (nil == root)
ASSIGNCOPY(gnustepDeveloperDir, path);
if (nil == gnustepDeveloperDir)
{
NSLog(@"Failed to locate NSDeveloperDirectory by GNUstep configuration, installed GNUstep package, or process PATH.");
}
}
#endif
if (nil == root)
if (nil == gnustepDeveloperDir)
{
root = RETAIN(NSOpenStepRootDirectory());
gnustepDeveloperDir = RETAIN(NSOpenStepRootDirectory());
}
/* The Developer directory is deprecated on OSX, but for GNUstep
* specific apps we return the root of the system containing the
* development environment. On most systems, that's the root
* directory, but on windows it can be anywhere the user has put it.
* If not found relative to the hierarchy of the running process,
* with the GNUstep package installed, it's the location of the
* msys filesystem within the GNUstep package installation.
* If not explicitly defined, or found relative to the hierarchy
* of the running process, *with the GNUstep package installed it's
* the location of the msys filesystem within the GNUstep package
* installation.
*/
ADD_PLATFORM_PATH(NSUserDomainMask, root);
ADD_PLATFORM_PATH(NSLocalDomainMask, root);
ADD_PLATFORM_PATH(NSNetworkDomainMask, root);
ADD_PLATFORM_PATH(NSSystemDomainMask, root);
ADD_PLATFORM_PATH(NSUserDomainMask, gnustepDeveloperDir);
ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepDeveloperDir);
ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepDeveloperDir);
ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepDeveloperDir);
}
break;