From: znek Date: Thu, 27 Apr 2006 12:13:43 +0000 (+0000) Subject: reverted gstep-base workaround (fixed in gstep-base svn trunk), bumped framework... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fb4b5f7b7dc68f1ac4d29201781790b95803d4a;p=sope reverted gstep-base workaround (fixed in gstep-base svn trunk), bumped framework versions, updated ignore properties on directories to ignore package build results git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1255 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/SOPE-Info.plist b/SOPE-Info.plist new file mode 100644 index 00000000..72bd7e89 --- /dev/null +++ b/SOPE-Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + SOPE + CFBundleIdentifier + org.OpenGroupware.SOPE + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 4.5 + + diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj index abe76bc7..02ec1406 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj @@ -410,7 +410,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -596,7 +596,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -637,7 +637,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -680,7 +680,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj index 667f05db..6cd5ca36 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj @@ -1984,7 +1984,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1998,7 +1998,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=226", + "-DSOPE_SUBMINOR_VERSION=228", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2506,7 +2506,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -2530,7 +2530,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=226", + "-DSOPE_SUBMINOR_VERSION=228", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2552,7 +2552,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -2577,7 +2577,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=226", + "-DSOPE_SUBMINOR_VERSION=228", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2600,7 +2600,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2614,7 +2614,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=226", + "-DSOPE_SUBMINOR_VERSION=228", ); OTHER_LDFLAGS = ( "-seg1addr", diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj index 403d5992..7b2a4c37 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj @@ -305,7 +305,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -404,7 +404,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -444,7 +444,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -486,7 +486,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj index c592fb67..87bae51c 100644 --- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj @@ -234,7 +234,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -332,7 +332,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -372,7 +372,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -414,7 +414,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.226; + DYLIB_CURRENT_VERSION = 4.5.228; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index b07b8da7..7db2e9e0 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,8 @@ +2006-04-27 Marcus Mueller + + * OFSPropertyListObject.m: removed workaround for gstep-base KVC + problem - this has been fixed in gstep-base svn trunk (4.5.21) + 2006-04-08 Marcus Mueller * OFSPropertyListObject.m: added a workaround for a current gstep-base diff --git a/sope-appserver/SoOFS/OFSPropertyListObject.m b/sope-appserver/SoOFS/OFSPropertyListObject.m index 3ac0c23f..e04f93c8 100644 --- a/sope-appserver/SoOFS/OFSPropertyListObject.m +++ b/sope-appserver/SoOFS/OFSPropertyListObject.m @@ -267,11 +267,6 @@ static int debugOn = 0; [self->record setObject:_value?_value:@"" forKey:_key]; } -/* ZNeK: due to a bug in gstep-base 1.12.0 KVC, we need to add this */ -- (void)setValue:(id)_value forUndefinedKey:(NSString *)_key { - [self handleTakeValue:_value forUnboundKey:_key]; -} - - (BOOL)isStoredKey:(NSString *)_key { /* says whether we need to restore the object to access the key */ if ([_key hasPrefix:@"NS"]) { diff --git a/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj b/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj index b371b8fd..52e27cbf 100644 --- a/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj +++ b/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj @@ -505,7 +505,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.20; + DYLIB_CURRENT_VERSION = 4.5.21; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -633,7 +633,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.20; + DYLIB_CURRENT_VERSION = 4.5.21; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -674,7 +674,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.20; + DYLIB_CURRENT_VERSION = 4.5.21; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -717,7 +717,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.20; + DYLIB_CURRENT_VERSION = 4.5.21; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version index 144c9bb7..e6164a36 100644 --- a/sope-appserver/SoOFS/Version +++ b/sope-appserver/SoOFS/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=20 +SUBMINOR_VERSION:=21 diff --git a/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj b/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj index 5d351685..1638c3eb 100644 --- a/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj +++ b/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj @@ -235,7 +235,7 @@ /* Begin PBXFileReference section */ AD0130DE06DE76DB000910D8 /* libxmlSAXDriver.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxmlSAXDriver.xcodeproj; path = ../libxmlSAXDriver/libxmlSAXDriver.xcodeproj; sourceTree = ""; }; AD8571A007EF23BB00D5FC5B /* saxxml.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = saxxml.m; path = ../samples/saxxml.m; sourceTree = ""; }; - AD8573DB07EF567800D5FC5B /* saxxml */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = saxxml; sourceTree = BUILT_PRODUCTS_DIR; }; + AD8573DB07EF567800D5FC5B /* saxxml */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = saxxml; sourceTree = BUILT_PRODUCTS_DIR; }; ADDF54A906DE727A00C4E7F8 /* SaxObjC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SaxObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ADDF54AB06DE727A00C4E7F8 /* SaxObjC-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "SaxObjC-Info.plist"; sourceTree = ""; }; ADDF54AF06DE72B800C4E7F8 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; @@ -527,7 +527,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.54; + DYLIB_CURRENT_VERSION = 4.5.55; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; @@ -741,7 +741,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.54; + DYLIB_CURRENT_VERSION = 4.5.55; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -779,7 +779,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.54; + DYLIB_CURRENT_VERSION = 4.5.55; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -820,7 +820,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.54; + DYLIB_CURRENT_VERSION = 4.5.55; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h;