fixed an NGObjWeb issue with gstep-make 1.9.2

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index c80a01b206d20c460ee19c0d494f6fb6ea7a77bc..ffc8e3bc60c80e54690740666c1c8bb36e1ec3b3 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-01  Helge Hess  <helge.hess@skyrix.com>
+
+       * WOCoreApplication.m: search for libNGObjWeb resources in
+         Library/Libraries for compatibility with gstep-make 1.9.2 (Note:
+         this version does _not_ work with the old gstep-make fork anymore!)
+         (v4.3.22)
+
 2004-09-01  Helge Hess  <helge.hess@opengroupware.org>
 
        * fhs.make (move-headers-to-fhs): moved NGHttp headers to FHS root
@@ -6,7 +13,7 @@
 2004-08-31  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile.preamble: fixed sope-mime library location for gstep-make
-         1.9.2 (v.4.3.20)
+         1.9.2 (v4.3.20)
 
 2004-08-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 36c6d60ffb832d112753ff4a896bdd5c9307a133..b993a0d018dfd5da6197110a3e941e867de0b2ec 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=21
+SUBMINOR_VERSION:=22
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77

diff --git a/sope-appserver/NGObjWeb/WOCoreApplication.m b/sope-appserver/NGObjWeb/WOCoreApplication.m
index 789d28e22222b2ae26bb33b46e9cba69cd881974..3ae35a49dd2b165115560de41ed86ba26d621082 100644 (file)
--- a/sope-appserver/NGObjWeb/WOCoreApplication.m
+++ b/sope-appserver/NGObjWeb/WOCoreApplication.m
@@ -700,11 +700,7 @@ static NSMutableArray *activeApps = nil; // THREAD
      TODO: the following is a dirty hack because GNUstep people decided
            to change the directory structure. SIGH!
   */
-#if APPLE_FOUNDATION_LIBRARY || NeXT_Foundation_LIBRARY || GNUSTEP_BASE_LIBRARY
   relPath = @"Library/Libraries";
-#else    
-  relPath = @"Libraries";
-#endif
   relPath = [relPath stringByAppendingPathComponent:@"Resources"];
   relPath = [relPath stringByAppendingPathComponent:@"NGObjWeb"];
   

diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m
index 28bd0e3b6fe5d20701f5d17d5b890cd5816c613e..e64888b76778cf31b719ea3244c09bb5e9c38850 100644 (file)
--- a/sope-appserver/NGObjWeb/WOResourceManager.m
+++ b/sope-appserver/NGObjWeb/WOResourceManager.m
@@ -395,8 +395,11 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
     resource = [rp stringByAppendingPathComponent:_name];
     if (debugResourceLookup) 
       [self logWithFormat:@"  check in Resources-flat: %@", resource];
-    if (_pathExists(self, fm, resource))
+    if (_pathExists(self, fm, resource)) {
+      if (debugResourceLookup) 
+       [self logWithFormat:@"  found => %@", resource];
       return resource;
+    }
   }
   
   /* and last check in the application directory */

diff --git a/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m b/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m
index 78ef281dcc092849e22fe53c54a2806cd3d5101d..59ae12d26e9c7198b9d496fbb7079249b19378d1 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m
+++ b/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the