Bugfix for RAD mode, bumped versions

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 5295c990db7b331e0b69976c58f1282560f90231..0262b3e464f41965ae8bfcd219ee2b1aea04e85c 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-25  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * WOResourceManager.m: Fixed condition in -resourcesPathForFramework:,
+         this needs to consider the rapidTurnAroundPath as a special case.
+         RAD in SOPE:X will once again work with this fix applied. (v4.5.121)
+
 2005-02-23  Helge Hess  <helge.hess@opengroupware.org>
 
        * SoObjects/SoProductResourceManager.m: major fixes in resource

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
index c51ac5103fa113e2af45270c0b947d699604df5d..e9437f905bbd1234e7f3a9be7fc288d7c59b4560 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
@@ -453,7 +453,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.117;
+                               DYLIB_CURRENT_VERSION = 4.5.121;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
index 6ea50eaa04e8856da6cf2f343b49aeee23fd76af..2c15950b3459925cfa3b74c64cdb466b0696cfc9 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
@@ -1589,7 +1589,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.117;
+                               DYLIB_CURRENT_VERSION = 4.5.121;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
index 6a3a526813e40f5352fd96093aa28db8ac6a6b08..7074a0d01f7d466b0586a4499424d3e71a2288e3 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
@@ -281,7 +281,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.117;
+                               DYLIB_CURRENT_VERSION = 4.5.121;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index fc05a789b699840edd1b136e9a9a4b4bdf47a079..8f914dd5c4bc042d62d1989c723505f9b02d547a 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=120
+SUBMINOR_VERSION:=121
 
 # v4.5.91  requires libNGExtensions v4.5.134
 # v4.5.84  requires libNGExtensions v4.5.127

diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m
index 7b0edb5f3eb2dbc0ff43b12d4f7211264d3597e1..5474d179cb533c6b9bf03d2cbe4e3e4106ddfb12 100644 (file)
--- a/sope-appserver/NGObjWeb/WOResourceManager.m
+++ b/sope-appserver/NGObjWeb/WOResourceManager.m
@@ -280,7 +280,7 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
 }
 
 - (NSString *)resourcesPathForFramework:(NSString *)_fw {
-  if (_fw == nil) 
+  if (_fw == nil || (_fw == rapidTurnAroundPath)) 
     return [self resourcesPath];
   
 #if RSRCDIR_CONTENTS

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
index f2ba645b0160607856cf01692c894f961ef056c7..bf5ac5efee8928a0ae16956e4e2c1a7e54d3f819 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
@@ -226,7 +226,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.117;
+                               DYLIB_CURRENT_VERSION = 4.5.121;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj b/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
index c97a7169b4ecc44fb81fc9f42bacd7f4a083ccc5..d0ba24a079a4b63343576698f631820b2ccced8e 100644 (file)
--- a/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
+++ b/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
@@ -898,7 +898,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.66;
+                               DYLIB_CURRENT_VERSION = 4.5.68;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;