2002-03-06 23:13:23 +00:00
|
|
|
/** GSWDeployedBundle.m - <title>GSWeb: Class GSWDeployedBundle</title>
|
2002-08-04 18:00:11 +00:00
|
|
|
|
2002-03-06 23:13:23 +00:00
|
|
|
Copyright (C) 1999-2002 Free Software Foundation, Inc.
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-03-06 23:13:23 +00:00
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
2000-01-22 12:49:49 +00:00
|
|
|
Date: Mar 1999
|
|
|
|
|
2002-03-06 23:13:23 +00:00
|
|
|
$Revision$
|
|
|
|
$Date$
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-03-06 23:13:23 +00:00
|
|
|
<abstract></abstract>
|
|
|
|
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
|
|
|
|
<license>
|
2000-01-22 12:49:49 +00:00
|
|
|
This library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with this library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
2002-03-06 23:13:23 +00:00
|
|
|
</license>
|
|
|
|
**/
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
static char rcsId[] = "$Id$";
|
|
|
|
|
2000-10-30 15:36:50 +00:00
|
|
|
#include <GSWeb/GSWeb.h>
|
2001-10-27 10:27:33 +00:00
|
|
|
//#include <pthread.h>
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWDeployedBundle
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(id)initWithPath:(NSString*)aPath
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
|
|
|
if ((self=[super init]))
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"aPath=%@",aPath);
|
|
|
|
ASSIGN(_bundlePath,[aPath stringGoodPath]);
|
|
|
|
NSDebugMLLog(@"bundles",@"_bundlePath=%@",_bundlePath);
|
|
|
|
_relativePathsCache=[GSWMultiKeyDictionary new];
|
2000-01-22 12:49:49 +00:00
|
|
|
#ifndef NDEBUG
|
2002-08-04 18:00:11 +00:00
|
|
|
_creation_thread_id=objc_thread_id();
|
2000-01-22 12:49:49 +00:00
|
|
|
#endif
|
2002-08-04 18:00:11 +00:00
|
|
|
_selfLock=[NSRecursiveLock new];
|
2000-01-22 12:49:49 +00:00
|
|
|
/*
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLog(@"selfLock->mutex=%p",(void*)selfLock->mutex);
|
|
|
|
NSDebugMLog(@"selfLock->mutex backend=%p",(void*)((pthread_mutex_t*)(selfLock->mutex->backend)));
|
|
|
|
NSDebugMLog(@"selfLock->mutex backend m_owner=%p",
|
|
|
|
(void*)(((pthread_mutex_t*)(selfLock->mutex->backend))->m_owner));
|
|
|
|
NSDebugMLog(@"selfLock->mutex backend m_count=%p",(void*)(((pthread_mutex_t*)(selfLock->mutex->backend))->m_count));
|
|
|
|
NSDebugMLog(@"selfLock->mutex backend m_kind=%p",(void*)(((pthread_mutex_t*)(selfLock->mutex->backend))->m_kind));
|
|
|
|
NSDebugMLog(@"selfLock->mutex backend m_spinlock=%p",(void*)(((pthread_mutex_t*)(selfLock->mutex->backend))->m_spinlock));
|
2000-01-22 12:49:49 +00:00
|
|
|
*/
|
2002-08-04 18:00:11 +00:00
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
return self;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(void)dealloc
|
|
|
|
{
|
|
|
|
NSDebugFLog(@"Dealloc GSWDeployedBundle %p",(void*)self);
|
2002-08-04 18:00:11 +00:00
|
|
|
DESTROY(_bundlePath);
|
|
|
|
DESTROY(_relativePathsCache);
|
2000-01-22 12:49:49 +00:00
|
|
|
GSWLogC("Dealloc GSWDeployedBundle: selfLock");
|
|
|
|
NSDebugFLog(@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p creation_thread_id=%p",
|
2002-08-04 18:00:11 +00:00
|
|
|
(void*)_selfLock,
|
|
|
|
_selfLockn,
|
|
|
|
(void*)_selfLock_thread_id,
|
|
|
|
(void*)objc_thread_id(),
|
|
|
|
(void*)_creation_thread_id);
|
2000-01-22 12:49:49 +00:00
|
|
|
fflush(stderr);
|
2002-08-04 18:00:11 +00:00
|
|
|
DESTROY(_selfLock);
|
2000-01-22 12:49:49 +00:00
|
|
|
GSWLogC("Dealloc GSWDeployedBundle Super");
|
|
|
|
[super dealloc];
|
|
|
|
NSDebugFLog(@"End Dealloc GSWDeployedBundle %p",(void*)self);
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)description
|
|
|
|
{
|
|
|
|
NSString* descr=nil;
|
|
|
|
// GSWLogC("GSWDeployedBundle description A");
|
|
|
|
descr=[NSString stringWithFormat:@"<%s %p - ",
|
2002-08-04 18:00:11 +00:00
|
|
|
object_get_class_name(self),
|
|
|
|
(void*)self];
|
2000-01-22 12:49:49 +00:00
|
|
|
// GSWLogC("GSWDeployedBundle description B");
|
|
|
|
descr=[descr stringByAppendingFormat:@"bundlePath:%@ ",
|
2002-08-04 18:00:11 +00:00
|
|
|
_bundlePath];
|
2000-01-22 12:49:49 +00:00
|
|
|
// GSWLogC("GSWDeployedBundle description C");
|
|
|
|
descr=[descr stringByAppendingFormat:@"relativePathsCache=%p>",
|
2002-08-04 18:00:11 +00:00
|
|
|
(void*)_relativePathsCache];
|
2000-01-22 12:49:49 +00:00
|
|
|
// GSWLogC("GSWDeployedBundle description D");
|
|
|
|
return descr;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(GSWProjectBundle*)projectBundle
|
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* projectName=nil;
|
|
|
|
BOOL isFramework=NO;
|
|
|
|
GSWDeployedBundle* projectBundle=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
projectName=[self projectName];
|
|
|
|
NSDebugMLLog(@"bundles",@"projectName=%@",projectName);
|
|
|
|
isFramework=[self isFramework];
|
|
|
|
NSDebugMLLog(@"bundles",@"isFramework=%s",(isFramework ? "YES" : "NO"));
|
|
|
|
projectBundle=[GSWProjectBundle projectBundleForProjectNamed:projectName
|
|
|
|
isFramework:isFramework];
|
|
|
|
NSDebugMLLog(@"bundles",@"projectBundle=%@",projectBundle);
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return (GSWProjectBundle*)projectBundle;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(BOOL)isFramework
|
|
|
|
{
|
|
|
|
//OK ??
|
2002-08-04 18:00:11 +00:00
|
|
|
return [_bundlePath hasSuffix:GSFrameworkSuffix];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)wrapperName
|
|
|
|
{
|
|
|
|
//OK ?
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* projectName=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"_bundlePath=%@",_bundlePath);
|
|
|
|
projectName=[_bundlePath lastPathComponent];
|
|
|
|
NSDebugMLLog(@"bundles",@"projectName=%@",projectName);
|
|
|
|
projectName=[projectName stringByDeletingPathExtension];
|
|
|
|
NSDebugMLLog(@"bundles",@"projectName=%@",projectName);
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return projectName;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)projectName
|
|
|
|
{
|
|
|
|
// H:\Wotests\ObjCTest3\ObjCTest3.gswa ==> ObjCTest3
|
|
|
|
//OK ?
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* projectName=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2001-10-28 10:29:17 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"_gnustep_target_cpu=%@",[NSBundle _gnustep_target_cpu]);
|
|
|
|
NSDebugMLLog(@"bundles",@"_gnustep_target_dir=%@",[NSBundle _gnustep_target_dir]);
|
|
|
|
NSDebugMLLog(@"bundles",@"_gnustep_target_os=%@",[NSBundle _gnustep_target_os]);
|
|
|
|
NSDebugMLLog(@"bundles",@"_library_combo=%@",[NSBundle _library_combo]);
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"_bundlePath=%@",_bundlePath);
|
|
|
|
projectName=[_bundlePath lastPathComponent];
|
|
|
|
NSDebugMLLog(@"bundles",@"projectName=%@",projectName);
|
|
|
|
projectName=[projectName stringByDeletingPathExtension];
|
|
|
|
NSDebugMLLog(@"bundles",@"projectName=%@",projectName);
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return projectName;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(NSString*)bundlePath
|
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return _bundlePath;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSArray*)pathsForResourcesOfType:(NSString*)aType
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSArray* paths=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aType=%@",aType);
|
2000-01-22 12:49:49 +00:00
|
|
|
[self lock];
|
|
|
|
NS_DURING
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
paths=[self lockedPathsForResourcesOfType:aType];
|
|
|
|
NSDebugMLLog(@"bundles",@"paths=%@",paths);
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_HANDLER
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"EXCEPTION:%@ (%@)",
|
|
|
|
localException,[localException reason]);
|
|
|
|
//TODO
|
|
|
|
[self unlock];
|
|
|
|
[localException raise];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_ENDHANDLER;
|
|
|
|
[self unlock];
|
2002-08-04 18:00:11 +00:00
|
|
|
return paths;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSArray*)lockedPathsForResourcesOfType:(NSString*)aType
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
|
|
return nil;
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)relativePathForResourceNamed:(NSString*)aName
|
|
|
|
forLanguage:(NSString*)aLanguage
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
|
|
|
[self lock];
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ aLanguage=%@",aName,aLanguage);
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_DURING
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
forLanguage:aLanguage];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_HANDLER
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"EXCEPTION:%@ (%@)",
|
|
|
|
localException,[localException reason]);
|
|
|
|
//TODO
|
|
|
|
[self unlock];
|
|
|
|
[localException raise];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_ENDHANDLER;
|
|
|
|
[self unlock];
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)relativePathForResourceNamed:(NSString*)aName
|
|
|
|
forLanguages:(NSArray*)someLanguages
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ someLanguages=%@",aName,someLanguages);
|
2000-01-22 12:49:49 +00:00
|
|
|
[self lock];
|
|
|
|
NS_DURING
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
forLanguages:someLanguages];
|
|
|
|
//NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_HANDLER
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"EXCEPTION:%@ (%@)",
|
|
|
|
localException,[localException reason]);
|
|
|
|
//TODO
|
|
|
|
[self unlock];
|
|
|
|
[localException raise];
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
NS_ENDHANDLER;
|
|
|
|
[self unlock];
|
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
|
|
|
|
forLanguage:(NSString*)aLanguage
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ aLanguage=%@",aName,aLanguage);
|
|
|
|
NSDebugMLLog(@"bundles",@"bundlePath=%@ Trying Resources/WebServer",_bundlePath);
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:@"Resources/WebServer"
|
|
|
|
forLanguage:aLanguage];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"bundlePath=%@ Trying Resources",_bundlePath);
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:@"Resources"
|
|
|
|
forLanguage:aLanguage];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"bundlePath=%@ Trying .",_bundlePath);
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:@"."
|
|
|
|
forLanguage:aLanguage];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
};
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
|
|
|
|
forLanguages:(NSArray*)someLanguages
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ someLanguages=%@",aName,someLanguages);
|
|
|
|
NSDebugMLLog(@"bundles",@"bundlePath=%@ Trying Resources/WebServer",_bundlePath);
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:@"Resources/WebServer"
|
|
|
|
forLanguages:someLanguages];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"bundlePath=%@ Trying Resources",_bundlePath);
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:@"Resources"
|
|
|
|
forLanguages:someLanguages];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
NSDebugMLLog(@"bundles",@"bundlePath=%@ Trying .",_bundlePath);
|
|
|
|
path=[self lockedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:@"."
|
|
|
|
forLanguages:someLanguages];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
};
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
|
|
|
|
inDirectory:(id)aDirectory
|
|
|
|
forLanguages:(NSArray*)someLanguages
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ aDirectory=%@ someLanguages=%@",aName,aDirectory,someLanguages);
|
|
|
|
if (someLanguages)
|
|
|
|
{
|
|
|
|
int i=0;
|
|
|
|
for(i=0;!path && i<[someLanguages count];i++)
|
|
|
|
{
|
|
|
|
path=[self lockedCachedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:aDirectory
|
|
|
|
forLanguage:[someLanguages objectAtIndex:i]];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
if (!path)
|
|
|
|
path=[self lockedCachedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:aDirectory
|
|
|
|
forLanguage:nil];
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)lockedCachedRelativePathForResourceNamed:(NSString*)aName
|
|
|
|
inDirectory:(NSString*)aDirectory
|
|
|
|
forLanguage:(NSString*)aLanguage
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ aDirectory=%@ aLanguage=%@",aName,aDirectory,aLanguage);
|
|
|
|
if (aName)
|
|
|
|
{
|
|
|
|
NSString* emptyString=[NSString string];
|
|
|
|
NSString* bundlePath=[self bundlePath];
|
|
|
|
NSArray* keys;
|
|
|
|
if ([aDirectory isEqualToString:@"."])
|
|
|
|
aDirectory=nil;
|
|
|
|
if (aLanguage)
|
|
|
|
keys=[NSArray arrayWithObjects:aName,
|
|
|
|
bundlePath ? bundlePath : emptyString,
|
|
|
|
aDirectory ? aDirectory : emptyString,
|
|
|
|
aLanguage ? aLanguage : emptyString,
|
|
|
|
nil];
|
|
|
|
else
|
|
|
|
keys=[NSArray arrayWithObjects:aName,
|
|
|
|
bundlePath ? bundlePath : emptyString,
|
|
|
|
aDirectory ? aDirectory : emptyString,
|
|
|
|
nil];
|
|
|
|
//NSDebugMLLog(@"bundles",@"_keys=%@",_keys);
|
|
|
|
path=[_relativePathsCache objectForKeysArray:keys];
|
|
|
|
//NSDebugMLLog(@"bundles",@"_path=%@",_path);
|
|
|
|
if (path==GSNotFoundMarker)
|
|
|
|
path=nil;
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
//call again _relativePathForResourceNamed:inDirectory:forLanguage:
|
|
|
|
NSString* completePathTest=nil;
|
|
|
|
BOOL exists=NO;
|
|
|
|
NSFileManager* fileManager=nil;
|
|
|
|
NSString* pathTest=[NSString string];
|
|
|
|
if (aDirectory)
|
|
|
|
pathTest=[pathTest stringByAppendingPathComponent:aDirectory];
|
|
|
|
//NSDebugMLLog(@"bundles",@"_pathTest=%@",_pathTest);
|
|
|
|
if (aLanguage)
|
|
|
|
pathTest=[pathTest stringByAppendingPathComponent:
|
|
|
|
[aLanguage stringByAppendingString:GSLanguagePSuffix]];
|
|
|
|
//NSDebugMLLog(@"bundles",@"pathTest=%@",pathTest);
|
|
|
|
pathTest=[pathTest stringByAppendingPathComponent:aName];
|
|
|
|
NSDebugMLLog(@"bundles",@"pathTest=%@",pathTest);
|
|
|
|
completePathTest=[bundlePath stringByAppendingPathComponent:pathTest];
|
|
|
|
NSDebugMLLog(@"bundles",@"completePathTest=%@",completePathTest);
|
|
|
|
fileManager=[NSFileManager defaultManager];
|
|
|
|
exists=[fileManager fileExistsAtPath:completePathTest];
|
|
|
|
NSDebugMLLog(@"bundles",@"exists=%s",(exists ? "YES" : "NO"));
|
|
|
|
if (exists)
|
|
|
|
{
|
|
|
|
path=pathTest;
|
|
|
|
[_relativePathsCache setObject:path
|
|
|
|
forKeysArray:keys];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
[_relativePathsCache setObject:GSNotFoundMarker
|
|
|
|
forKeysArray:keys];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
NSDebugMLLog(@"bundles",@"path=%@",path);
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
|
|
|
|
inDirectory:(NSString*)aDirectory
|
|
|
|
forLanguage:(NSString*)aLanguage
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
//OK
|
2002-08-04 18:00:11 +00:00
|
|
|
NSString* path=nil;
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStart();
|
2002-08-04 18:00:11 +00:00
|
|
|
NSDebugMLLog(@"bundles",@"aName=%@ aDirectory=%@ aLanguage=%@",
|
|
|
|
aName,aDirectory,aLanguage);
|
|
|
|
path=[self lockedCachedRelativePathForResourceNamed:aName
|
|
|
|
inDirectory:aDirectory
|
|
|
|
forLanguage:aLanguage];
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
2002-08-04 18:00:11 +00:00
|
|
|
return path;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
// lock
|
|
|
|
-(void)lock
|
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
|
|
|
NSDebugMLLog(@"bundles",@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p",
|
2002-08-04 18:00:11 +00:00
|
|
|
(void*)_selfLock,
|
|
|
|
_selfLockn,
|
|
|
|
(void*)_selfLock_thread_id,
|
2000-01-22 12:49:49 +00:00
|
|
|
(void*)objc_thread_id());
|
2002-08-04 18:00:11 +00:00
|
|
|
if (_selfLockn>0)
|
|
|
|
{
|
|
|
|
if (_selfLock_thread_id!=objc_thread_id())
|
|
|
|
{
|
|
|
|
NSDebugMLog0(@"PROBLEM: owner!=thread id");
|
|
|
|
};
|
|
|
|
};
|
|
|
|
TmpLockBeforeDate(_selfLock,[NSDate dateWithTimeIntervalSinceNow:GSLOCK_DELAY_S]);
|
2000-01-22 12:49:49 +00:00
|
|
|
#ifndef NDEBUG
|
2002-08-04 18:00:11 +00:00
|
|
|
_selfLockn++;
|
|
|
|
_selfLock_thread_id=objc_thread_id();
|
2000-01-22 12:49:49 +00:00
|
|
|
#endif
|
|
|
|
NSDebugMLLog(@"bundles",@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p",
|
2002-08-04 18:00:11 +00:00
|
|
|
_selfLock,
|
|
|
|
_selfLockn,
|
|
|
|
(void*)_selfLock_thread_id,
|
|
|
|
(void*)objc_thread_id());
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
// unlock
|
|
|
|
-(void)unlock
|
|
|
|
{
|
|
|
|
LOGObjectFnStart();
|
|
|
|
NSDebugMLLog(@"bundles",@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p",
|
2002-08-04 18:00:11 +00:00
|
|
|
(void*)_selfLock,
|
|
|
|
_selfLockn,
|
|
|
|
(void*)_selfLock_thread_id,
|
|
|
|
(void*)objc_thread_id());
|
|
|
|
if (_selfLockn>0)
|
|
|
|
{
|
|
|
|
if (_selfLock_thread_id!=objc_thread_id())
|
|
|
|
{
|
|
|
|
NSDebugMLog0(@"PROBLEM: owner!=thread id");
|
|
|
|
};
|
|
|
|
};
|
|
|
|
TmpUnlock(_selfLock);
|
2000-01-22 12:49:49 +00:00
|
|
|
#ifndef NDEBUG
|
2002-08-04 18:00:11 +00:00
|
|
|
_selfLockn--;
|
|
|
|
if (_selfLockn==0)
|
|
|
|
_selfLock_thread_id=NULL;
|
2000-01-22 12:49:49 +00:00
|
|
|
#endif
|
|
|
|
NSDebugMLLog(@"bundles",@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p",
|
2002-08-04 18:00:11 +00:00
|
|
|
(void*)_selfLock,
|
|
|
|
_selfLockn,
|
|
|
|
(void*)_selfLock_thread_id,
|
|
|
|
(void*)objc_thread_id());
|
2000-01-22 12:49:49 +00:00
|
|
|
LOGObjectFnStop();
|
|
|
|
};
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation GSWDeployedBundle (GSWDeployedBundleA)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
+(id)bundleWithPath:(NSString*)aPath
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
id bundle=nil;
|
|
|
|
NSDebugMLLog(@"bundles",@"aPath=%@",aPath);
|
|
|
|
bundle=[[[GSWDeployedBundle alloc]initWithPath:aPath]autorelease];
|
|
|
|
return bundle;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
@end
|