From 08f7611e2c00d76714a27b17b2c2d67ba221db07 Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 4 Jan 2005 02:22:41 +0000 Subject: [PATCH] new Xcode product SoOFS, various minor enhancements and dyld version bumps git-svn-id: http://svn.opengroupware.org/SOPE/trunk@479 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- maintenance/ChangeLog | 4 + maintenance/znek-fix-xcode-projects.sh | 2 +- sope-appserver/ChangeLog | 4 + sope-appserver/NGObjWeb/ChangeLog | 15 + .../NGHttp/NGHttp.xcode/project.pbxproj | 2 +- .../NGObjWeb/NGObjWeb.xcode/project.pbxproj | 67 +- .../SoObjects/SoObjects.xcode/project.pbxproj | 52 +- .../NGObjWeb/SoObjects/SoProductRegistry.m | 9 +- sope-appserver/NGObjWeb/Version | 2 +- .../WebDAV/WebDAV.xcode/project.pbxproj | 2 +- .../NGXmlRpc/NGXmlRpc.xcode/project.pbxproj | 2 +- sope-appserver/SoOFS/ChangeLog | 18 + sope-appserver/SoOFS/GNUmakefile.preamble | 2 - sope-appserver/SoOFS/OFSFactoryRegistry.m | 4 +- sope-appserver/SoOFS/OFSFileRenderer.m | 1 - sope-appserver/SoOFS/OFSHttpPasswd.m | 2 +- sope-appserver/SoOFS/OFSPropertyListObject.m | 2 +- sope-appserver/SoOFS/OFSWebMethod.m | 4 +- sope-appserver/SoOFS/OFSWebMethodRenderer.m | 4 +- sope-appserver/SoOFS/SoOFS-Info.plist | 4 +- .../SoOFS/SoOFS.xcode/project.pbxproj | 1283 +++++++++++++++++ sope-appserver/SoOFS/Version | 2 +- sope-appserver/SoOFS/common.h | 31 +- .../sope-appserver.xcode/project.pbxproj | 50 + sope-core/sope-core.xcode/project.pbxproj | 8 +- sope-mime/NGImap4/NGImap4-Info.plist | 4 +- sope-mime/NGMime/NGMime-Info.plist | 4 +- 27 files changed, 1474 insertions(+), 110 deletions(-) create mode 100644 sope-appserver/SoOFS/SoOFS.xcode/project.pbxproj diff --git a/maintenance/ChangeLog b/maintenance/ChangeLog index 13bc6cec..038b69ea 100644 --- a/maintenance/ChangeLog +++ b/maintenance/ChangeLog @@ -1,3 +1,7 @@ +2005-01-04 Marcus Mueller + + * znek-fix-xcode-projects.sh: added SoOFS + 2004-12-14 Marcus Mueller * znek-fix-xcode-projects.sh: added my personal pre-commit Xcode diff --git a/maintenance/znek-fix-xcode-projects.sh b/maintenance/znek-fix-xcode-projects.sh index 42a5b765..4a3d5871 100755 --- a/maintenance/znek-fix-xcode-projects.sh +++ b/maintenance/znek-fix-xcode-projects.sh @@ -15,7 +15,7 @@ fixProject() # 2. build filter for frameworks FILTER="" - for f in SaxObjC DOM XmlRpc EOControl NGExtensions NGHttp NGObjWeb NGStreams NGXmlRpc SoObjects WebDAV NGImap4 NGMail NGMime SOPEX WEExtensions WOExtensions WOXML GDLAccess NGLdap NGiCal + for f in SaxObjC DOM XmlRpc EOControl NGExtensions NGHttp NGObjWeb NGStreams NGXmlRpc SoObjects WebDAV SoOFS NGImap4 NGMail NGMime SOPEX WEExtensions WOExtensions WOXML GDLAccess NGLdap NGiCal do FILTER="${FILTER} -e s;/Library/Frameworks/${f}.framework;\"\$(USER_LIBRARY_DIR)/EmbeddedFrameworks/${f}.framework\";g" done diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog index b9aa5955..a66aa879 100644 --- a/sope-appserver/ChangeLog +++ b/sope-appserver/ChangeLog @@ -1,3 +1,7 @@ +2005-01-04 Marcus Mueller + + * sope-appserver.xcode: added SoOFS product + 2004-12-14 Marcus Mueller * NGXmlRpc/NGXmlRpc.xcode: minor changes and updated diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 85143f7d..3710d7b0 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,18 @@ +2005-01-04 Marcus Mueller + + * v4.5.105 + + * NGObjWeb.xcode: removed target "SoProducts" from "all". By using a + minor hack we can avoid having to build products for SoCore and + SoOFS (new framework) altogether. + + * SoObjects/SoObjects.xcode: version updated, minor changes to build + process + + * SoObjects/SoProductRegistry.m: if compiled as framework, a project + named "SoObjects" will be registered as "SoCore" - this is + necessary to retain dependency tracking + 2004-12-21 Helge Hess * WOMessage.m: added 'WOMessageUseUTF8' bool default to enable UTF-8 diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj index 2e32609d..dec9fea4 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj @@ -464,7 +464,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.104; + DYLIB_CURRENT_VERSION = 4.5.105; 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 aac8c8e9..22151124 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj @@ -796,10 +796,7 @@ WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; }; dependencies = ( - AD20BB0A0737E57B002A6594, AD20BAE60737DB8B002A6594, - AD20BAE80737DB96002A6594, - AD20BB0C0737E57B002A6594, ); isa = PBXAggregateTarget; name = all; @@ -817,24 +814,12 @@ WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; }; dependencies = ( - AD20BAE40737DB7B002A6594, + ADE807390789F90C00633840, ); isa = PBXAggregateTarget; name = SoProducts; productName = Products; }; - AD20BAE30737DB7B002A6594 = { - containerPortal = ADD65B6A06DA32D6007161CA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = ADFE6FFD06E2765E006628C4; - remoteInfo = "SoCore (SXP)"; - }; - AD20BAE40737DB7B002A6594 = { - isa = PBXTargetDependency; - target = ADFE6FFD06E2765E006628C4; - targetProxy = AD20BAE30737DB7B002A6594; - }; AD20BAE50737DB8B002A6594 = { containerPortal = ADD65B6A06DA32D6007161CA; isa = PBXContainerItemProxy; @@ -847,18 +832,6 @@ target = ADD65D5706DA372D007161CA; targetProxy = AD20BAE50737DB8B002A6594; }; - AD20BAE70737DB96002A6594 = { - containerPortal = ADD65B6A06DA32D6007161CA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AD20BAE20737DB6F002A6594; - remoteInfo = Products; - }; - AD20BAE80737DB96002A6594 = { - isa = PBXTargetDependency; - target = AD20BAE20737DB6F002A6594; - targetProxy = AD20BAE70737DB96002A6594; - }; AD20BB060737E529002A6594 = { buildActionMask = 2147483647; files = ( @@ -890,30 +863,6 @@ name = CleanSoProducts; productName = CleanProducts; }; - AD20BB090737E57B002A6594 = { - containerPortal = ADD65B6A06DA32D6007161CA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AD20BB070737E529002A6594; - remoteInfo = CleanSoProducts; - }; - AD20BB0A0737E57B002A6594 = { - isa = PBXTargetDependency; - target = AD20BB070737E529002A6594; - targetProxy = AD20BB090737E57B002A6594; - }; - AD20BB0B0737E57B002A6594 = { - containerPortal = ADD65B6A06DA32D6007161CA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AD20BB030737E515002A6594; - remoteInfo = CopySoProducts; - }; - AD20BB0C0737E57B002A6594 = { - isa = PBXTargetDependency; - target = AD20BB100737E5AC002A6594; - targetProxy = AD20BB0B0737E57B002A6594; - }; AD20BB0F0737E5AC002A6594 = { buildActionMask = 2147483647; files = ( @@ -1655,7 +1604,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.104; + DYLIB_CURRENT_VERSION = 4.5.105; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1877,6 +1826,18 @@ settings = { }; }; + ADE807380789F90C00633840 = { + containerPortal = ADD65B6A06DA32D6007161CA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADFE6FFD06E2765E006628C4; + remoteInfo = "SoCore (SXP)"; + }; + ADE807390789F90C00633840 = { + isa = PBXTargetDependency; + target = ADFE6FFD06E2765E006628C4; + targetProxy = ADE807380789F90C00633840; + }; ADFE538B06E248EB006628C4 = { children = ( ADFE736706E287E6006628C4, diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj index 4bc06f51..e2a8362e 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj @@ -205,7 +205,7 @@ }; ADD65C9406DA34FF007161CA = { children = ( - ADFE722806E2859B006628C4, + ADE8072A0789F8B900633840, ); isa = PBXGroup; name = Classes; @@ -258,6 +258,7 @@ ADD65F6906DA3B38007161CA, AD013B8A06E20AC5000910D8, AD013B8C06E20AC5000910D8, + ADE807180789F87600633840, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -265,7 +266,7 @@ ADD65D5506DA372D007161CA = { buildActionMask = 2147483647; files = ( - ADFE722906E2859B006628C4, + ADE8072B0789F8B900633840, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -289,7 +290,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.104; + DYLIB_CURRENT_VERSION = 4.5.105; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -360,6 +361,7 @@ }; ADD65D5D06DA37C7007161CA = { children = ( + ADE807170789F87600633840, ADD65D5A06DA372D007161CA, ); isa = PBXGroup; @@ -402,6 +404,35 @@ settings = { }; }; + ADE807170789F87600633840 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = text.plist; + path = product.plist; + refType = 4; + sourceTree = ""; + }; + ADE807180789F87600633840 = { + fileRef = ADE807170789F87600633840; + isa = PBXBuildFile; + settings = { + }; + }; + ADE8072A0789F8B900633840 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = SoCoreProduct.m; + path = ../SoCoreProduct.m; + refType = 4; + sourceTree = ""; + }; + ADE8072B0789F8B900633840 = { + fileRef = ADE8072A0789F8B900633840; + isa = PBXBuildFile; + settings = { + }; + }; ADFE71C406E284CB006628C4 = { fileEncoding = 5; isa = PBXFileReference; @@ -923,21 +954,6 @@ ); }; }; - ADFE722806E2859B006628C4 = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = dummy.m; - path = ../dummy.m; - refType = 4; - sourceTree = ""; - }; - ADFE722906E2859B006628C4 = { - fileRef = ADFE722806E2859B006628C4; - isa = PBXBuildFile; - settings = { - }; - }; }; rootObject = ADD65B6A06DA32D6007161CA; } diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m index f1252bc4..c45acca8 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m +++ b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m @@ -97,7 +97,14 @@ static int debugOn = 0; } else productName = @"MAIN"; - + +#if COMPILE_AS_FRAMEWORK + /* Framework's name is SoObjects, but needs to be SoCore in order to + maintain dependency tracking */ + if ([productName isEqualToString:@"SoObjects"]) + productName = @"SoCore"; +#endif + if ((product = [self->products objectForKey:productName])) { [self debugWithFormat:@"product '%@' already registered.", productName]; [product reloadIfPossible]; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index e6908ce5..b6aef3db 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=104 +SUBMINOR_VERSION:=105 # v4.5.91 requires libNGExtensions v4.5.134 # v4.5.84 requires libNGExtensions v4.5.127 diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj index 1f200055..48525f0e 100644 --- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj @@ -229,7 +229,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.104; + DYLIB_CURRENT_VERSION = 4.5.105; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGXmlRpc/NGXmlRpc.xcode/project.pbxproj b/sope-appserver/NGXmlRpc/NGXmlRpc.xcode/project.pbxproj index 5db4ca8a..c3b7dd61 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpc.xcode/project.pbxproj +++ b/sope-appserver/NGXmlRpc/NGXmlRpc.xcode/project.pbxproj @@ -959,7 +959,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.8; + DYLIB_CURRENT_VERSION = 4.5.9; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index 0d6bb9ba..4df314eb 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,21 @@ +2005-01-04 Marcus Mueller + + * v4.5.13 + + * SoOFS.xcode: new product + + * SoOFS-Info.plist: updated properly + + * GNUmakefile.preamble: adjusted include paths, this way it works in + Xcode also without major changes. + + * common.h: safeguarded against double inclusion. Adjusted #include + paths + + * OFSFactoryRegistry.m, OFSHttpPasswd.m, OFSWebMethodRenderer.m, + OFSWebMethod.m, OFSFileRenderer.m, OFSPropertyListObject.m: adjusted + #include path. + 2004-11-04 Helge Hess * use Version file for install directory location diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble index b5d03081..5829c5a1 100644 --- a/sope-appserver/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/SoOFS/GNUmakefile.preamble @@ -10,8 +10,6 @@ ADDITIONAL_INCLUDE_DIRS += \ -I. \ -I.. \ -I../NGObjWeb \ - -I../NGObjWeb/SoObjects \ - -I../NGObjWeb/WebDAV \ -I$(CORE_ROOT) \ -I$(CORE_ROOT)/NGStreams/ \ -I$(CORE_ROOT)/NGExtensions \ diff --git a/sope-appserver/SoOFS/OFSFactoryRegistry.m b/sope-appserver/SoOFS/OFSFactoryRegistry.m index b397de61..6bc6726d 100644 --- a/sope-appserver/SoOFS/OFSFactoryRegistry.m +++ b/sope-appserver/SoOFS/OFSFactoryRegistry.m @@ -23,8 +23,8 @@ #include "OFSFolder.h" #include "OFSFile.h" #include "OFSFactoryContext.h" -#include "SoClassRegistry.h" -#include "SoObjCClass.h" +#include +#include #include "common.h" @interface SoClass(Factory) diff --git a/sope-appserver/SoOFS/OFSFileRenderer.m b/sope-appserver/SoOFS/OFSFileRenderer.m index bf81e5f6..f5411fbf 100644 --- a/sope-appserver/SoOFS/OFSFileRenderer.m +++ b/sope-appserver/SoOFS/OFSFileRenderer.m @@ -24,7 +24,6 @@ #include #include #include -#include "NSException+HTTP.h" #include "common.h" @interface OFSFile(Render) diff --git a/sope-appserver/SoOFS/OFSHttpPasswd.m b/sope-appserver/SoOFS/OFSHttpPasswd.m index 3557b7ce..6584bdf1 100644 --- a/sope-appserver/SoOFS/OFSHttpPasswd.m +++ b/sope-appserver/SoOFS/OFSHttpPasswd.m @@ -20,7 +20,7 @@ */ #include "OFSHttpPasswd.h" -#include "SoHTTPAuthenticator.h" +#include #include "common.h" #if defined (__APPLE__) || defined(__FreeBSD__) diff --git a/sope-appserver/SoOFS/OFSPropertyListObject.m b/sope-appserver/SoOFS/OFSPropertyListObject.m index 39b4418d..85a07e00 100644 --- a/sope-appserver/SoOFS/OFSPropertyListObject.m +++ b/sope-appserver/SoOFS/OFSPropertyListObject.m @@ -21,7 +21,7 @@ #include "OFSPropertyListObject.h" #include "OFSFactoryContext.h" -#include "SoObject+SoDAV.h" +#include #include "common.h" @interface OFSPropertyListObjectClassDescription : NSClassDescription diff --git a/sope-appserver/SoOFS/OFSWebMethod.m b/sope-appserver/SoOFS/OFSWebMethod.m index 273cf12d..eacb2012 100644 --- a/sope-appserver/SoOFS/OFSWebMethod.m +++ b/sope-appserver/SoOFS/OFSWebMethod.m @@ -20,7 +20,9 @@ */ #include "OFSWebMethod.h" -#include "WOContext+private.h" // required for page rendering +#ifdef COMPILE_FOR_GSTEP_MAKE +# include "WOContext+private.h" // required for page rendering +#endif #include #include #include diff --git a/sope-appserver/SoOFS/OFSWebMethodRenderer.m b/sope-appserver/SoOFS/OFSWebMethodRenderer.m index c9ae9200..c9dc6699 100644 --- a/sope-appserver/SoOFS/OFSWebMethodRenderer.m +++ b/sope-appserver/SoOFS/OFSWebMethodRenderer.m @@ -21,7 +21,9 @@ #include "OFSWebMethodRenderer.h" #include "OFSWebMethod.h" -#include "WOContext+private.h" // required for page rendering +#ifdef COMPILE_FOR_GSTEP_MAKE +# include "WOContext+private.h" // required for page rendering +#endif #include #include "common.h" diff --git a/sope-appserver/SoOFS/SoOFS-Info.plist b/sope-appserver/SoOFS/SoOFS-Info.plist index 0b78ca26..e141af76 100644 --- a/sope-appserver/SoOFS/SoOFS-Info.plist +++ b/sope-appserver/SoOFS/SoOFS-Info.plist @@ -9,7 +9,7 @@ CFBundleGetInfoString CFBundleIdentifier - com.skyrix.SOPE.NGObjWeb.SoOFS + org.OpenGroupware.SOPE.appserver.SoOFS CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 4.2 + 4.5 diff --git a/sope-appserver/SoOFS/SoOFS.xcode/project.pbxproj b/sope-appserver/SoOFS/SoOFS.xcode/project.pbxproj new file mode 100644 index 00000000..326438cb --- /dev/null +++ b/sope-appserver/SoOFS/SoOFS.xcode/project.pbxproj @@ -0,0 +1,1283 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 39; + objects = { + AD013B8706E20AC5000910D8 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = text; + path = README; + refType = 4; + sourceTree = ""; + }; + AD013B8C06E20AC5000910D8 = { + fileRef = AD013B8706E20AC5000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C1806E20C17000910D8 = { + children = ( + AD4606EA0789911E00E8C5A3, + AD4606C60789911E00E8C5A3, + AD4606C80789911E00E8C5A3, + AD4606CA0789911E00E8C5A3, + AD4606CC0789911E00E8C5A3, + AD4606CE0789911E00E8C5A3, + AD4606D00789911E00E8C5A3, + AD4606D20789911E00E8C5A3, + AD4606D50789911E00E8C5A3, + AD4606D70789911E00E8C5A3, + AD4606D90789911E00E8C5A3, + AD4606DB0789911E00E8C5A3, + AD4606DD0789911E00E8C5A3, + AD4606DF0789911E00E8C5A3, + AD4606E10789911E00E8C5A3, + AD4606E30789911E00E8C5A3, + AD4606E50789911E00E8C5A3, + AD4606E70789911E00E8C5A3, + ); + fileEncoding = 5; + indentWidth = 2; + isa = PBXGroup; + name = Headers; + refType = 4; + sourceTree = ""; + }; + AD013C1906E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGHttp.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGHttp.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C1B06E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGImap4.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGImap4.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C1D06E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGMail.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGMail.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C1E06E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGMime.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGMime.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C2006E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGObjWeb.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGObjWeb.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C2106E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGStreams.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGStreams.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C2306E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = WebDAV.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/WebDAV.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C2406E20D18000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = WEExtensions.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/WEExtensions.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C2506E20D19000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = WOExtensions.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/WOExtensions.framework"; + refType = 0; + sourceTree = ""; + }; + AD013C2606E20D19000910D8 = { + fileRef = AD013C1906E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C2806E20D19000910D8 = { + fileRef = AD013C1B06E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C2A06E20D19000910D8 = { + fileRef = AD013C1D06E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C2B06E20D19000910D8 = { + fileRef = AD013C1E06E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C2D06E20D19000910D8 = { + fileRef = AD013C2006E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C2E06E20D19000910D8 = { + fileRef = AD013C2106E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C3006E20D19000910D8 = { + fileRef = AD013C2306E20D18000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD013C9E06E20E99000910D8 = { + children = ( + ADD6610D06DA3D1F007161CA, + AD0142CE06E21A3D000910D8, + AD013C2106E20D18000910D8, + ); + isa = PBXGroup; + name = "sope-core"; + refType = 4; + sourceTree = ""; + }; + AD013DD406E20EBA000910D8 = { + children = ( + AD013C2006E20D18000910D8, + AD013C2406E20D18000910D8, + AD013C2506E20D19000910D8, + AD013C1906E20D18000910D8, + AD013C2306E20D18000910D8, + AD460762078992EA00E8C5A3, + ); + isa = PBXGroup; + name = "sope-appserver"; + refType = 4; + sourceTree = ""; + }; + AD01401C06E20F1D000910D8 = { + children = ( + AD013C1B06E20D18000910D8, + AD013C1D06E20D18000910D8, + AD013C1E06E20D18000910D8, + ); + isa = PBXGroup; + name = "sope-mime"; + refType = 4; + sourceTree = ""; + }; + AD0142CE06E21A3D000910D8 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = NGExtensions.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/NGExtensions.framework"; + refType = 0; + sourceTree = ""; + }; + AD0142CF06E21A3D000910D8 = { + fileRef = AD0142CE06E21A3D000910D8; + isa = PBXBuildFile; + settings = { + }; + }; + AD4604660789885D00E8C5A3 = { + explicitFileType = sourcecode.make; + fileEncoding = 5; + indentWidth = 8; + isa = PBXFileReference; + path = fhs.make; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + AD4606C60789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSBaseObject.h; + refType = 4; + sourceTree = ""; + }; + AD4606C70789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSBaseObject.m; + refType = 4; + sourceTree = ""; + }; + AD4606C80789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSChangeLog.h; + refType = 4; + sourceTree = ""; + }; + AD4606C90789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSChangeLog.m; + refType = 4; + sourceTree = ""; + }; + AD4606CA0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFactoryContext.h; + refType = 4; + sourceTree = ""; + }; + AD4606CB0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFactoryContext.m; + refType = 4; + sourceTree = ""; + }; + AD4606CC0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFactoryRegistry.h; + refType = 4; + sourceTree = ""; + }; + AD4606CD0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFactoryRegistry.m; + refType = 4; + sourceTree = ""; + }; + AD4606CE0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFile.h; + refType = 4; + sourceTree = ""; + }; + AD4606CF0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFile.m; + refType = 4; + sourceTree = ""; + }; + AD4606D00789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFileRenderer.h; + refType = 4; + sourceTree = ""; + }; + AD4606D10789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFileRenderer.m; + refType = 4; + sourceTree = ""; + }; + AD4606D20789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFolder.h; + refType = 4; + sourceTree = ""; + }; + AD4606D30789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFolder.m; + refType = 4; + sourceTree = ""; + }; + AD4606D40789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = "OFSFolder+SoDAV.m"; + refType = 4; + sourceTree = ""; + }; + AD4606D50789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFolderClassDescription.h; + refType = 4; + sourceTree = ""; + }; + AD4606D60789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFolderClassDescription.m; + refType = 4; + sourceTree = ""; + }; + AD4606D70789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSFolderDataSource.h; + refType = 4; + sourceTree = ""; + }; + AD4606D80789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSFolderDataSource.m; + refType = 4; + sourceTree = ""; + }; + AD4606D90789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSHttpPasswd.h; + refType = 4; + sourceTree = ""; + }; + AD4606DA0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSHttpPasswd.m; + refType = 4; + sourceTree = ""; + }; + AD4606DB0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSImage.h; + refType = 4; + sourceTree = ""; + }; + AD4606DC0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSImage.m; + refType = 4; + sourceTree = ""; + }; + AD4606DD0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSPropertyListObject.h; + refType = 4; + sourceTree = ""; + }; + AD4606DE0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSPropertyListObject.m; + refType = 4; + sourceTree = ""; + }; + AD4606DF0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSResourceManager.h; + refType = 4; + sourceTree = ""; + }; + AD4606E00789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSResourceManager.m; + refType = 4; + sourceTree = ""; + }; + AD4606E10789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSWebDocument.h; + refType = 4; + sourceTree = ""; + }; + AD4606E20789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSWebDocument.m; + refType = 4; + sourceTree = ""; + }; + AD4606E30789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSWebMethod.h; + refType = 4; + sourceTree = ""; + }; + AD4606E40789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSWebMethod.m; + refType = 4; + sourceTree = ""; + }; + AD4606E50789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSWebMethodRenderer.h; + refType = 4; + sourceTree = ""; + }; + AD4606E60789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSWebMethodRenderer.m; + refType = 4; + sourceTree = ""; + }; + AD4606E70789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = OFSWebTemplate.h; + refType = 4; + sourceTree = ""; + }; + AD4606E80789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = OFSWebTemplate.m; + refType = 4; + sourceTree = ""; + }; + AD4606E90789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = text.plist; + path = product.plist; + refType = 4; + sourceTree = ""; + }; + AD4606EA0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = SoOFS.h; + refType = 4; + sourceTree = ""; + }; + AD4606EB0789911E00E8C5A3 = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = SoOFSProduct.m; + refType = 4; + sourceTree = ""; + }; + AD4606EC0789911E00E8C5A3 = { + fileRef = AD4606C60789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606ED0789911E00E8C5A3 = { + fileRef = AD4606C70789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606EE0789911E00E8C5A3 = { + fileRef = AD4606C80789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606EF0789911E00E8C5A3 = { + fileRef = AD4606C90789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606F00789911E00E8C5A3 = { + fileRef = AD4606CA0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606F10789911E00E8C5A3 = { + fileRef = AD4606CB0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606F20789911E00E8C5A3 = { + fileRef = AD4606CC0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606F30789911E00E8C5A3 = { + fileRef = AD4606CD0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606F40789911E00E8C5A3 = { + fileRef = AD4606CE0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606F50789911E00E8C5A3 = { + fileRef = AD4606CF0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606F60789911E00E8C5A3 = { + fileRef = AD4606D00789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606F70789911E00E8C5A3 = { + fileRef = AD4606D10789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606F80789911E00E8C5A3 = { + fileRef = AD4606D20789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606F90789911E00E8C5A3 = { + fileRef = AD4606D30789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606FA0789911E00E8C5A3 = { + fileRef = AD4606D40789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606FB0789911E00E8C5A3 = { + fileRef = AD4606D50789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + ); + }; + }; + AD4606FC0789911E00E8C5A3 = { + fileRef = AD4606D60789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606FD0789911E00E8C5A3 = { + fileRef = AD4606D70789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4606FE0789911E00E8C5A3 = { + fileRef = AD4606D80789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4606FF0789911E00E8C5A3 = { + fileRef = AD4606D90789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4607000789911E00E8C5A3 = { + fileRef = AD4606DA0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4607010789911E00E8C5A3 = { + fileRef = AD4606DB0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4607020789911E00E8C5A3 = { + fileRef = AD4606DC0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4607030789911E00E8C5A3 = { + fileRef = AD4606DD0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4607040789911E00E8C5A3 = { + fileRef = AD4606DE0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4607050789911E00E8C5A3 = { + fileRef = AD4606DF0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4607060789911E00E8C5A3 = { + fileRef = AD4606E00789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4607070789911E00E8C5A3 = { + fileRef = AD4606E10789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD4607080789911E00E8C5A3 = { + fileRef = AD4606E20789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4607090789911E00E8C5A3 = { + fileRef = AD4606E30789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD46070A0789911E00E8C5A3 = { + fileRef = AD4606E40789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD46070B0789911E00E8C5A3 = { + fileRef = AD4606E50789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD46070C0789911E00E8C5A3 = { + fileRef = AD4606E60789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD46070D0789911E00E8C5A3 = { + fileRef = AD4606E70789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD46070E0789911E00E8C5A3 = { + fileRef = AD4606E80789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD46070F0789911E00E8C5A3 = { + fileRef = AD4606E90789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + AD4607100789911E00E8C5A3 = { + fileRef = AD4606EA0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + AD460762078992EA00E8C5A3 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = SoObjects.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/SoObjects.framework"; + refType = 0; + sourceTree = ""; + }; + AD460763078992EA00E8C5A3 = { + fileRef = AD460762078992EA00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65B6606DA32D6007161CA = { + children = ( + AD013B8706E20AC5000910D8, + ADD65C8A06DA343C007161CA, + ADD65C6F06DA343C007161CA, + ADD65C8B06DA343C007161CA, + ADD65C8E06DA344C007161CA, + AD013C1806E20C17000910D8, + ADD65C9406DA34FF007161CA, + ADD65D5D06DA37C7007161CA, + ADD65D5906DA372D007161CA, + ADD65F7306DA3C02007161CA, + ); + isa = PBXGroup; + refType = 4; + sourceTree = ""; + }; + ADD65B6806DA32D6007161CA = { + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = "APPLE_RUNTIME=1 NeXT_Foundation_LIBRARY=1 COCOA_Foundation_LIBRARY=1 NeXT_RUNTIME=1 COMPILE_AS_FRAMEWORK=1 DEBUG=1"; + }; + isa = PBXBuildStyle; + name = Development; + }; + ADD65B6906DA32D6007161CA = { + buildSettings = { + COPY_PHASE_STRIP = YES; + DEPLOYMENT_LOCATION = NO; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; + DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; + FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = "APPLE_RUNTIME=1 NeXT_Foundation_LIBRARY=1 COCOA_Foundation_LIBRARY=1 NeXT_RUNTIME=1 COMPILE_AS_FRAMEWORK=1"; + SKIP_INSTALL = YES; + SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; + UNSTRIPPED_PRODUCT = NO; + ZERO_LINK = NO; + }; + isa = PBXBuildStyle; + name = Wrapper; + }; + ADD65B6A06DA32D6007161CA = { + buildSettings = { + }; + buildStyles = ( + ADD65B6806DA32D6007161CA, + ADD65B6906DA32D6007161CA, + ); + hasScannedForEncodings = 0; + isa = PBXProject; + mainGroup = ADD65B6606DA32D6007161CA; + productRefGroup = ADD65D5906DA372D007161CA; + projectDirPath = ""; + targets = ( + ADD65D5706DA372D007161CA, + ); + }; + ADD65C6F06DA343C007161CA = { + fileEncoding = 5; + indentWidth = 8; + isa = PBXFileReference; + lastKnownFileType = text; + path = ChangeLog; + refType = 4; + sourceTree = ""; + tabWidth = 8; + usesTabs = 1; + }; + ADD65C7006DA343C007161CA = { + fileEncoding = 5; + indentWidth = 2; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = common.h; + refType = 4; + sourceTree = ""; + }; + ADD65C7406DA343C007161CA = { + explicitFileType = sourcecode.make; + fileEncoding = 5; + indentWidth = 8; + isa = PBXFileReference; + path = GNUmakefile; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + ADD65C7506DA343C007161CA = { + explicitFileType = sourcecode.make; + fileEncoding = 5; + indentWidth = 8; + isa = PBXFileReference; + path = GNUmakefile.preamble; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + ADD65C8A06DA343C007161CA = { + fileEncoding = 5; + isa = PBXFileReference; + lastKnownFileType = text; + path = TODO; + refType = 4; + sourceTree = ""; + }; + ADD65C8B06DA343C007161CA = { + explicitFileType = sourcecode.make; + fileEncoding = 5; + indentWidth = 8; + isa = PBXFileReference; + path = Version; + refType = 4; + sourceTree = ""; + tabWidth = 8; + }; + ADD65C8E06DA344C007161CA = { + children = ( + ADD65C7406DA343C007161CA, + ADD65C7506DA343C007161CA, + AD4604660789885D00E8C5A3, + ); + isa = PBXGroup; + name = Makefiles; + refType = 4; + sourceTree = ""; + }; + ADD65C9406DA34FF007161CA = { + children = ( + ADD65C7006DA343C007161CA, + AD4606C70789911E00E8C5A3, + AD4606C90789911E00E8C5A3, + AD4606CB0789911E00E8C5A3, + AD4606CD0789911E00E8C5A3, + AD4606CF0789911E00E8C5A3, + AD4606D10789911E00E8C5A3, + AD4606D30789911E00E8C5A3, + AD4606D40789911E00E8C5A3, + AD4606D60789911E00E8C5A3, + AD4606D80789911E00E8C5A3, + AD4606DA0789911E00E8C5A3, + AD4606DC0789911E00E8C5A3, + AD4606DE0789911E00E8C5A3, + AD4606E00789911E00E8C5A3, + AD4606E20789911E00E8C5A3, + AD4606E40789911E00E8C5A3, + AD4606E60789911E00E8C5A3, + AD4606E80789911E00E8C5A3, + AD4606EB0789911E00E8C5A3, + ); + fileEncoding = 5; + indentWidth = 2; + isa = PBXGroup; + name = Classes; + refType = 4; + sourceTree = ""; + tabWidth = 2; + }; + ADD65D5306DA372D007161CA = { + buildActionMask = 2147483647; + files = ( + ADD65F6406DA3AF6007161CA, + AD4606EC0789911E00E8C5A3, + AD4606EE0789911E00E8C5A3, + AD4606F00789911E00E8C5A3, + AD4606F20789911E00E8C5A3, + AD4606F40789911E00E8C5A3, + AD4606F60789911E00E8C5A3, + AD4606F80789911E00E8C5A3, + AD4606FB0789911E00E8C5A3, + AD4606FD0789911E00E8C5A3, + AD4606FF0789911E00E8C5A3, + AD4607010789911E00E8C5A3, + AD4607030789911E00E8C5A3, + AD4607050789911E00E8C5A3, + AD4607070789911E00E8C5A3, + AD4607090789911E00E8C5A3, + AD46070B0789911E00E8C5A3, + AD46070D0789911E00E8C5A3, + AD4607100789911E00E8C5A3, + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + ADD65D5406DA372D007161CA = { + buildActionMask = 2147483647; + files = ( + ADD65F6706DA3B38007161CA, + ADD65F6806DA3B38007161CA, + ADD65F6906DA3B38007161CA, + AD013B8C06E20AC5000910D8, + AD46070F0789911E00E8C5A3, + ); + isa = PBXResourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + ADD65D5506DA372D007161CA = { + buildActionMask = 2147483647; + files = ( + AD4606ED0789911E00E8C5A3, + AD4606EF0789911E00E8C5A3, + AD4606F10789911E00E8C5A3, + AD4606F30789911E00E8C5A3, + AD4606F50789911E00E8C5A3, + AD4606F70789911E00E8C5A3, + AD4606F90789911E00E8C5A3, + AD4606FA0789911E00E8C5A3, + AD4606FC0789911E00E8C5A3, + AD4606FE0789911E00E8C5A3, + AD4607000789911E00E8C5A3, + AD4607020789911E00E8C5A3, + AD4607040789911E00E8C5A3, + AD4607060789911E00E8C5A3, + AD4607080789911E00E8C5A3, + AD46070A0789911E00E8C5A3, + AD46070C0789911E00E8C5A3, + AD46070E0789911E00E8C5A3, + ADE806E20789F76900633840, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + ADD65D5606DA372D007161CA = { + buildActionMask = 2147483647; + files = ( + ADD65F7506DA3C51007161CA, + ADD6610E06DA3D1F007161CA, + ADD65FE906DA3CDE007161CA, + ADD65FE806DA3CDE007161CA, + ADD65FEA06DA3CDE007161CA, + AD013C2606E20D19000910D8, + AD013C2806E20D19000910D8, + AD013C2A06E20D19000910D8, + AD013C2B06E20D19000910D8, + AD013C2D06E20D19000910D8, + AD013C2E06E20D19000910D8, + AD013C3006E20D19000910D8, + AD0142CF06E21A3D000910D8, + AD460763078992EA00E8C5A3, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + ADD65D5706DA372D007161CA = { + buildPhases = ( + ADD65D5306DA372D007161CA, + ADD65D5406DA372D007161CA, + ADD65D5506DA372D007161CA, + ADD65D5606DA372D007161CA, + ); + buildRules = ( + ); + buildSettings = { + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 4.5.13; + FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_VERSION = A; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = common.h; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = NO; + INFOPLIST_FILE = "SoOFS-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + OTHER_CFLAGS = "-DXCODE_BUILD=1"; + OTHER_LDFLAGS = "-seg1addr 0xC3A00000 -headerpad_max_install_names"; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = SoOFS; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost"; + }; + dependencies = ( + ); + isa = PBXNativeTarget; + name = SoOFS; + productName = SoOFS; + productReference = ADD65D5806DA372D007161CA; + productSettingsXML = " + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + SoOFS + CFBundleIdentifier + org.OpenGroupware.SOPE.SoOFS + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + +"; + productType = "com.apple.product-type.framework"; + }; + ADD65D5806DA372D007161CA = { + explicitFileType = wrapper.framework; + includeInIndex = 0; + isa = PBXFileReference; + path = SoOFS.framework; + refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; + }; + ADD65D5906DA372D007161CA = { + children = ( + ADD65D5806DA372D007161CA, + ); + isa = PBXGroup; + name = Products; + refType = 4; + sourceTree = ""; + }; + ADD65D5A06DA372D007161CA = { + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = "SoOFS-Info.plist"; + refType = 4; + sourceTree = ""; + }; + ADD65D5D06DA37C7007161CA = { + children = ( + ADD65D5A06DA372D007161CA, + AD4606E90789911E00E8C5A3, + ); + isa = PBXGroup; + name = Resources; + refType = 4; + sourceTree = ""; + }; + ADD65F6406DA3AF6007161CA = { + fileRef = ADD65C7006DA343C007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65F6706DA3B38007161CA = { + fileRef = ADD65C8A06DA343C007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65F6806DA3B38007161CA = { + fileRef = ADD65C6F06DA343C007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65F6906DA3B38007161CA = { + fileRef = ADD65C8B06DA343C007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65F7306DA3C02007161CA = { + children = ( + ADD65F7406DA3C51007161CA, + ADD6603106DA3CE2007161CA, + AD013C9E06E20E99000910D8, + AD01401C06E20F1D000910D8, + AD013DD406E20EBA000910D8, + ); + isa = PBXGroup; + name = "Linked Frameworks"; + refType = 4; + sourceTree = ""; + }; + ADD65F7406DA3C51007161CA = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = Foundation.framework; + path = /System/Library/Frameworks/Foundation.framework; + refType = 0; + sourceTree = ""; + }; + ADD65F7506DA3C51007161CA = { + fileRef = ADD65F7406DA3C51007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65FE506DA3CDE007161CA = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = DOM.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/DOM.framework"; + refType = 0; + sourceTree = ""; + }; + ADD65FE606DA3CDE007161CA = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = SaxObjC.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/SaxObjC.framework"; + refType = 0; + sourceTree = ""; + }; + ADD65FE706DA3CDE007161CA = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = XmlRpc.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/XmlRpc.framework"; + refType = 0; + sourceTree = ""; + }; + ADD65FE806DA3CDE007161CA = { + fileRef = ADD65FE506DA3CDE007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65FE906DA3CDE007161CA = { + fileRef = ADD65FE606DA3CDE007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD65FEA06DA3CDE007161CA = { + fileRef = ADD65FE706DA3CDE007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADD6603106DA3CE2007161CA = { + children = ( + ADD65FE506DA3CDE007161CA, + ADD65FE606DA3CDE007161CA, + ADD65FE706DA3CDE007161CA, + ); + isa = PBXGroup; + name = "sope-xml"; + refType = 4; + sourceTree = ""; + }; + ADD6610D06DA3D1F007161CA = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = EOControl.framework; + path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/EOControl.framework"; + refType = 0; + sourceTree = ""; + }; + ADD6610E06DA3D1F007161CA = { + fileRef = ADD6610D06DA3D1F007161CA; + isa = PBXBuildFile; + settings = { + }; + }; + ADE806E20789F76900633840 = { + fileRef = AD4606EB0789911E00E8C5A3; + isa = PBXBuildFile; + settings = { + }; + }; + }; + rootObject = ADD65B6A06DA32D6007161CA; +} diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version index 81248043..36c1074d 100644 --- a/sope-appserver/SoOFS/Version +++ b/sope-appserver/SoOFS/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=12 +SUBMINOR_VERSION:=13 diff --git a/sope-appserver/SoOFS/common.h b/sope-appserver/SoOFS/common.h index 66337801..7db4ec0c 100644 --- a/sope-appserver/SoOFS/common.h +++ b/sope-appserver/SoOFS/common.h @@ -19,6 +19,9 @@ 02111-1307, USA. */ +#ifndef __SoOFS_common_H__ +#define __SoOFS_common_H__ + #import #if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY @@ -28,24 +31,26 @@ #include -#include "NSException+HTTP.h" #include #include #include -#include "SoClass.h" -#include "SoClassRegistry.h" -#include "SoClassSecurityInfo.h" -#include "SoDefaultRenderer.h" -#include "SoObject.h" -#include "SoObjectMethodDispatcher.h" -#include "SoObjectRequestHandler.h" -#include "SoPermissions.h" -#include "SoSecurityManager.h" -#include "SoUser.h" -#include "WOContext+SoObjects.h" -#include "NSException+HTTP.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include @interface NSObject(LastException) - (NSException *)lastException; @end + +#endif /* __SoOFS_common_H__ */ diff --git a/sope-appserver/sope-appserver.xcode/project.pbxproj b/sope-appserver/sope-appserver.xcode/project.pbxproj index b8ff1c90..e00dd2f0 100644 --- a/sope-appserver/sope-appserver.xcode/project.pbxproj +++ b/sope-appserver/sope-appserver.xcode/project.pbxproj @@ -416,6 +416,10 @@ ProductGroup = AD8BEFF007005DBE00EC239A; ProjectRef = AD8BEFEF07005DBE00EC239A; }, + { + ProductGroup = ADEAC65C078A325700097697; + ProjectRef = ADEAC65B078A325700097697; + }, ); targets = ( ADDF479906DA58D700C4E7F8, @@ -527,6 +531,7 @@ AD915D2B06E29B83004720C2, AD915D2906E29B83004720C2, ADBFE95F073EA9BE00E7F7CA, + ADEAC660078A327000097697, ); isa = PBXAggregateTarget; name = "Wrapper Contents"; @@ -541,6 +546,7 @@ ADBFE95B073EA9AD00E7F7CA, AD915D0E06E29B5D004720C2, AD915D0C06E29B51004720C2, + ADEAC65B078A325700097697, ); isa = PBXGroup; name = Projects; @@ -572,6 +578,50 @@ target = ADDF478006DA57DA00C4E7F8; targetProxy = ADDF479A06DA58DD00C4E7F8; }; + ADEAC65B078A325700097697 = { + isa = PBXFileReference; + lastKnownFileType = "wrapper.pb-project"; + name = SoOFS.xcode; + path = SoOFS/SoOFS.xcode; + refType = 4; + sourceTree = ""; + }; + ADEAC65C078A325700097697 = { + children = ( + ADEAC65E078A325900097697, + ); + isa = PBXGroup; + name = Products; + refType = 4; + sourceTree = ""; + }; + ADEAC65E078A325900097697 = { + fileType = wrapper.framework; + isa = PBXReferenceProxy; + path = SoOFS.framework; + refType = 3; + remoteRef = ADEAC665078A327A00097697; + sourceTree = BUILT_PRODUCTS_DIR; + }; + ADEAC65F078A327000097697 = { + containerPortal = ADEAC65B078A325700097697; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADD65D5706DA372D007161CA; + remoteInfo = SoOFS; + }; + ADEAC660078A327000097697 = { + isa = PBXTargetDependency; + name = "SoOFS (from SoOFS.xcode)"; + targetProxy = ADEAC65F078A327000097697; + }; + ADEAC665078A327A00097697 = { + containerPortal = ADEAC65B078A325700097697; + isa = PBXContainerItemProxy; + proxyType = 2; + remoteGlobalIDString = ADD65D5806DA372D007161CA; + remoteInfo = SoOFS; + }; }; rootObject = ADDF476A06DA572500C4E7F8; } diff --git a/sope-core/sope-core.xcode/project.pbxproj b/sope-core/sope-core.xcode/project.pbxproj index 9dab271c..3c8c676c 100644 --- a/sope-core/sope-core.xcode/project.pbxproj +++ b/sope-core/sope-core.xcode/project.pbxproj @@ -65,10 +65,6 @@ mainGroup = ADDF476606DA572500C4E7F8; projectDirPath = ""; projectReferences = ( - { - ProductGroup = ADDF478706DA581F00C4E7F8; - ProjectRef = ADDF478606DA581F00C4E7F8; - }, { ProductGroup = ADDF478906DA583300C4E7F8; ProjectRef = ADDF478806DA583300C4E7F8; @@ -77,6 +73,10 @@ ProductGroup = ADDF478506DA580C00C4E7F8; ProjectRef = ADDF478406DA580C00C4E7F8; }, + { + ProductGroup = ADDF478706DA581F00C4E7F8; + ProjectRef = ADDF478606DA581F00C4E7F8; + }, ); targets = ( ADDF479906DA58D700C4E7F8, diff --git a/sope-mime/NGImap4/NGImap4-Info.plist b/sope-mime/NGImap4/NGImap4-Info.plist index b97e78b5..ea83f907 100644 --- a/sope-mime/NGImap4/NGImap4-Info.plist +++ b/sope-mime/NGImap4/NGImap4-Info.plist @@ -9,7 +9,7 @@ CFBundleGetInfoString CFBundleIdentifier - com.skyrix.core.NGImap4 + org.OpenGroupware.SOPE.mime.NGImap4 CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 4.2 + 4.5 diff --git a/sope-mime/NGMime/NGMime-Info.plist b/sope-mime/NGMime/NGMime-Info.plist index 29026be6..23ab3e6e 100644 --- a/sope-mime/NGMime/NGMime-Info.plist +++ b/sope-mime/NGMime/NGMime-Info.plist @@ -9,7 +9,7 @@ CFBundleGetInfoString CFBundleIdentifier - com.skyrix.core.NGMime + org.OpenGroupware.SOPE.mime.NGMime CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 4.2 + 4.5 -- 2.39.5