amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-05 20:10:33 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: d8ee782e0279aa96226ceac45acca9d744f3f234

Browse Source 
Monotone-Revision: 089ae441ff03d28570373f845e09e2601d6611ee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-14T17:31:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-02-14 17:31:23 +00:00
parent 716230fce7
commit b4307939db
35 changed files with 3368 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Main/GNUmakefile
+2 -2
View File
@@ -1,6 +1,6 @@
# GNUstep makefile
-include ../config.make
include ../config.make
include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ./Version
@@ -10,6 +10,7 @@ ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
SOGOD = sogod-$(MAJOR_VERSION).$(MINOR_VERSION)
TOOL_NAME = $(SOGOD)
$(SOGOD)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
# daemon tool
all::
@@ -24,4 +25,3 @@ $(SOGOD)_OBJC_FILES += \
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/tool.make
-include GNUmakefile.postamble
include fhs.make
Main/SOGoProductLoader.m
+7 -28
View File
@@ -80,28 +80,12 @@
}
- (void)_addGNUstepSearchPathesToArray:(NSMutableArray *)ma {
NSDictionary *env;
id tmp;
env = [[NSProcessInfo processInfo] environment];
if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil)
tmp = [env objectForKey:@"GNUSTEP_PATHLIST"];
tmp = [tmp componentsSeparatedByString:@":"];
if ([tmp count] > 0) {
NSEnumerator *e;
e = [tmp objectEnumerator];
while ((tmp = [e nextObject])) {
tmp = [tmp stringByAppendingPathComponent:@"Library"];
tmp = [tmp stringByAppendingPathComponent:self->productDirectoryName];
if (![ma containsObject:tmp])
[ma addObject:tmp];
}
}
else {
NSLog(@"%s: empty library search path !", __PRETTY_FUNCTION__);
}
NSEnumerator *libraryPaths;
NSString *directory;
libraryPaths = [NSStandardLibraryPaths() objectEnumerator];
while ((directory = [libraryPaths nextObject]))
[ma addObject: [directory stringByAppendingPathComponent:self->productDirectoryName]];
}
- (void)_addFHSPathesToArray:(NSMutableArray *)ma {
@@ -114,18 +98,13 @@
- (NSArray *)productSearchPathes {
NSMutableArray *ma;
BOOL hasGNUstepEnv;
if (self->searchPathes != nil)
return self->searchPathes;
hasGNUstepEnv = [[[[NSProcessInfo processInfo] environment]
objectForKey:@"GNUSTEP_USER_ROOT"] length] > 0 ? YES : NO;
ma = [NSMutableArray arrayWithCapacity:6];
if (hasGNUstepEnv)
[self _addGNUstepSearchPathesToArray:ma];
[self _addGNUstepSearchPathesToArray:ma];
#if COCOA_Foundation_LIBRARY
else
[self _addCocoaSearchPathesToArray:ma];