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

Disabled versioning support for framework on Mingw (win32)

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21465 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-07-13 14:51:57 +00:00
parent 2d2a635967
commit ce3770a02c
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-07-13 Nicola Pero <n.pero@mi.flashnet.it>
* Source/NSBundle.m: When building paths inside framework
directories on Mingw (win32), don't add /Versions/%@; the new
pseudo-framework support for Mingw does not support framework
versioning.
2005-07-12 Nicola Pero <n.pero@mi.flashnet.it>
* Source/NSBundle.m ([+_addFrameworkFromClass:]),

18
Source/NSBundle.m
View file

@ -373,6 +373,8 @@ _find_framework(NSString *name)
{
bundlePath = [bundlePath stringByDeletingLastPathComponent];
}
/* There are no Versions on MinGW. Skip the Versions check here. */
#if !defined(__MINGW__)
/* version name */
bundlePath = [bundlePath stringByDeletingLastPathComponent];
@ -380,6 +382,7 @@ _find_framework(NSString *name)
if ([pathComponent isEqual: @"Versions"])
{
bundlePath = [bundlePath stringByDeletingLastPathComponent];
#endif
pathComponent = [bundlePath lastPathComponent];
if ([pathComponent isEqualToString:
@ -389,7 +392,9 @@ _find_framework(NSString *name)
/* Try creating the bundle. */
bundle = [[self alloc] initWithPath: bundlePath];
}
#if !defined(__MINGW__)
}
#endif
/* Failed - buu - try the fallback trick. */
if (bundle == nil)
@ -1580,7 +1585,11 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
mangledName = [mangledName stringByReplacingString: @"+"
withString: @"_1"];
#if !defined(__MINGW__)
path = [_path stringByAppendingPathComponent:@"Versions/Current"];
#else
path = _path;
#endif
_currentFrameworkName = RETAIN(([NSString stringWithFormat:
@"NSFramework_%@",
@ -1604,9 +1613,14 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (_bundleType == NSBUNDLE_FRAMEWORK)
{
#if !defined(__MINGW__)
return [_path stringByAppendingPathComponent:
[NSString stringWithFormat:@"Versions/%@/Resources",
version]];
#else
/* No Versions (that require symlinks) on MINGW */
return [_path stringByAppendingPathComponent: @"Resources"];
#endif
}
else
{
@ -1650,9 +1664,13 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (_bundleType == NSBUNDLE_FRAMEWORK)
{
#if !defined(__MINGW__)
return [_path stringByAppendingPathComponent:
[NSString stringWithFormat:@"Versions/%@/PlugIns",
version]];
#else
return [_path stringByAppendingPathComponent: @"PlugIns"];
#endif
}
else
{