From 4e805909e901bbe30e4adc93cd1a8644e505a975 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 3 Jul 2006 21:12:24 +0000 Subject: [PATCH] lookup libs in lib64 on 64bit systems use %p for pointer formats fixed gcc 4.1 warnings some code cleanups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1288 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- .../_WOCommonStaticDAHyperlink.m | 2 +- sope-appserver/NGXmlRpc/ChangeLog | 5 +++++ sope-appserver/NGXmlRpc/GNUmakefile.preamble | 4 ++++ sope-appserver/NGXmlRpc/NGAsyncResultProxy.m | 4 ++-- sope-appserver/NGXmlRpc/NGXmlRpcAction.m | 8 +++---- sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m | 6 +++--- .../NGXmlRpc/NGXmlRpcMethodSignature.m | 2 +- sope-appserver/NGXmlRpc/NSObject+Reflection.m | 8 +++---- sope-appserver/NGXmlRpc/Version | 2 +- .../NGXmlRpc/WODirectAction+XmlRpc.m | 12 +++++------ .../WODirectAction+XmlRpcIntrospection.m | 9 ++++---- sope-appserver/NGXmlRpc/fhs.make | 7 ++++++- sope-appserver/SoOFS/ChangeLog | 4 ++++ sope-appserver/SoOFS/GNUmakefile.preamble | 4 ++++ sope-appserver/SoOFS/OFSBaseObject.m | 6 +++--- sope-appserver/SoOFS/OFSFactoryContext.m | 2 +- sope-appserver/SoOFS/OFSFile.m | 2 +- sope-appserver/SoOFS/OFSPropertyListObject.m | 2 +- sope-appserver/SoOFS/OFSResourceManager.m | 4 ++-- sope-appserver/SoOFS/OFSWebMethod.m | 2 +- sope-appserver/SoOFS/Version | 2 +- sope-appserver/SoOFS/fhs.make | 7 ++++++- sope-appserver/WEExtensions/ChangeLog | 5 +++++ .../WEExtensions/GNUmakefile.preamble | 4 ++++ sope-appserver/WEExtensions/JSClipboard.m | 2 +- sope-appserver/WEExtensions/JSShiftClick.m | 2 +- sope-appserver/WEExtensions/JSStringTable.m | 14 +++++++------ sope-appserver/WEExtensions/Version | 2 +- sope-appserver/WEExtensions/WECalendarField.m | 6 +++--- .../WECollapsibleComponentContent.m | 6 +++--- sope-appserver/WEExtensions/WEDragContainer.m | 2 +- sope-appserver/WEExtensions/WEEpozEditor.m | 6 +++--- sope-appserver/WEExtensions/WEMonthOverview.m | 2 +- .../WEExtensions/WEQualifierConditional.m | 4 ++-- sope-appserver/WEExtensions/WEResourceKey.m | 2 +- .../WEExtensions/WEResourceManager.m | 21 ++++++++++--------- .../WEExtensions/WEStringTableManager.m | 6 +++--- sope-appserver/WEExtensions/WETabItem.m | 2 +- sope-appserver/WEExtensions/WETabView.m | 8 +++---- .../WEExtensions/WETableCalcMatrix.m | 6 +++--- sope-appserver/WEExtensions/WETreeData.m | 10 ++++----- sope-appserver/WEExtensions/WETreeView.m | 6 +++--- sope-appserver/WEExtensions/WEWeekOverview.m | 6 +++--- sope-appserver/WEExtensions/fhs.make | 9 ++++++-- sope-appserver/WOExtensions/ChangeLog | 4 ++++ .../WOExtensions/GNUmakefile.preamble | 4 ++++ sope-appserver/WOExtensions/JSAlertPanel.m | 2 +- sope-appserver/WOExtensions/JSConfirmPanel.m | 2 +- sope-appserver/WOExtensions/JSImageFlyover.m | 2 +- .../WOExtensions/JSValidatedField.m | 2 +- sope-appserver/WOExtensions/Version | 2 +- sope-appserver/WOExtensions/WOTabPanel.m | 4 ++-- sope-appserver/WOExtensions/fhs.make | 9 ++++++-- sope-appserver/WOXML/ChangeLog | 4 ++++ sope-appserver/WOXML/Version | 2 +- sope-appserver/WOXML/WOXMLMappingEntity.m | 2 +- sope-appserver/WOXML/WOXMLMappingProperty.m | 2 +- sope-appserver/WOXML/fhs.make | 7 ++++++- .../WOXML/samples/slashdot/SlashDotStory.m | 2 +- .../samples/iCalPortal/iCalPortalCalendar.m | 2 +- .../samples/iCalPortal/iCalPortalUser.m | 2 +- 61 files changed, 178 insertions(+), 111 deletions(-) diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m index e3ffa2dd..56b99c57 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m +++ b/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m @@ -108,7 +108,7 @@ assoc = [self->queryParameters objectForKey:key]; value = [assoc stringValueInComponent:sComponent]; - [qd setObject:(value != nil ? value : (NSString *)@"") forKey:key]; + [qd setObject:(value != nil ? value : (id)@"") forKey:key]; } } else diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog index 42ab4e62..614696c0 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2006-07-03 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings, use -isNotEmpty + when appropriate (v4.5.15) + 2006-05-16 Marcus Mueller * *m: changed EOControl related includes into imports diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble index a45cebd8..037c44f5 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -54,4 +54,8 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif diff --git a/sope-appserver/NGXmlRpc/NGAsyncResultProxy.m b/sope-appserver/NGXmlRpc/NGAsyncResultProxy.m index c703663a..e6013900 100644 --- a/sope-appserver/NGXmlRpc/NGAsyncResultProxy.m +++ b/sope-appserver/NGXmlRpc/NGAsyncResultProxy.m @@ -98,7 +98,7 @@ ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if ([self isReady]) [ms appendFormat:@" ready=%@", self->result]; @@ -108,7 +108,7 @@ [ms appendFormat:@" token=%@", self->token]; [ms appendFormat:@" target=%@", self->target]; - if ([self->keptObjects count] > 0) + if ([self->keptObjects isNotEmpty]) [ms appendFormat:@" keeping=%@", self->keptObjects]; [ms appendString:@">"]; diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcAction.m b/sope-appserver/NGXmlRpc/NGXmlRpcAction.m index fd564e22..2337322e 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpcAction.m +++ b/sope-appserver/NGXmlRpc/NGXmlRpcAction.m @@ -83,19 +83,19 @@ np = [[NSUserDefaults standardUserDefaults] stringForKey:@"SxDefaultNamespacePrefix"]; - if ([np length] > 0) + if ([np isNotEmpty]) return np; [self logWithFormat: @"WARNING: SxDefaultNamespacePrefix default is not set !"]; np = [(NSHost *)[NSHost currentHost] name]; - if ([np length] > 0) { + if ([np isNotEmpty]) { if (!isdigit([np characterAtIndex:0])) { NSArray *parts; parts = [np componentsSeparatedByString:@"."]; - if ([parts count] == 0) { + if (![parts isNotEmpty]) { } else if ([parts count] == 1) return [parts objectAtIndex:0]; @@ -262,7 +262,7 @@ //[self debugWithFormat:@"shall create async result for proxy:\n %@", _proxy]; - token = [NSString stringWithFormat:@"0x%08X-%i", _proxy, cnt++]; + token = [NSString stringWithFormat:@"0x%p-%i", _proxy, cnt++]; //[self debugWithFormat:@"token: %@", token]; ui = [NSDictionary dictionaryWithObject:token forKey:@"WOAsyncResponseToken"]; diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m b/sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m index 6ac8565f..cbee2867 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m +++ b/sope-appserver/NGXmlRpc/NGXmlRpcInvocation.m @@ -130,7 +130,7 @@ static NSNull *null = nil; unsigned i; id *aa; - aa = calloc(count, sizeof(id)); + aa = calloc(count + 2 /* be defensive, yeah! */, sizeof(id)); for (i = 0; i < count; i++) { NSString *xrtype; id value; @@ -139,10 +139,10 @@ static NSNull *null = nil; value = [self->arguments objectAtIndex:i]; value = [value asXmlRpcValueOfType:xrtype]; - aa[i] = value ? value : null; + aa[i] = value != nil ? value : (id)null; } args = [NSArray arrayWithObjects:aa count:count]; - if (aa) free(aa); + if (aa != NULL) free(aa); } else args = self->arguments; diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.m b/sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.m index ca3d0b96..a4e045b6 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.m +++ b/sope-appserver/NGXmlRpc/NGXmlRpcMethodSignature.m @@ -28,7 +28,7 @@ return [[[self alloc] initWithXmlRpcTypes:_args] autorelease]; } - (id)initWithXmlRpcTypes:(NSArray *)_arg { - if ([_arg count] < 1) { + if (![_arg isNotEmpty]) { RELEASE(self); return nil; } diff --git a/sope-appserver/NGXmlRpc/NSObject+Reflection.m b/sope-appserver/NGXmlRpc/NSObject+Reflection.m index 824d3470..5ec8651a 100644 --- a/sope-appserver/NGXmlRpc/NSObject+Reflection.m +++ b/sope-appserver/NGXmlRpc/NSObject+Reflection.m @@ -50,8 +50,8 @@ sel = internalMethod->method_name; selName = NSStringFromSelector(sel); - if ([selName length] == 0) { - NSLog(@"WARNING(%s): did not get selector for method 0x%08X", + if (![selName isNotEmpty]) { + NSLog(@"WARNING(%s): did not get selector for method 0x%p", __PRETTY_FUNCTION__, internalMethod); continue; } @@ -78,8 +78,8 @@ continue; selName = NSStringFromSelector(sel); - if ([selName length] == 0) { - NSLog(@"WARNING(%s): did not get selector for method 0x%08X", + if (![selName isNotEmpty]) { + NSLog(@"WARNING(%s): did not get selector for method 0x%p", __PRETTY_FUNCTION__, mlist->method_list[mcount - 1]); continue; } diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index a6180019..cabd6ef3 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=14 +SUBMINOR_VERSION:=15 diff --git a/sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.m b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.m index f25d072a..dc1ad3e2 100644 --- a/sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.m +++ b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpc.m @@ -38,19 +38,19 @@ static int CoreOnException = -1; ud = [NSUserDefaults standardUserDefaults]; np = [ud stringForKey:@"SxDefaultNamespacePrefix"]; - if ([np length] > 0) + if ([np isNotEmpty]) return np; [self logWithFormat: @"WARNING: SxDefaultNamespacePrefix default is not set !"]; np = [(NSHost *)[NSHost currentHost] name]; - if ([np length] > 0) { + if ([np isNotEmpty]) { if (!isdigit([np characterAtIndex:0])) { NSArray *parts; parts = [np componentsSeparatedByString:@"."]; - if ([parts count] == 0) { + if (![parts isNotEmpty]) { } else if ([parts count] == 1) return [parts objectAtIndex:0]; @@ -125,7 +125,7 @@ static int CoreOnException = -1; } /* go to next selector if ... */ - if ([actionName length] == 0) continue; + if (![actionName isNotEmpty]) continue; /* add to reflection set */ [ma addObject:actionName]; @@ -143,12 +143,12 @@ static int CoreOnException = -1; p = [self xmlrpcComponentNamespace]; - if ([p length] > 0) { + if ([p isNotEmpty]) { if ([_name hasPrefix:@"system."]) ; else if ([_name hasPrefix:p]) { _name = [_name substringFromIndex:[p length]]; - if ([_name length] > 0) { + if ([_name isNotEmpty]) { if ([_name characterAtIndex:0] == '.') _name = [_name substringFromIndex:1]; } diff --git a/sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m index dca23e6f..a2cafc8c 100644 --- a/sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m +++ b/sope-appserver/NGXmlRpc/WODirectAction+XmlRpcIntrospection.m @@ -149,7 +149,7 @@ static NSArray *blacklist = nil; } /* go to next selector if ... */ - if ([actionName length] == 0) continue; + if (![actionName isNotEmpty]) continue; /* make action name XMLRPC-style friendly */ actionName = [actionName stringByReplacingString:@"_" withString:@"."]; @@ -225,9 +225,9 @@ static NSArray *blacklist = nil; [signatures addObject:signature]; } - return ([signatures count] > 0) + return [signatures isNotEmpty] ? signatures - : (id)[NSNumber numberWithBool:NO]; + : (NSMutableArray *)[NSNumber numberWithBool:NO]; } - (NSString *)system_methodHelpAction:(NSString *)_xmlrpcMethod { @@ -238,6 +238,7 @@ static NSArray *blacklist = nil; @end /* WODirectAction(XmlRpcIntrospection) */ + #include @implementation WODirectAction(XmlRpcInfo) @@ -286,7 +287,7 @@ static NSArray *blacklist = nil; } [r appendContentString:@""]; - if ([info length] > 0) { + if ([info isNotEmpty]) { [r appendContentString:@""]; [r appendContentString:info]; [r appendContentString:@""]; diff --git a/sope-appserver/NGXmlRpc/fhs.make b/sope-appserver/NGXmlRpc/fhs.make index 33a66cd2..fd9cb525 100644 --- a/sope-appserver/NGXmlRpc/fhs.make +++ b/sope-appserver/NGXmlRpc/fhs.make @@ -5,9 +5,14 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index 7db2e9e0..2e311672 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,7 @@ +2006-07-03 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.22) + 2006-04-27 Marcus Mueller * OFSPropertyListObject.m: removed workaround for gstep-base KVC diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble index 5f36537b..c832ddac 100644 --- a/sope-appserver/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/SoOFS/GNUmakefile.preamble @@ -76,7 +76,11 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif diff --git a/sope-appserver/SoOFS/OFSBaseObject.m b/sope-appserver/SoOFS/OFSBaseObject.m index 0b2cdc1c..6df21eca 100644 --- a/sope-appserver/SoOFS/OFSBaseObject.m +++ b/sope-appserver/SoOFS/OFSBaseObject.m @@ -255,9 +255,9 @@ - (NSString *)loggingPrefix { /* improve perf ... */ NSString *n = [self nameInContainer]; - return [NSString stringWithFormat:@"0x%08X[%@]:%@", + return [NSString stringWithFormat:@"0x%p[%@]:%@", self, NSStringFromClass([self class]), - n ? n : @"ROOT"]; + n != nil ? n : (NSString *)@"ROOT"]; } /* description */ @@ -266,7 +266,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:64]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->storagePath) [ms appendFormat:@" path=%@", self->storagePath]; diff --git a/sope-appserver/SoOFS/OFSFactoryContext.m b/sope-appserver/SoOFS/OFSFactoryContext.m index 4707a043..54843c73 100644 --- a/sope-appserver/SoOFS/OFSFactoryContext.m +++ b/sope-appserver/SoOFS/OFSFactoryContext.m @@ -103,7 +103,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:64]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->isNewObject) [ms appendString:@" NEW"]; diff --git a/sope-appserver/SoOFS/OFSFile.m b/sope-appserver/SoOFS/OFSFile.m index c988003c..0a0815be 100644 --- a/sope-appserver/SoOFS/OFSFile.m +++ b/sope-appserver/SoOFS/OFSFile.m @@ -154,7 +154,7 @@ else if ([ext isEqualToString:@"gif"]) type = @"image/gif"; else if ([ext isEqualToString:@"png"]) type = @"image/png"; } - return type ? type : @"application/octet-stream"; + return type != nil ? type : (NSString *)@"application/octet-stream"; } - (id)davContentLength { diff --git a/sope-appserver/SoOFS/OFSPropertyListObject.m b/sope-appserver/SoOFS/OFSPropertyListObject.m index e04f93c8..14c7a131 100644 --- a/sope-appserver/SoOFS/OFSPropertyListObject.m +++ b/sope-appserver/SoOFS/OFSPropertyListObject.m @@ -264,7 +264,7 @@ static int debugOn = 0; self->recordKeys = rk; } - [self->record setObject:_value?_value:@"" forKey:_key]; + [self->record setObject:(_value ? _value: (id)@"") forKey:_key]; } - (BOOL)isStoredKey:(NSString *)_key { diff --git a/sope-appserver/SoOFS/OFSResourceManager.m b/sope-appserver/SoOFS/OFSResourceManager.m index 543c3c8a..6b395a5c 100644 --- a/sope-appserver/SoOFS/OFSResourceManager.m +++ b/sope-appserver/SoOFS/OFSResourceManager.m @@ -206,12 +206,12 @@ static BOOL debugOn = NO; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:64]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->baseObject) [ms appendFormat:@" base=%@", self->baseObject]; if (self->context) - [ms appendFormat:@" ctx=0x%08X", self->context]; + [ms appendFormat:@" ctx=0x%p", self->context]; [ms appendString:@">"]; return ms; diff --git a/sope-appserver/SoOFS/OFSWebMethod.m b/sope-appserver/SoOFS/OFSWebMethod.m index d0adfe85..d782aa69 100644 --- a/sope-appserver/SoOFS/OFSWebMethod.m +++ b/sope-appserver/SoOFS/OFSWebMethod.m @@ -123,7 +123,7 @@ static BOOL debugOn = NO; /* the default renderer will recognize that as a component ... */ return [self useRendererForComponentCreation] - ? self + ? (id)self : (id)[self componentInContext:_ctx]; } diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version index e6164a36..6cc7ab75 100644 --- a/sope-appserver/SoOFS/Version +++ b/sope-appserver/SoOFS/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=21 +SUBMINOR_VERSION:=22 diff --git a/sope-appserver/SoOFS/fhs.make b/sope-appserver/SoOFS/fhs.make index c28f854e..be73d7d6 100644 --- a/sope-appserver/SoOFS/fhs.make +++ b/sope-appserver/SoOFS/fhs.make @@ -5,9 +5,14 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ FHS_SBIN_DIR=$(FHS_INSTALL_ROOT)/sbin/ + +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif FHS_SO_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/products/ NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog index 537790e2..1dafbeda 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,3 +1,8 @@ +2006-07-03 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings, use -isNotEmpty + when appropriate (v4.5.86) + 2006-03-12 Helge Hess * WEResourceManager.m: minor code cleanups, log the flat template diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble index 083f8204..719a66f4 100644 --- a/sope-appserver/WEExtensions/GNUmakefile.preamble +++ b/sope-appserver/WEExtensions/GNUmakefile.preamble @@ -64,7 +64,11 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif # bundle dependencies diff --git a/sope-appserver/WEExtensions/JSClipboard.m b/sope-appserver/WEExtensions/JSClipboard.m index c0d13e48..06d2f939 100644 --- a/sope-appserver/WEExtensions/JSClipboard.m +++ b/sope-appserver/WEExtensions/JSClipboard.m @@ -87,7 +87,7 @@ comp = [_ctx component]; ccaps = [[_ctx request] clientCapabilities]; tt = [self->toolTip stringValueInComponent:comp]; - tt = tt ? tt : @""; + tt = tt != nil ? tt : (NSString *)@""; if (![ccaps isInternetExplorer]) return; if ([ccaps isMacBrowser]) return; diff --git a/sope-appserver/WEExtensions/JSShiftClick.m b/sope-appserver/WEExtensions/JSShiftClick.m index c1f4209d..1813fc06 100644 --- a/sope-appserver/WEExtensions/JSShiftClick.m +++ b/sope-appserver/WEExtensions/JSShiftClick.m @@ -143,7 +143,7 @@ static NSString *JSShiftClick_Script = componentsJoinedByString:@"_"]; prfx = [self->prefix stringValueInComponent:[_ctx component]]; - prfx = (prfx) ? prfx : @""; + prfx = (prfx != nil) ? prfx : (NSString *)@""; if ([ccaps isJavaScriptBrowser]) { NSString *s; diff --git a/sope-appserver/WEExtensions/JSStringTable.m b/sope-appserver/WEExtensions/JSStringTable.m index 496690fc..db9aaa6e 100644 --- a/sope-appserver/WEExtensions/JSStringTable.m +++ b/sope-appserver/WEExtensions/JSStringTable.m @@ -91,7 +91,7 @@ [_response appendContentString:@""]; return; } - if ([_identifier length] == 0) _identifier = @"WELabels"; + if (![_identifier isNotEmpty]) _identifier = @"WELabels"; [_response appendContentString:@"var "]; [_response appendContentString:_identifier]; @@ -180,10 +180,12 @@ product = [[rm valueForKey:@"container"] productName]; qd = [[NSDictionary alloc] initWithObjectsAndKeys: - lname ? lname : @"", @"table", - lfw ? lfw : @"", @"framework", - lidentifier ? lidentifier : @"", @"id", - product ? product : @"", @"product", + lname ? lname : (NSString *)@"", @"table", + lfw ? lfw : (NSString *)@"", @"framework", + lidentifier ? lidentifier : (NSString *)@"", + @"id", + product ? product : (id)@"", + @"product", [langs componentsJoinedByString:@","], @"languages", nil]; @@ -231,7 +233,7 @@ static NSString *etag = nil; r = [[self context] response]; productName = [rq formValueForKey:@"product"]; - if ([productName length] > 0) { + if ([productName isNotEmpty]) { rm = [[[SoProductRegistry sharedProductRegistry] productWithName:productName] resourceManager]; } diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version index f88a1372..11afdd37 100644 --- a/sope-appserver/WEExtensions/Version +++ b/sope-appserver/WEExtensions/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=85 +SUBMINOR_VERSION:=86 # v4.5.76 requires libNGObjWeb v4.5.176 # v4.5.75 requires libNGObjWeb v4.5.174 diff --git a/sope-appserver/WEExtensions/WECalendarField.m b/sope-appserver/WEExtensions/WECalendarField.m index 6d7f4d42..6e3fa7a4 100644 --- a/sope-appserver/WEExtensions/WECalendarField.m +++ b/sope-appserver/WEExtensions/WECalendarField.m @@ -434,7 +434,7 @@ static NSString *retStr02ForInt(int i) { [ta release]; ta = nil; /* append to response */ - if ([tmp length] > 0) { + if ([tmp isNotEmpty]) { [_r appendContentString:@"format ? [self->format stringValueInComponent: comp] - : @"%Y-%m-%d"; + : (NSString *)@"%Y-%m-%d"; if ([self isKindOfClass:[WECalendarField class]]) { id t = tformat; @@ -896,7 +896,7 @@ static NSString *retStr02ForInt(int i) { if ((prefix = [self->name stringValueInComponent:[_ctx component]]) == nil) prefix = [_ctx elementID]; - if ([_suffix length]) + if ([_suffix isNotEmpty]) prefix = [prefix stringByAppendingString:@"_"]; return [prefix stringByAppendingString:_suffix]; diff --git a/sope-appserver/WEExtensions/WECollapsibleComponentContent.m b/sope-appserver/WEExtensions/WECollapsibleComponentContent.m index 0deb9ecc..995cffc4 100644 --- a/sope-appserver/WEExtensions/WECollapsibleComponentContent.m +++ b/sope-appserver/WEExtensions/WECollapsibleComponentContent.m @@ -363,13 +363,13 @@ static NSString *No = @"NO"; { [_resp appendContentString:@" 0) { + if ([fragId isNotEmpty]) { [_resp appendContentString:@"#"]; [_resp appendContentString:fragId]; } [_resp appendContentString:@"\">"]; - if (img) { + if (img != nil) { [_resp appendContentString:@" 0 ? YES : NO; + doScript = [scriptId isNotEmpty] ? YES : NO; img = (isCollapsed) ? [self->closedImageFileName stringValueInComponent:comp] diff --git a/sope-appserver/WEExtensions/WEDragContainer.m b/sope-appserver/WEExtensions/WEDragContainer.m index 3248d2a7..6572791f 100644 --- a/sope-appserver/WEExtensions/WEDragContainer.m +++ b/sope-appserver/WEExtensions/WEDragContainer.m @@ -153,7 +153,7 @@ static BOOL debugTakeValues = NO; teffect = self->effectsAllowed ? [self->effectsAllowed stringValueInComponent:[_ctx component]] - : @"all"; + : (NSString *)@"all"; tdragContent = @"this.innerHTML"; diff --git a/sope-appserver/WEExtensions/WEEpozEditor.m b/sope-appserver/WEExtensions/WEEpozEditor.m index f164730e..c783045b 100644 --- a/sope-appserver/WEExtensions/WEEpozEditor.m +++ b/sope-appserver/WEExtensions/WEEpozEditor.m @@ -185,7 +185,7 @@ static NSString *OWFormElementName(WEEpozEditor *self, WOContext *_ctx) { NSString *v; v = [[self->value valueInComponent:[_ctx component]] stringValue]; - if ([v length] == 0) + if (![v isNotEmpty]) return v; ua = [[_ctx request] headerForKey:@"user-agent"]; @@ -232,7 +232,7 @@ static NSString *OWFormElementName(WEEpozEditor *self, WOContext *_ctx) { } [_response appendContentString:@">"]; - if ([v length] > 0) + if ([v isNotEmpty]) [_response appendContentHTMLString:v]; [_response appendContentString:@""]; @@ -252,7 +252,7 @@ static NSString *OWFormElementName(WEEpozEditor *self, WOContext *_ctx) { NSArray *languages; rm = [self resourceManagerInContext:_ctx]; - languages = [_ctx hasSession] ? [[_ctx session] languages] : nil; + languages = [_ctx hasSession] ? [[_ctx session] languages] : (NSArray *)nil; return [rm urlForResourceNamed:_name inFramework:nil languages:languages request:[_ctx request]]; diff --git a/sope-appserver/WEExtensions/WEMonthOverview.m b/sope-appserver/WEExtensions/WEMonthOverview.m index 6ddf7d9f..3e0c4f5f 100644 --- a/sope-appserver/WEExtensions/WEMonthOverview.m +++ b/sope-appserver/WEExtensions/WEMonthOverview.m @@ -872,7 +872,7 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request, s = (self->identifier != nil) ? [[self->identifier stringValueInComponent:comp] retain] - : retStrForInt(idx); + : (id)retStrForInt(idx); [_ctx appendElementIDComponent:s]; // append index-id [s release]; diff --git a/sope-appserver/WEExtensions/WEQualifierConditional.m b/sope-appserver/WEExtensions/WEQualifierConditional.m index ab28c067..767e7a6f 100644 --- a/sope-appserver/WEExtensions/WEQualifierConditional.m +++ b/sope-appserver/WEExtensions/WEQualifierConditional.m @@ -146,9 +146,9 @@ /* find context object */ - context = self->object + context = (self->object != nil) ? [self->object valueInComponent:cmp] - : cmp; + : (id)cmp; /* evaluate */ diff --git a/sope-appserver/WEExtensions/WEResourceKey.m b/sope-appserver/WEExtensions/WEResourceKey.m index 3cb50c51..160bebe3 100644 --- a/sope-appserver/WEExtensions/WEResourceKey.m +++ b/sope-appserver/WEExtensions/WEResourceKey.m @@ -105,7 +105,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->name) [ms appendFormat:@" name=%@", self->name]; if (self->frameworkName) [ms appendFormat:@" fw=%@", self->frameworkName]; if (self->language) [ms appendFormat:@" lang=%@", self->language]; diff --git a/sope-appserver/WEExtensions/WEResourceManager.m b/sope-appserver/WEExtensions/WEResourceManager.m index 54afa723..32b61330 100644 --- a/sope-appserver/WEExtensions/WEResourceManager.m +++ b/sope-appserver/WEExtensions/WEResourceManager.m @@ -298,7 +298,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, { NSString *path; - path = [_frameworkName length] > 0 + path = [_frameworkName isNotEmpty] ? [_p stringByAppendingPathComponent:_frameworkName] : _p; @@ -351,7 +351,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, path = checkCache(self->keyToPath, self->cachedKey, _name, _fwName, _lang); if (path != nil) { if (debugOn) [self debugWithFormat:@" found in cache: %@", path]; - return [path isNotNull] ? path : nil; + return [path isNotNull] ? path : (NSString *)nil; } /* check for framework resources (webserver resources + framework) */ @@ -423,7 +423,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, NSString *language; NSString *rpath; - if ([_name length] == 0) { + if (![_name isNotEmpty]) { [self debugWithFormat:@"got no name for resource lookup?!"]; return nil; } @@ -499,7 +499,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, [self debugWithFormat:@" found in cache: %@ (#%d)", url, [self->keyToURL count]]; } - return [url isNotNull] ? url : nil; + return [url isNotNull] ? url : (NSString *)nil; } if (debugOn) { @@ -509,7 +509,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, /* check for framework resources */ - if ([_fwName length] > 0) { + if ([_fwName isNotEmpty]) { if (debugOn) [self debugWithFormat:@"check framework: '%@'", _fwName]; e = [wsPathes objectEnumerator]; @@ -621,7 +621,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, NSString *url; NSString *appName; - if ([_name length] == 0) { + if (![_name isNotEmpty]) { if (debugOn) [self logWithFormat:@"got no name for resource URL lookup?!"]; return nil; } @@ -762,7 +762,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, r = [theme rangeOfString:@"_"]; theme = (r.length > 0) ? [theme substringFromIndex:(r.location + r.length)] - : nil; + : (NSString *)nil; } else theme = nil; @@ -785,7 +785,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, /* check without framework subdir */ - if ([_framework length] > 0) { + if ([_framework isNotEmpty]) { path = [self lookupComponentInStandardPathes:_name inFramework:nil theme:nil]; if (path != nil) @@ -850,11 +850,12 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key, /* first check cache */ path = checkCache(self->keyToComponentPath, self->cachedKey, _name, _fw, - [_langs count] > 0 ? [_langs objectAtIndex:0]:@"English"); + [_langs isNotEmpty] + ? [_langs objectAtIndex:0] : (id)@"English"); if (path != nil) { if (debugComponents) [self logWithFormat:@" use cached location: %@", path]; - return [path isNotNull] ? path : nil; + return [path isNotNull] ? path : (NSString *)nil; } /* look in FHS locations */ diff --git a/sope-appserver/WEExtensions/WEStringTableManager.m b/sope-appserver/WEExtensions/WEStringTableManager.m index c47abb49..d6e5d085 100644 --- a/sope-appserver/WEExtensions/WEStringTableManager.m +++ b/sope-appserver/WEExtensions/WEStringTableManager.m @@ -112,7 +112,7 @@ static BOOL debugOn = NO; NSString *cname; id cacheKey; - if ([_key length] == 0) + if (![_key isNotEmpty]) return _key; if (_component == nil) return _key; @@ -291,7 +291,7 @@ static BOOL debugOn = NO; NSString *p; p = [[WOApplication application] gsTranslationsDirectoryName]; - if ([p length] == 0) + if (![p isNotEmpty]) return nil; p = [@"Resources/" stringByAppendingString:p]; @@ -301,7 +301,7 @@ static BOOL debugOn = NO; NSString *p; p = [[WOApplication application] shareTranslationsDirectoryName]; - if ([p length] == 0) + if (![p isNotEmpty]) return nil; p = [@"share/" stringByAppendingString:p]; diff --git a/sope-appserver/WEExtensions/WETabItem.m b/sope-appserver/WEExtensions/WETabItem.m index ef567da6..41b26ef2 100644 --- a/sope-appserver/WEExtensions/WETabItem.m +++ b/sope-appserver/WEExtensions/WETabItem.m @@ -313,7 +313,7 @@ static NSString *retStrForInt(int i) { // ... imgUri = WEUriOfResource(imgName, _ctx); - if ([imgUri length] < 1) + if (![imgUri isNotEmpty]) doImages = NO; } diff --git a/sope-appserver/WEExtensions/WETabView.m b/sope-appserver/WEExtensions/WETabView.m index 836dd726..d7546e3f 100644 --- a/sope-appserver/WEExtensions/WETabView.m +++ b/sope-appserver/WEExtensions/WETabView.m @@ -361,7 +361,7 @@ static NSNumber *YesNumber; imgUri = WEUriOfResource(imgName, _ctx); - if ([imgUri length] < 1) + if (![imgUri isNotEmpty]) doImages = NO; } @@ -463,7 +463,7 @@ static NSNumber *YesNumber; hasFont = (fc || fs || ff) ? YES : NO; - if ([label length] < 1) + if (![label isNotEmpty]) label = _info->key; [_response appendContentString:@""]; if (hasFont) WEAppendFont(_response, fc, ff, fs); // @@ -498,8 +498,8 @@ static NSNumber *YesNumber; s = WEUriOfResource(s, _ctx); u = WEUriOfResource(u, _ctx); - s = ([s length] < 1) ? imgUri : s; - u = ([u length] < 1) ? imgUri : u; + s = (![s isNotEmpty]) ? imgUri : s; + u = (![u isNotEmpty]) ? imgUri : u; #if 0 out = [NSString alloc]; diff --git a/sope-appserver/WEExtensions/WETableCalcMatrix.m b/sope-appserver/WEExtensions/WETableCalcMatrix.m index afebb451..b36b8adb 100644 --- a/sope-appserver/WEExtensions/WETableCalcMatrix.m +++ b/sope-appserver/WEExtensions/WETableCalcMatrix.m @@ -86,7 +86,7 @@ static NSNull *null = nil; - (NSString *)description { return [NSString stringWithFormat: - @"<0x%08X[%@]: object=0x%08X start=%d len=%d>", + @"<0x%p[%@]: object=0x%p start=%d len=%d>", self, NSStringFromClass([self class]), [self object], self->range.location, @@ -339,7 +339,7 @@ static NSNull *null = nil; #if DEBUG NSAssert(requiredIdx < self->size, @"index to high .."); NSAssert3(self->threads[thread].objects[requiredIdx] == nil, - @"index %i is already marked (by=0x%08X, my=0x%08X) !", + @"index %i is already marked (by=0x%p, my=0x%p) !", requiredIdx, self->threads[thread].objects[requiredIdx], _obj); #endif @@ -452,7 +452,7 @@ static NSNull *null = nil; } - (NSString *)description { - return [NSString stringWithFormat:@"<%08X[%@]: count=%d>", + return [NSString stringWithFormat:@"<%p[%@]: count=%d>", self, NSStringFromClass([self class]), self->count]; } diff --git a/sope-appserver/WEExtensions/WETreeData.m b/sope-appserver/WEExtensions/WETreeData.m index 572e1b76..f03c42e9 100644 --- a/sope-appserver/WEExtensions/WETreeData.m +++ b/sope-appserver/WEExtensions/WETreeData.m @@ -117,12 +117,12 @@ static Class StrClass = Nil; [_response appendContentHTMLAttributeValue:_icon]; [_response appendContentString:@"\""]; - if ([iconWidth length] > 0) { + if ([iconWidth isNotEmpty]) { [_response appendContentString:@" width=\""]; [_response appendContentString:iconWidth]; [_response appendContentString:@"\""]; } - if ([_alt length] > 0) { + if ([_alt isNotEmpty]) { [_response appendContentString:@" alt=\""]; [_response appendContentHTMLAttributeValue:_alt]; [_response appendContentString:@"\""]; @@ -163,13 +163,13 @@ static Class StrClass = Nil; ? [self->treeLink stringValueInComponent:[_ctx component]] : [_ctx componentActionURL]; - if ([link length] > 0) { + if ([link isNotEmpty]) { [_response appendContentString:@""]; } [self _appendIcon:_icon alt:@"z" toResponse:_response inContext:_ctx]; - if ([link length] > 0) + if ([link isNotEmpty]) [_response appendContentString:@""]; [_ctx deleteLastElementIDComponent]; @@ -194,7 +194,7 @@ static Class StrClass = Nil; if (doLink) { if (self->treeLink) { link = [self->treeLink stringValueInComponent:[_ctx component]]; - if ([link length] == 0) + if (![link isNotEmpty]) doLink = NO; } } diff --git a/sope-appserver/WEExtensions/WETreeView.m b/sope-appserver/WEExtensions/WETreeView.m index f0b6e3ad..505d00d3 100644 --- a/sope-appserver/WEExtensions/WETreeView.m +++ b/sope-appserver/WEExtensions/WETreeView.m @@ -336,7 +336,7 @@ NSString *WETreeView_Space = @"WETreeView_Space"; if ((a = [self->sublist valueInComponent:[_ctx component]]) == nil) return nil; - return ([a count] > 0) ? a : nil; + return [a isNotEmpty] ? a : (NSArray *)nil; } /* handle requests */ @@ -528,11 +528,11 @@ NSString *WETreeView_Space = @"WETreeView_Space"; sl = (!isLeaf && isZoom) ? [self _sublistInContext:_ctx] - : nil; + : (NSArray *)nil; } else { sl = [self _sublistInContext:_ctx]; - isLeaf = !([sl count] > 0); + isLeaf = ![sl isNotEmpty]; } if (self->showItem) { diff --git a/sope-appserver/WEExtensions/WEWeekOverview.m b/sope-appserver/WEExtensions/WEWeekOverview.m index 9cfba570..dcf38366 100644 --- a/sope-appserver/WEExtensions/WEWeekOverview.m +++ b/sope-appserver/WEExtensions/WEWeekOverview.m @@ -514,7 +514,7 @@ _applyIndex(WEWeekOverview *self, WOComponent *comp, unsigned _idx) [_response appendContentString:bgcolor]; [_response appendContentCharacter:'"']; } - if ([style length] > 0) { + if ([style isNotEmpty]) { [_response appendContentString:@" class=\""]; [_response appendContentString:style]; [_response appendContentCharacter:'"']; @@ -676,12 +676,12 @@ _applyIndex(WEWeekOverview *self, WOComponent *comp, unsigned _idx) // TODO: use CSS for alignment, width and color [_response appendContentString: @" 0) { + if ([bgcolor isNotEmpty]) { [_response appendContentString:@" bgcolor=\""]; [_response appendContentString:bgcolor]; [_response appendContentCharacter:'"']; } - if ([style length] > 0) { + if ([style isNotEmpty]) { [_response appendContentString:@" class=\""]; [_response appendContentString:style]; [_response appendContentCharacter:'"']; diff --git a/sope-appserver/WEExtensions/fhs.make b/sope-appserver/WEExtensions/fhs.make index 0966fea5..2a519762 100644 --- a/sope-appserver/WEExtensions/fhs.make +++ b/sope-appserver/WEExtensions/fhs.make @@ -5,11 +5,16 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ -FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/ FHS_MAN_DIR=$(FHS_INSTALL_ROOT)/man +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif +FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/ + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" diff --git a/sope-appserver/WOExtensions/ChangeLog b/sope-appserver/WOExtensions/ChangeLog index f29ae1be..89e017f9 100644 --- a/sope-appserver/WOExtensions/ChangeLog +++ b/sope-appserver/WOExtensions/ChangeLog @@ -1,3 +1,7 @@ +2006-07-03 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.30) + 2005-09-18 Helge Hess * GNUmakefile.preamble: added dependency to NGMail (v4.5.29) diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble index 4ce3badc..cadb6007 100644 --- a/sope-appserver/WOExtensions/GNUmakefile.preamble +++ b/sope-appserver/WOExtensions/GNUmakefile.preamble @@ -59,7 +59,11 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif # bundle dependencies diff --git a/sope-appserver/WOExtensions/JSAlertPanel.m b/sope-appserver/WOExtensions/JSAlertPanel.m index 3fd45d1d..a4d553a4 100644 --- a/sope-appserver/WOExtensions/JSAlertPanel.m +++ b/sope-appserver/WOExtensions/JSAlertPanel.m @@ -143,7 +143,7 @@ [_response appendContentString:@"alertMessage) ? [self->alertMessage stringValueInComponent: comp] - : @"Press OK."; + : (NSString *)@"Press OK."; if (self->escapeJS != nil && [self->escapeJS boolValueInComponent: comp]) { tmp = [tmp stringByApplyingJavaScriptEscaping]; } diff --git a/sope-appserver/WOExtensions/JSConfirmPanel.m b/sope-appserver/WOExtensions/JSConfirmPanel.m index 1d0f13ef..f187ae4a 100644 --- a/sope-appserver/WOExtensions/JSConfirmPanel.m +++ b/sope-appserver/WOExtensions/JSConfirmPanel.m @@ -254,7 +254,7 @@ comp = [_ctx component]; msg = (self->confirmMessage) ? [self->confirmMessage stringValueInComponent:comp] - : @"Really?"; + : (NSString *)@"Really?"; if (self->escapeJS != nil && [self->escapeJS boolValueInComponent:comp]) { msg = [msg stringByApplyingJavaScriptEscaping]; } diff --git a/sope-appserver/WOExtensions/JSImageFlyover.m b/sope-appserver/WOExtensions/JSImageFlyover.m index 77f551f1..ac0e7af3 100644 --- a/sope-appserver/WOExtensions/JSImageFlyover.m +++ b/sope-appserver/WOExtensions/JSImageFlyover.m @@ -248,7 +248,7 @@ id assoc, value; assoc = [self->queryParameters objectForKey:key]; value = [assoc stringValueInComponent:comp]; - [qd setObject:(value ? value : @"") forKey:key]; + [qd setObject:(value != nil ? value : (id)@"") forKey:key]; } } diff --git a/sope-appserver/WOExtensions/JSValidatedField.m b/sope-appserver/WOExtensions/JSValidatedField.m index 0ba2d561..afb5ab57 100644 --- a/sope-appserver/WOExtensions/JSValidatedField.m +++ b/sope-appserver/WOExtensions/JSValidatedField.m @@ -131,7 +131,7 @@ terrMesg = (self->errorMessage) ? [self->errorMessage stringValueInComponent:comp] - : @"Invalid values."; + : (NSString *)@"Invalid values."; if (self->escapeJS != nil && [self->escapeJS boolValueInComponent:comp]) terrMesg = [terrMesg stringByApplyingJavaScriptEscaping]; tformName = [self->formName stringValueInComponent:comp]; diff --git a/sope-appserver/WOExtensions/Version b/sope-appserver/WOExtensions/Version index 6e9d7166..f41b16bd 100644 --- a/sope-appserver/WOExtensions/Version +++ b/sope-appserver/WOExtensions/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=29 +SUBMINOR_VERSION:=30 # v4.5.23 requires libNGObjWeb v4.5.145 # v4.5.22 requires libNGObjWeb v4.5.106 diff --git a/sope-appserver/WOExtensions/WOTabPanel.m b/sope-appserver/WOExtensions/WOTabPanel.m index 96af736c..0cb4a459 100644 --- a/sope-appserver/WOExtensions/WOTabPanel.m +++ b/sope-appserver/WOExtensions/WOTabPanel.m @@ -164,11 +164,11 @@ selColor = self->bgcolor ? [self->bgcolor stringValueInComponent:sComponent] - : @"#CCCCCC"; + : (NSString *)@"#CCCCCC"; unselColor = self->nonSelectedBgColor ? [self->nonSelectedBgColor stringValueInComponent:sComponent] - : @"#AAAAAA"; + : (NSString *)@"#AAAAAA"; if ([ttabs count] < 1) { /* no tabs configured .. */ diff --git a/sope-appserver/WOExtensions/fhs.make b/sope-appserver/WOExtensions/fhs.make index b1da2e1c..915c2269 100644 --- a/sope-appserver/WOExtensions/fhs.make +++ b/sope-appserver/WOExtensions/fhs.make @@ -5,11 +5,16 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ -FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/ FHS_MAN_DIR=$(FHS_INSTALL_ROOT)/man +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif +FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/ + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" diff --git a/sope-appserver/WOXML/ChangeLog b/sope-appserver/WOXML/ChangeLog index 3f116d1f..4d0ec7a1 100644 --- a/sope-appserver/WOXML/ChangeLog +++ b/sope-appserver/WOXML/ChangeLog @@ -1,3 +1,7 @@ +2006-07-03 Helge Hess + + * use %p for pointer formats (v4.5.9) + 2005-05-03 Helge Hess * WOXMLMapDecoder.m: fixed a gcc 4.0 warnings, changed for the new diff --git a/sope-appserver/WOXML/Version b/sope-appserver/WOXML/Version index edfa2d83..b191a15e 100644 --- a/sope-appserver/WOXML/Version +++ b/sope-appserver/WOXML/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=8 +SUBMINOR_VERSION:=9 diff --git a/sope-appserver/WOXML/WOXMLMappingEntity.m b/sope-appserver/WOXML/WOXMLMappingEntity.m index f4d1c853..a2fefc23 100644 --- a/sope-appserver/WOXML/WOXMLMappingEntity.m +++ b/sope-appserver/WOXML/WOXMLMappingEntity.m @@ -138,7 +138,7 @@ NSMutableString *s; s = [NSMutableString stringWithCapacity:100]; - [s appendFormat:@"<%@ 0x%08X:", NSStringFromClass([self class]), self]; + [s appendFormat:@"<%@ 0x%p:", NSStringFromClass([self class]), self]; if ([self name]) [s appendFormat:@" name=%@", [self name]]; diff --git a/sope-appserver/WOXML/WOXMLMappingProperty.m b/sope-appserver/WOXML/WOXMLMappingProperty.m index a7317d85..7ee394a1 100644 --- a/sope-appserver/WOXML/WOXMLMappingProperty.m +++ b/sope-appserver/WOXML/WOXMLMappingProperty.m @@ -132,7 +132,7 @@ NSMutableString *s; s = [NSMutableString stringWithCapacity:100]; - [s appendFormat:@"<%@ 0x%08X:", NSStringFromClass([self class]), self]; + [s appendFormat:@"<%@ 0x%p:", NSStringFromClass([self class]), self]; if ([self name]) [s appendFormat:@" name=%@", [self name]]; diff --git a/sope-appserver/WOXML/fhs.make b/sope-appserver/WOXML/fhs.make index 5b5c08eb..ae54683e 100644 --- a/sope-appserver/WOXML/fhs.make +++ b/sope-appserver/WOXML/fhs.make @@ -5,9 +5,14 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" diff --git a/sope-appserver/WOXML/samples/slashdot/SlashDotStory.m b/sope-appserver/WOXML/samples/slashdot/SlashDotStory.m index 7104df10..1f0ca213 100644 --- a/sope-appserver/WOXML/samples/slashdot/SlashDotStory.m +++ b/sope-appserver/WOXML/samples/slashdot/SlashDotStory.m @@ -98,7 +98,7 @@ s = [NSMutableString stringWithCapacity:200]; - [s appendFormat:@"<%@[0x%08X]: author=%@ topic=%@ title='%@'>", + [s appendFormat:@"<%@[0x%p]: author=%@ topic=%@ title='%@'>", NSStringFromClass([self class]), self, [self topic], [self title], diff --git a/sope-appserver/samples/iCalPortal/iCalPortalCalendar.m b/sope-appserver/samples/iCalPortal/iCalPortalCalendar.m index 93fb8342..72c58d62 100644 --- a/sope-appserver/samples/iCalPortal/iCalPortalCalendar.m +++ b/sope-appserver/samples/iCalPortal/iCalPortalCalendar.m @@ -90,7 +90,7 @@ NSMutableString *s; s = [NSMutableString stringWithCapacity:128]; - [s appendFormat:@"<0x%08X[%@]: ", self, NSStringFromClass([self class])]; + [s appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])]; [s appendFormat:@" path=%@", self->path]; if ([self isPublic]) diff --git a/sope-appserver/samples/iCalPortal/iCalPortalUser.m b/sope-appserver/samples/iCalPortal/iCalPortalUser.m index e822f49e..6ca34c25 100644 --- a/sope-appserver/samples/iCalPortal/iCalPortalUser.m +++ b/sope-appserver/samples/iCalPortal/iCalPortalUser.m @@ -456,7 +456,7 @@ NSMutableString *s; s = [NSMutableString stringWithCapacity:128]; - [s appendFormat:@"<0x%08X[%@]: ", self, NSStringFromClass([self class])]; + [s appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])]; [s appendFormat:@" login=%@", self->login]; [s appendFormat:@" path=%@", self->path]; [s appendString:@">"]; -- 2.39.5