fixed resource/module lookup on 64bit systems

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1311 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index c8be22a46faf434805392ed06dbe26cdc6d0ce55..4e9fb0b2833ae3402b4a642d66460d58e5a37e9e 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-05  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v4.5.240
+
+       * SoObjects/SoProductRegistry.m, SoObjects/SoProductLoader.m:
+         changed to find SoProducts on 64bit systems in lib64, added
+         FHS_INSTALL_ROOT to lookup path
+
+       * Templates/WOApplication+Builders.m: changed to find WOxBuilders on
+         64bit systems in lib64, added FHS_INSTALL_ROOT to lookup path
+
 2006-07-03  Helge Hess  <helge.hess@opengroupware.org>
 
        * use %p for pointer formats, fixed gcc 4.1 warnings, use

diff --git a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
index 62ccfccc0151c7d1ef38a68e619ddb77332d3579..00287799b3352f6358c90352bdb5398d7069a72f 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
@@ -3,3 +3,13 @@
 ADDITIONAL_INCLUDE_DIRS += -I../WebDAV/
 
 ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 -DCOMPILE_FOR_GNUSTEP=1
+
+# Parameters for SoProduct lookup
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m b/sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m
index 4a42239e270f9bf84926b24d842943d5ee03a662..c69f3994b181aebcfe717a3bdf2a92e8fcddebd5 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m
@@ -103,8 +103,22 @@
   NSString *s;
   
   s = self->fhsDirectoryName;
+
+#if CONFIGURE_64BIT
+#ifdef FHS_INSTALL_ROOT
+  [ma addObject:[[FHS_INSTALL_ROOT stringByAppendingString:@"/lib64/"] 
+                                  stringByAppendingString:s]];
+#endif
+  [ma addObject:[@"/usr/local/lib64/" stringByAppendingString:s]];
+  [ma addObject:[@"/usr/lib64/"       stringByAppendingString:s]];
+#else
+#ifdef FHS_INSTALL_ROOT
+  [ma addObject:[[FHS_INSTALL_ROOT stringByAppendingString:@"/lib/"] 
+                                  stringByAppendingString:s]];
+#endif
   [ma addObject:[@"/usr/local/lib/" stringByAppendingString:s]];
   [ma addObject:[@"/usr/lib/"       stringByAppendingString:s]];
+#endif
 }
 
 - (NSArray *)productSearchPathes {

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
index e8eb1408a16c2dfea19bed18295dee678637bffd..e1ca150436ea0d647538118fd5b6ee7a4e31dbc2 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2002-2005 SKYRIX Software AG
+  Copyright (C) 2002-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -280,9 +281,17 @@ static int debugOn = 0;
 #endif
   /* look into FHS pathes */
   
-  relPath = [NSString stringWithFormat:@"lib/sope-%i.%i/products/",
+  relPath = [NSString stringWithFormat:
+#if CONFIGURE_64BIT
+                       @"lib64/sope-%i.%i/products/",
+#else
+                       @"lib/sope-%i.%i/products/",
+#endif
                         SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
   pathes = [NSArray arrayWithObjects:
+#ifdef FHS_INSTALL_ROOT
+                     [FHS_INSTALL_ROOT stringByAppendingString:relPath],
+#endif
                      [@"/usr/local/" stringByAppendingString:relPath],
                      [@"/usr/"       stringByAppendingString:relPath],
                    nil];

diff --git a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..63d08f5
--- /dev/null
+++ b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
@@ -0,0 +1,11 @@
+# compilation settings
+
+# Parameters for WOxBuilder lookups
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif

diff --git a/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m b/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
index e3883c911d82815163b3635082376679c0fb5a26..8f9c8d788403559405fdc1a50614f775081987de 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
+++ b/sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -123,9 +124,17 @@
   
   /* look into FHS pathes */
   
-  relPath = [NSString stringWithFormat:@"lib/sope-%i.%i/wox-builders/",
+  relPath = [NSString stringWithFormat:
+#if CONFIGURE_64BIT
+                       @"lib/sope-%i.%i/wox-builders/",
+#else
+                       @"lib64/sope-%i.%i/wox-builders/",
+#endif
                         SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
   pathes = [NSArray arrayWithObjects:
+#ifdef FHS_INSTALL_ROOT
+                     [FHS_INSTALL_ROOT stringByAppendingString:relPath],
+#endif
                      [@"/usr/local/" stringByAppendingString:relPath],
                      [@"/usr/"       stringByAppendingString:relPath],
                    nil];

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index 1dafbedad4541b1fb47200b33071598f02d4b74e..fd094e288b0d8bacd3719d22bb33c01bfc6a4af3 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-05  Helge Hess  <helge.hess@opengroupware.org>
+
+       * WEResourceManager.m: added FHS_INSTALL_ROOT to lookup path (v4.5.87)
+
 2006-07-03  Helge Hess  <helge.hess@opengroupware.org>
 
        * use %p for pointer formats, fixed gcc 4.1 warnings, use -isNotEmpty

diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble
index 719a66f49288362255914ddafd29cc59ad8db337..6f1b0bdd5030f902e4ed408c22f9ee5217ad8676 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WEExtensions/GNUmakefile.preamble
@@ -25,6 +25,17 @@ libWEExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libWEExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 
+# Parameters for resource lookup
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif
+
+
 # dependencies
 
 libWEExtensions_LIBRARIES_DEPEND_UPON += \

diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index 11afdd379f5cbb41e7052d83b8809a314c727306..7a6e3ea8a02436281c201ff9b2d917822e4ac39f 100644 (file)
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=86
+SUBMINOR_VERSION:=87
 
 # v4.5.76 requires libNGObjWeb v4.5.176
 # v4.5.75 requires libNGObjWeb v4.5.174

diff --git a/sope-appserver/WEExtensions/WEResourceManager.m b/sope-appserver/WEExtensions/WEResourceManager.m
index 32b61330aa6669e70d16f9271c8c70d99511de09..6bee9d14ca8932d7d0295ea538a0477118bb0e8f 100644 (file)
--- a/sope-appserver/WEExtensions/WEResourceManager.m
+++ b/sope-appserver/WEExtensions/WEResourceManager.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2005 SKYRIX Software AG
+  Copyright (C) 2005-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -78,7 +79,11 @@ static NSString *themesDirName = @"Themes";
   return [tmp componentsSeparatedByString:@":"];
 }
 + (NSArray *)rootPathesInFHS {
-  return [NSArray arrayWithObjects:@"/usr/local/", @"/usr/", nil];
+  return [NSArray arrayWithObjects:
+#ifdef FHS_INSTALL_ROOT
+                   FHS_INSTALL_ROOT,
+#endif
+                   @"/usr/local/", @"/usr/", nil];
 }
 
 + (NSArray *)findResourceDirectoryPathesWithName:(NSString *)_name

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 1b0d826dc4d7ba87dcfe7e1f0ca352011f84e737..6e4a29e477349c94d29a1313224ef7aa1c6103f1 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-05  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGResourceLocator.m: added FHS_INSTALL_ROOT to lookup path (v4.5.187)
+
 2006-07-04  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGBundleManager.m: added more debug logs which can be triggered using

diff --git a/sope-core/NGExtensions/GNUmakefile.preamble b/sope-core/NGExtensions/GNUmakefile.preamble
index 7bb62f8742e18fb2ba3e42f93bf1c958f869be2e..998376cd81992c3f3f826481839f9cd7cf4523c7 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile.preamble
+++ b/sope-core/NGExtensions/GNUmakefile.preamble
@@ -8,6 +8,17 @@ ADDITIONAL_CPP_FLAGS     += -Wall -Wno-import -Wno-protocol -O2
 libNGExtensions_INCLUDE_DIRS += -I..
 
 
+# Parameters for resource lookup
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif
+
+
 # dependencies
 
 libNGExtensions_LIBRARIES_DEPEND_UPON += \

diff --git a/sope-core/NGExtensions/NGResourceLocator.m b/sope-core/NGExtensions/NGResourceLocator.m
index 3d01d3ad287c966c56efe138fdd15828f520cdc4..ecfe976bd3615465916bb4f45ccdaaa7ca2f4172 100644 (file)
--- a/sope-core/NGExtensions/NGResourceLocator.m
+++ b/sope-core/NGExtensions/NGResourceLocator.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -76,8 +77,13 @@
 - (NSArray *)fhsRootPathes {
   // TODO: we probably want to make this configurable?! At least with an envvar
   static NSArray *pathes = nil;
-  if (pathes == nil)
-    pathes = [[NSArray alloc] initWithObjects:@"/usr/local/", @"/usr/", nil];
+  if (pathes == nil) {
+    pathes = [[NSArray alloc] initWithObjects:
+#ifdef FHS_INSTALL_ROOT
+                               FHS_INSTALL_ROOT,
+#endif
+                               @"/usr/local/", @"/usr/", nil];
+  }
   return pathes;
 }
 

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index 5619dc7c0087d2385d08a873f9fdb7ad119a0df5..9a321f81acc451267ab3c901c931974308c9bdb1 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=186
+SUBMINOR_VERSION:=187
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 753d8d191a7212acc7b8de223d26038a81bbbe8e..c123ec026796f6fae71b6b8a5005dc2360fdb26b 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-05  Helge Hess  <helge.hess@opengroupware.org>
+
+       * EOAdaptor.m: changed to find SAX drivers on 64bit systems
+         in lib64, added FHS_INSTALL_ROOT to lookup path (v4.5.57)
+
 2006-07-04  Helge Hess  <helge.hess@opengroupware.org>
 
        * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.56)

diff --git a/sope-gdl1/GDLAccess/EOAdaptor.m b/sope-gdl1/GDLAccess/EOAdaptor.m
index ade6d9851615ade8d34e8d4f8551767ae5724bbb..20fa95a92a098e03f50db424f43da48ccf1b6206 100644 (file)
--- a/sope-gdl1/GDLAccess/EOAdaptor.m
+++ b/sope-gdl1/GDLAccess/EOAdaptor.m
@@ -80,8 +80,18 @@
     }
   }
   
-  tmp = [NSString stringWithFormat:@"/lib/sope-%i.%i/dbadaptors",
+  tmp = [NSString stringWithFormat:
+#if CONFIGURE_64BIT
+                   @"/lib64/sope-%i.%i/dbadaptors",
+#else
+                   @"/lib/sope-%i.%i/dbadaptors",
+#endif
                    SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
+
+#ifdef FHS_INSTALL_ROOT
+  [ma addObject:[FHS_INSTALL_ROOT stringByAppendingPathComponent:tmp]];
+#endif
+
   [ma addObject:[@"/usr/local" stringByAppendingString:tmp]];
   [ma addObject:[@"/usr" stringByAppendingString:tmp]];
   

diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble
index 3c00014a52d1ff7b6ecceea77207f5856b222c02..1aa9562f773c1fa9378b1eb059d851cbe8857295 100644 (file)
--- a/sope-gdl1/GDLAccess/GNUmakefile.preamble
+++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble
@@ -21,6 +21,17 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I$(SOPE_ROOT)/sope-core/NGExtensions/
 
 
+# Parameters for EOAdaptor lookup
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif
+
+
 # dependencies
 
 libGDLAccess_LIBRARIES_DEPEND_UPON += -lEOControl

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 0d71e7663cdd42daf5b48bcffc44392a12b595b6..4096e97f616ffa96e10b45a5b277725b2d0ffbd7 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=56
+SUBMINOR_VERSION:=57

diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog
index 4d7afd7ccd84b8618e25bbd4c4cde46a3c809e54..862429f9d1eb2c0b30d8521d8cc92d6d64c5fb13 100644 (file)
--- a/sope-xml/SaxObjC/ChangeLog
+++ b/sope-xml/SaxObjC/ChangeLog
@@ -1,5 +1,7 @@
 2006-07-05  Helge Hess  <helge.hess@opengroupware.org>
 
+       * SaxObjectModel.m: added FHS_INSTALL_ROOT to lookup path (v4.5.60)
+
        * SaxXMLReaderFactory.m: changed to find SAX drivers on 64bit systems
          in lib64, added FHS_INSTALL_ROOT to lookup path (v4.5.59)
 

diff --git a/sope-xml/SaxObjC/GNUmakefile.preamble b/sope-xml/SaxObjC/GNUmakefile.preamble
index 4988e3730f392bf8649803c77a3f23828f2da849..b470b7e76a9809c19e4c396fa924148185aa9ab7 100644 (file)
--- a/sope-xml/SaxObjC/GNUmakefile.preamble
+++ b/sope-xml/SaxObjC/GNUmakefile.preamble
@@ -40,8 +40,7 @@ xmln_TOOL_LIBS    += -lSaxObjC
 # Parameters for SaxDriver lookup
 
 ifneq ($(FHS_INSTALL_ROOT),)
-ADDITIONAL_CPPFLAGS += \
-       -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
 endif
 
 ifeq ($(CONFIGURE_64BIT),yes)

diff --git a/sope-xml/SaxObjC/SaxObjectModel.m b/sope-xml/SaxObjC/SaxObjectModel.m
index e5c059780d04593a4d13d43b088fd7bedcdd9c64..2f1dc3be411c18a420f5900aed240b6dc646683c 100644 (file)
--- a/sope-xml/SaxObjC/SaxObjectModel.m
+++ b/sope-xml/SaxObjC/SaxObjectModel.m
@@ -108,6 +108,9 @@ static Class NSCFArrayClass = Nil;
       
       p = [NSString stringWithFormat:@"share/sope-%i.%i/saxmappings/",
                      SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION];
+#ifdef FHS_INSTALL_ROOT
+      [ma addObject:[FHS_INSTALL_ROOT stringByAppendingPathComponent:p]];
+#endif
       [ma addObject:[@"/usr/local/" stringByAppendingString:p]];
       [ma addObject:[@"/usr/"       stringByAppendingString:p]];
     }

diff --git a/sope-xml/SaxObjC/Version b/sope-xml/SaxObjC/Version
index de3d3ecd1a652cb6df956911af35bddf3a29e7d0..7fbe8ee140e3623022ccc65103109611c7a3231a 100644 (file)
--- a/sope-xml/SaxObjC/Version
+++ b/sope-xml/SaxObjC/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=59
+SUBMINOR_VERSION:=60