File/installation paths: osx (cocoa & carbon) update in ghost
This commit is contained in:
parent
78adaa6bc7
commit
dd724f2826
@ -45,8 +45,7 @@ extern const GHOST_TUns8* GHOST_getSystemDir();
|
||||
|
||||
/**
|
||||
* Determine the base dir in which user configuration is stored, not including versioning.
|
||||
* If needed, it will create the base directory.
|
||||
* @return Unsigned char string pointing to user dir (eg ~/.blender/).
|
||||
* @return Unsigned char string pointing to user dir (eg ~).
|
||||
*/
|
||||
extern const GHOST_TUns8* GHOST_getUserDir();
|
||||
|
||||
|
@ -1238,5 +1238,15 @@ const GHOST_TUns8* GHOST_SystemCarbon::getUserDir() const
|
||||
|
||||
const GHOST_TUns8* GHOST_SystemCarbon::getBinaryDir() const
|
||||
{
|
||||
return NULL;
|
||||
CFURLRef bundleURL;
|
||||
CFStringRef pathStr;
|
||||
static char path[256];
|
||||
CFBundleRef mainBundle = CFBundleGetMainBundle();
|
||||
|
||||
bundleURL = CFBundleCopyBundleURL(mainBundle);
|
||||
pathStr = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);
|
||||
CFStringGetCString(pathStr, path, 255, kCFStringEncodingASCII);
|
||||
CFRelease(pathStr);
|
||||
CFRelease(bundleURL);
|
||||
return (GHOST_TUns8*)path;
|
||||
}
|
||||
|
@ -1783,27 +1783,20 @@ void GHOST_SystemCocoa::putClipboard(GHOST_TInt8 *buffer, bool selection) const
|
||||
|
||||
#pragma mark Base directories retrieval
|
||||
|
||||
// TODO: this should only return base path, remove the appending of Blender or .blender
|
||||
const GHOST_TUns8* GHOST_SystemCocoa::getSystemDir() const
|
||||
{
|
||||
static GHOST_TUns8 tempPath[512] = "";
|
||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||
NSFileManager *fileManager;
|
||||
NSString *basePath;
|
||||
NSArray *paths;
|
||||
|
||||
paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSLocalDomainMask, YES);
|
||||
|
||||
if ([paths count] > 0)
|
||||
basePath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Blender"];
|
||||
else { //Fall back to standard unix path in case of issue
|
||||
basePath = @"/usr/share/blender";
|
||||
}
|
||||
|
||||
/* Ensure path exists, creates it if needed */
|
||||
fileManager = [NSFileManager defaultManager];
|
||||
if (![fileManager fileExistsAtPath:basePath isDirectory:NULL]) {
|
||||
[fileManager createDirectoryAtPath:basePath attributes:nil];
|
||||
basePath = [paths objectAtIndex:0];
|
||||
else {
|
||||
[pool drain];
|
||||
return NULL;
|
||||
}
|
||||
|
||||
strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]);
|
||||
@ -1812,56 +1805,39 @@ const GHOST_TUns8* GHOST_SystemCocoa::getSystemDir() const
|
||||
return tempPath;
|
||||
}
|
||||
|
||||
// TODO: this should only return base path, remove the appending of Blenbder or .blender
|
||||
const GHOST_TUns8* GHOST_SystemCocoa::getUserDir() const
|
||||
{
|
||||
static GHOST_TUns8 tempPath[512] = "";
|
||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||
NSFileManager *fileManager;
|
||||
NSString *basePath;
|
||||
NSArray *paths;
|
||||
|
||||
paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
|
||||
|
||||
if ([paths count] > 0)
|
||||
basePath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Blender"];
|
||||
else { //Fall back to HOME in case of issue
|
||||
basePath = [NSHomeDirectory() stringByAppendingPathComponent:@".blender"];
|
||||
basePath = [paths objectAtIndex:0];
|
||||
else {
|
||||
[pool drain];
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Ensure path exists, creates it if needed */
|
||||
fileManager = [NSFileManager defaultManager];
|
||||
if (![fileManager fileExistsAtPath:basePath isDirectory:NULL]) {
|
||||
[fileManager createDirectoryAtPath:basePath attributes:nil];
|
||||
}
|
||||
|
||||
|
||||
strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]);
|
||||
|
||||
[pool drain];
|
||||
return tempPath;
|
||||
}
|
||||
|
||||
// TODO: this is same as getUserDir for now
|
||||
const GHOST_TUns8* GHOST_SystemCocoa::getBinaryDir() const
|
||||
{
|
||||
static GHOST_TUns8 tempPath[512] = "";
|
||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||
NSFileManager *fileManager;
|
||||
NSString *basePath;
|
||||
NSArray *paths;
|
||||
|
||||
paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
|
||||
|
||||
if ([paths count] > 0)
|
||||
basePath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Blender"];
|
||||
else { //Fall back to HOME in case of issue
|
||||
basePath = [NSHomeDirectory() stringByAppendingPathComponent:@".blender"];
|
||||
}
|
||||
|
||||
/* Ensure path exists, creates it if needed */
|
||||
fileManager = [NSFileManager defaultManager];
|
||||
if (![fileManager fileExistsAtPath:basePath isDirectory:NULL]) {
|
||||
[fileManager createDirectoryAtPath:basePath attributes:nil];
|
||||
basePath = [[NSBundle mainBundle] bundlePath];
|
||||
|
||||
if (basePath == nil) {
|
||||
[pool drain];
|
||||
return NULL;
|
||||
}
|
||||
|
||||
strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]);
|
||||
|
Loading…
Reference in New Issue
Block a user