From 3b22af05f68da72af68822be68dc70d2a1c5df67 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 9 Nov 2004 14:18:26 +0000 Subject: [PATCH] bumped sope-gdl1 version to 4.5, fixed loading of adaptor bundles git-svn-id: http://svn.opengroupware.org/SOPE/trunk@355 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-gdl1/GDLAccess/ChangeLog | 9 +++++++++ sope-gdl1/GDLAccess/EOAdaptor.m | 15 +++++++++++---- sope-gdl1/GDLAccess/GNUmakefile | 1 + sope-gdl1/GDLAccess/GNUmakefile.preamble | 10 ++++++++++ sope-gdl1/GDLAccess/Version | 4 ++-- sope-gdl1/Version | 4 ++-- 6 files changed, 35 insertions(+), 8 deletions(-) diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog index 647a8f2d..2b094de5 100644 --- a/sope-gdl1/GDLAccess/ChangeLog +++ b/sope-gdl1/GDLAccess/ChangeLog @@ -1,3 +1,12 @@ +2004-11-09 Helge Hess + + * v4.5.41 + + * bumped version from 1.3 to 4.5 to be consistent with the remaining + SOPE versions (the "super major version" is still gdl1) + + * EOAdaptor.m: fixed adaptor lookup path + 2004-09-22 Marcus Mueller * GDLAccess.xcode: new Xcode project diff --git a/sope-gdl1/GDLAccess/EOAdaptor.m b/sope-gdl1/GDLAccess/EOAdaptor.m index 3138c1df..65fea51b 100644 --- a/sope-gdl1/GDLAccess/EOAdaptor.m +++ b/sope-gdl1/GDLAccess/EOAdaptor.m @@ -70,13 +70,20 @@ e = [tmp objectEnumerator]; while ((tmp = [e nextObject])) { - tmp = [tmp stringByAppendingPathComponent:@"Library/GDLAdaptors-1.1"]; - if ([ma containsObject:tmp]) continue; + if (![tmp hasSuffix:@"/"]) tmp = [tmp stringByAppendingString:@"/"]; + + tmp = [tmp stringByAppendingFormat:@"Library/GDLAdaptors-%i.%i", + GDL_MAJOR_VERSION, GDL_MINOR_VERSION]; + + if ([ma containsObject:tmp] || tmp == nil) continue; [ma addObject:tmp]; } } - [ma addObject:@"/usr/local/lib/sope-4.3/dbadaptors"]; - [ma addObject:@"/usr/lib/sope-4.3/dbadaptors"]; + + tmp = [NSString stringWithFormat:@"/lib/sope-$i.%i/dbadaptors", + SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION]; + [ma addObject:[@"/usr/local" stringByAppendingString:tmp]]; + [ma addObject:[@"/usr" stringByAppendingString:tmp]]; searchPathes = [ma copy]; if ([searchPathes count] == 0) diff --git a/sope-gdl1/GDLAccess/GNUmakefile b/sope-gdl1/GDLAccess/GNUmakefile index 04c24e38..ceb9c888 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile +++ b/sope-gdl1/GDLAccess/GNUmakefile @@ -2,6 +2,7 @@ -include ../../config.make include ../common.make +-include ../Version -include ./Version GNUSTEP_INSTALLATION_DIR = ${GNUSTEP_LOCAL_ROOT} diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index 32c4fe03..deda0f6e 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile.preamble +++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble @@ -1,5 +1,15 @@ # $Id: GNUmakefile.preamble 1 2004-08-20 10:38:46Z znek $ +ADDITIONAL_CPPFLAGS += \ + -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \ + \ + -DGDL_MAJOR_VERSION=$(MAJOR_VERSION) \ + -DGDL_MINOR_VERSION=$(MINOR_VERSION) \ + -DGDL_SUBMINOR_VERSION=$(SUBMINOR_VERSION) \ + \ + -DSOPE_MAJOR_VERSION=$(SOPE_MAJOR_VERSION) \ + -DSOPE_MINOR_VERSION=$(SOPE_MINOR_VERSION) \ + -DSOPE_SUBMINOR_VERSION=$(SOPE_SUBMINOR_VERSION) ADDITIONAL_INCLUDE_DIRS += \ -I. -I.. \ diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version index 3615e281..43865ed5 100644 --- a/sope-gdl1/GDLAccess/Version +++ b/sope-gdl1/GDLAccess/Version @@ -1,3 +1,3 @@ -# $Id: Version 1 2004-08-20 10:38:46Z znek $ +# version file -SUBMINOR_VERSION:=40 +SUBMINOR_VERSION:=41 diff --git a/sope-gdl1/Version b/sope-gdl1/Version index 2a9715fa..e6bb2a46 100644 --- a/sope-gdl1/Version +++ b/sope-gdl1/Version @@ -2,8 +2,8 @@ # This file is included by library makefiles to set the version information # of the executable. -MAJOR_VERSION=1 -MINOR_VERSION=3 +MAJOR_VERSION=4 +MINOR_VERSION=5 # the SUBMINOR_VERSION is set by the Version file inside of a library project SOPE_MAJOR_VERSION=4 -- 2.39.5