From 29f42fd8c27ac76c6d99177d0a8720bf17ae0d56 Mon Sep 17 00:00:00 2001 From: znek Date: Fri, 25 Feb 2005 15:25:55 +0000 Subject: [PATCH] Bugfix for RAD mode, bumped versions git-svn-id: http://svn.opengroupware.org/SOPE/trunk@600 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 6 ++++++ sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj | 2 +- sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj | 2 +- .../NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj | 2 +- sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOResourceManager.m | 2 +- sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj | 2 +- .../WEExtensions/WEExtensions.xcode/project.pbxproj | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 5295c990..0262b3e4 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,9 @@ +2005-02-25 Marcus Mueller + + * 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 * 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 c51ac510..e9437f90 100644 --- 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 6ea50eaa..2c15950b 100644 --- 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 6a3a5268..7074a0d0 100644 --- 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 fc05a789..8f914dd5 100644 --- 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 7b0edb5f..5474d179 100644 --- 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 f2ba645b..bf5ac5ef 100644 --- 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 c97a7169..d0ba24a0 100644 --- 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; -- 2.39.5