From 6bb73a90025d1a16257ffd591a15a3139d2f4ccc Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 19 Jul 2007 10:47:17 +0000 Subject: [PATCH] major Xcode build overhaul git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1508 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- SOPE.xcodeproj/project.pbxproj | 51 ++--- sope-appserver/NGObjWeb/ChangeLog | 10 + .../NGObjWeb/DynamicElements/WOActionURL.m | 35 +-- .../NGObjWeb/DynamicElements/WOBody.m | 2 +- .../DynamicElements/WOComponentReference.h | 2 +- .../DynamicElements/WOEmbeddedObject.m | 2 +- .../NGObjWeb/DynamicElements/WOEntity.m | 2 +- .../NGObjWeb/DynamicElements/WOForm.h | 2 +- .../NGObjWeb/DynamicElements/WOFrame.m | 2 +- .../DynamicElements/WOGenericElement.h | 2 +- .../DynamicElements/WOHTMLDynamicElement.m | 10 +- .../NGObjWeb/DynamicElements/WOHtml.m | 2 +- .../NGObjWeb/DynamicElements/WOHyperlink.h | 2 +- .../DynamicElements/WOHyperlinkInfo.m | 2 +- .../NGObjWeb/DynamicElements/WOIFrame.m | 2 +- .../NGObjWeb/DynamicElements/WOImage.h | 2 +- .../NGObjWeb/DynamicElements/WOInput.h | 2 +- .../NGObjWeb/DynamicElements/WOJavaScript.m | 2 +- .../NGObjWeb/DynamicElements/WOMetaRefresh.m | 2 +- .../NGObjWeb/DynamicElements/WONestedList.m | 2 +- .../NGObjWeb/DynamicElements/WOQuickTime.m | 2 +- .../NGObjWeb/DynamicElements/WOString.m | 2 +- .../DynamicElements/WOSwitchComponent.m | 2 +- .../NGObjWeb/DynamicElements/WOVBScript.m | 2 +- sope-appserver/NGObjWeb/GNUmakefile | 2 + .../NGHttp/NGHttp.xcodeproj/project.pbxproj | 102 ++------- .../NGObjWeb.xcodeproj/project.pbxproj | 211 ++++------------- .../NGObjWeb/NGObjWeb/WOActionURL.h | 56 +++++ .../NGObjWeb/NGObjWeb/WOHTMLDynamicElement.h | 46 ++++ .../SoObjects.xcodeproj/project.pbxproj | 199 ++-------------- sope-appserver/NGObjWeb/Version | 2 +- .../WebDAV/WebDAV.xcodeproj/project.pbxproj | 199 ++-------------- .../NGXmlRpc.xcodeproj/project.pbxproj | 195 ++-------------- .../SoOFS/SoOFS.xcodeproj/project.pbxproj | 191 ++++------------ .../WEPrototype.xcodeproj/project.pbxproj | 116 +++------- .../mod_ngobjweb.xcodeproj/project.pbxproj | 41 +--- .../sope-appserver.xcodeproj/project.pbxproj | 6 +- .../EOControl.xcodeproj/project.pbxproj | 93 ++------ .../NGExtensions.xcodeproj/project.pbxproj | 102 ++------- .../NGStreams.xcodeproj/project.pbxproj | 203 +++-------------- sope-core/sope-core.xcodeproj/project.pbxproj | 59 ----- .../GDLAccess.xcodeproj/project.pbxproj | 213 ++---------------- .../PostgreSQL.xcodeproj/project.pbxproj | 95 +++----- .../SQLite3/SQLite3.xcodeproj/project.pbxproj | 67 ++---- .../NGiCal/NGiCal.xcodeproj/project.pbxproj | 179 ++------------- sope-ical/sope-ical.xcodeproj/project.pbxproj | 59 ----- .../versitSaxDriver.xcodeproj/project.pbxproj | 116 ++-------- .../NGLdap/NGLdap.xcodeproj/project.pbxproj | 195 ++-------------- sope-ldap/sope-ldap.xcodeproj/project.pbxproj | 59 ----- .../NGImap4/NGImap4.xcodeproj/project.pbxproj | 193 ++-------------- .../NGMail/NGMail.xcodeproj/project.pbxproj | 195 ++-------------- .../NGMime/NGMime.xcodeproj/project.pbxproj | 98 ++------ sope-xml/DOM/DOM.xcodeproj/project.pbxproj | 178 ++------------- .../SaxObjC/SaxObjC.xcodeproj/project.pbxproj | 155 ++----------- .../XmlRpc/XmlRpc.xcodeproj/project.pbxproj | 188 +++------------- .../libxmlSAXDriver.xcodeproj/project.pbxproj | 93 +++----- xcconfig/Common.xcconfig | 4 + xcconfig/Development.xcconfig | 6 + xcconfig/Wrapper.xcconfig | 28 +++ 59 files changed, 812 insertions(+), 3278 deletions(-) create mode 100644 sope-appserver/NGObjWeb/NGObjWeb/WOActionURL.h create mode 100644 sope-appserver/NGObjWeb/NGObjWeb/WOHTMLDynamicElement.h create mode 100644 xcconfig/Common.xcconfig create mode 100644 xcconfig/Development.xcconfig create mode 100644 xcconfig/Wrapper.xcconfig diff --git a/SOPE.xcodeproj/project.pbxproj b/SOPE.xcodeproj/project.pbxproj index a8da28dd..47241880 100644 --- a/SOPE.xcodeproj/project.pbxproj +++ b/SOPE.xcodeproj/project.pbxproj @@ -232,6 +232,9 @@ AD0C94AC08ACA1EA00952E9F /* WEPrototype.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WEPrototype.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WEPrototype.framework"; sourceTree = ""; }; AD205D6208ACA5550023743A /* WEExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WEExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WEExtensions.framework"; sourceTree = ""; }; AD205D6308ACA5550023743A /* WOExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WOExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WOExtensions.framework"; sourceTree = ""; }; + AD263F730C4670E400186AAB /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; name = Wrapper.xcconfig; path = xcconfig/Wrapper.xcconfig; sourceTree = ""; }; + AD2640D70C46729500186AAB /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; name = Development.xcconfig; path = xcconfig/Development.xcconfig; sourceTree = ""; }; + AD2640E30C46730000186AAB /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; name = Common.xcconfig; path = xcconfig/Common.xcconfig; sourceTree = ""; }; AD8BF0C107018DB100EC239A /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = INSTALL; sourceTree = ""; }; AD8BF0C307018DB100EC239A /* changes-to-4.2pre.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "changes-to-4.2pre.txt"; sourceTree = ""; }; AD8BF0C407018DB100EC239A /* changes-to-4.3.1.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "changes-to-4.3.1.txt"; sourceTree = ""; }; @@ -356,6 +359,16 @@ path = /Users/znek/Projects/OGo/SOPE; sourceTree = ""; }; + AD263F720C4670C600186AAB /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD2640E30C46730000186AAB /* Common.xcconfig */, + AD2640D70C46729500186AAB /* Development.xcconfig */, + AD263F730C4670E400186AAB /* Wrapper.xcconfig */, + ); + name = xcconfig; + sourceTree = ""; + }; AD8BF0C207018DB100EC239A /* maintenance */ = { isa = PBXGroup; children = ( @@ -430,6 +443,7 @@ ADDF478306DA57F500C4E7F8 /* Projects */, AD0C92DE08AC9E0C00952E9F /* Products */, AD0C945308ACA18700952E9F /* Frameworks */, + AD263F720C4670C600186AAB /* xcconfig */, AD0C92DF08AC9E0C00952E9F /* SOPE-Info.plist */, ); sourceTree = ""; @@ -716,8 +730,8 @@ AD0C92E208AC9E0D00952E9F /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.0; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)"; FRAMEWORK_VERSION = A; @@ -784,8 +798,8 @@ AD0C92E308AC9E0D00952E9F /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.0; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -920,28 +934,6 @@ ADA076370857281C00993825 /* Wrapper */ = { isa = XCBuildConfiguration; 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/$(CONFIGURATION)"; - 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", - ); - PRODUCT_NAME = "Wrapper Contents"; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - ZERO_LINK = NO; }; name = Wrapper; }; @@ -954,22 +946,21 @@ }; ADA0763A0857281C00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2640D70C46729500186AAB /* Development.xcconfig */; buildSettings = { }; name = Development; }; ADA0763B0857281C00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD263F730C4670E400186AAB /* Wrapper.xcconfig */; buildSettings = { - ARCHS = ( - ppc, - i386, - ); }; name = Wrapper; }; ADA0763C0857281C00993825 /* Default */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2640D70C46729500186AAB /* Development.xcconfig */; buildSettings = { }; name = Default; diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 75228993..9a50c026 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,13 @@ +2007-07-19 Marcus Mueller + + * v4.7.12 + + * DynamicElements/*.[hm]: moved WOHTMLDynamicElement.h to the public + headers. This is required for some future extensions in WEPrototype. + + * NGObjWeb/WOActionURL.h: exposed API for elements which require + link generation + 2007-05-31 Helge Hess * v4.7.11 diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m b/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m index b0139641..24bf0f29 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m @@ -19,35 +19,12 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include #include #include "decommon.h" -/* - WOActionURL associations: - - pageName | action | (directActionName & actionClass) - fragmentIdentifier - queryDictionary -*/ - -@interface WOActionURL : WOHTMLDynamicElement -{ - // WODynamicElement: extraAttributes - // WODynamicElement: otherTagString -@protected - WOAssociation *fragmentIdentifier; - WOElement *template; - - /* new in WO4: */ - WOAssociation *queryDictionary; - NSDictionary *queryParameters; /* associations beginning with ? */ -} - -@end /* WOActionURL */ - @interface _WOActionActionURL : WOActionURL { WOAssociation *action; @@ -89,6 +66,16 @@ NSStringFromClass([self superclass]), [super version]); } ++ (BOOL)containsLinkInAssociations:(NSDictionary *)_assocs { + if (_assocs == nil) return NO; + if ([_assocs objectForKey:@"href"]) return YES; + if ([_assocs objectForKey:@"directActionName"]) return YES; + if ([_assocs objectForKey:@"pageName"]) return YES; + if ([_assocs objectForKey:@"action"]) return YES; + if ([_assocs objectForKey:@"actionClass"]) return YES; + return NO; +} + - (id)initWithName:(NSString *)_name associations:(NSDictionary *)_config template:(WOElement *)_t diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBody.m b/sope-appserver/NGObjWeb/DynamicElements/WOBody.m index 0e2a9a9e..29e5e0fe 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOBody.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOBody.m @@ -20,7 +20,7 @@ */ #include "WOElement+private.h" -#include "WOHTMLDynamicElement.h" +#include #include #include #include "decommon.h" diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h index 1a4fb4fb..d350fa44 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h @@ -22,7 +22,7 @@ #ifndef __NGObjWeb_WOComponentReference_H__ #define __NGObjWeb_WOComponentReference_H__ -#include "WOHTMLDynamicElement.h" +#include /* This element can be used to dynamically embed other components. diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m b/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m index e7ad0129..9064dd12 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m b/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m index 8960f86d..59503259 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOForm.h b/sope-appserver/NGObjWeb/DynamicElements/WOForm.h index dc692f4a..57d606bc 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOForm.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOForm.h @@ -23,7 +23,7 @@ #ifndef __NGObjWeb_DynElem_WOForm_H__ #define __NGObjWeb_DynElem_WOForm_H__ -#include "WOHTMLDynamicElement.h" +#include @class WOAssociation; diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m b/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m index da82f8e2..36a1ea05 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m @@ -20,7 +20,7 @@ */ #include "WOElement+private.h" -#include "WOHTMLDynamicElement.h" +#include #include #include #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h index cac497dd..27635a16 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h @@ -22,7 +22,7 @@ #ifndef __NGObjWeb_DynElem_WOGenericElement_H__ #define __NGObjWeb_DynElem_WOGenericElement_H__ -#include "WOHTMLDynamicElement.h" +#include /* WOGenericElement / WOGenericContainer diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m index 32c0f8e5..11003da0 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include "decommon.h" @@ -121,11 +121,11 @@ NSDictionary *OWExtractQueryParameters(NSDictionary *_set) { value = [_set objectForKey:key]; - if (paraKeys == nil) + if (paraKeys == nil) { paraKeys = [NSMutableArray arrayWithCapacity:8]; - if (paras == nil) - paras = [NSMutableDictionary dictionaryWithCapacity:8]; - + paras = [NSMutableDictionary dictionaryWithCapacity:8]; + } + [paraKeys addObject:key]; [paras setObject:value forKey:[key substringFromIndex:1]]; } diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m b/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m index 6bf32c94..ee729698 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include @class WOAssociation; diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.h b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.h index 3e603c3f..fad553fe 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.h @@ -22,7 +22,7 @@ #ifndef __NGObjWeb_WOHyperlink_H__ #define __NGObjWeb_WOHyperlink_H__ -#include "WOHTMLDynamicElement.h" +#include @class NSString; @class WOHyperlinkInfo; diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m index 696cae98..1ce7ffe4 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m @@ -21,7 +21,7 @@ #include "WOHyperlinkInfo.h" #include "WOElement+private.h" -#include "WOHTMLDynamicElement.h" +#include #include "decommon.h" @implementation WOHyperlinkInfo diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m b/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m index 81f8333e..40b7dd93 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m @@ -20,7 +20,7 @@ */ #include "WOElement+private.h" -#include "WOHTMLDynamicElement.h" +#include #include #include #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImage.h b/sope-appserver/NGObjWeb/DynamicElements/WOImage.h index 7d7bab84..33086954 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOImage.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOImage.h @@ -22,7 +22,7 @@ #ifndef __NGObjWeb_DynElems_WOImage_H__ #define __NGObjWeb_DynElems_WOImage_H__ -#include "WOHTMLDynamicElement.h" +#include /* WOImage is a class cluster with separate subclasses for the different diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOInput.h b/sope-appserver/NGObjWeb/DynamicElements/WOInput.h index 38f85e0a..0ef36dbf 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOInput.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOInput.h @@ -22,7 +22,7 @@ #ifndef __NGObjWeb_WOInput_H__ #define __NGObjWeb_WOInput_H__ -#include "WOHTMLDynamicElement.h" +#include @class WOAssociation; diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m index cb62d29d..76039099 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include @interface WOJavaScript : WOHTMLDynamicElement { diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m b/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m index 8f68a644..e9df0d36 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m index ec9b931d..852fc793 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include "decommon.h" diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m b/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m index ff2369f1..93701d06 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOString.m b/sope-appserver/NGObjWeb/DynamicElements/WOString.m index 2d3d1e8f..41698206 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOString.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOString.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include "decommon.h" #include diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m index e133e635..8675144c 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include @class NSDictionary; @class WOAssociation; diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m index faee7274..8f0c77e1 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m @@ -19,7 +19,7 @@ 02111-1307, USA. */ -#include "WOHTMLDynamicElement.h" +#include #include "WOElement+private.h" #include #include diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index e6659feb..524a2358 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile +++ b/sope-appserver/NGObjWeb/GNUmakefile @@ -84,6 +84,8 @@ libNGObjWeb_HEADER_FILES = \ WOElementTrackingContext.h \ WOComponentDefinition.h \ NSString+JavaScriptEscaping.h \ + WOHTMLDynamicElement.h \ + WOActionURL.h \ NGObjWebCore_OBJC_FILES = \ NSObject+WO.m \ diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj index 98541ce4..a0cc74af 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj @@ -100,6 +100,9 @@ AD517F0606FF7DFD006397CD /* NGMail.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMail.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGMail.framework"; sourceTree = ""; }; AD517F0706FF7DFD006397CD /* NGMime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMime.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGMime.framework"; sourceTree = ""; }; AD517F0806FF7DFD006397CD /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/XmlRpc.framework"; sourceTree = ""; }; + AD77EBCF0C4F61CA0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EBD00C4F61CA0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EBD10C4F61CA0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD915D3A06E29F74004720C2 /* EOControl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = EOControl.xcodeproj; path = "../../../sope-core/EOControl/EOControl.xcodeproj"; sourceTree = ""; }; AD915D4A06E2A19F004720C2 /* DOM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DOM.xcodeproj; path = "../../../sope-xml/DOM/DOM.xcodeproj"; sourceTree = ""; }; AD915D4C06E2A1BB004720C2 /* SaxObjC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SaxObjC.xcodeproj; path = "../../../sope-xml/SaxObjC/SaxObjC.xcodeproj"; sourceTree = ""; }; @@ -194,6 +197,17 @@ name = "sope-mime"; sourceTree = ""; }; + AD77EBCE0C4F61CA0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EBCF0C4F61CA0018A131 /* Common.xcconfig */, + AD77EBD00C4F61CA0018A131 /* Development.xcconfig */, + AD77EBD10C4F61CA0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../../xcconfig; + sourceTree = ""; + }; AD915D4206E29F90004720C2 /* Products */ = { isa = PBXGroup; children = ( @@ -232,6 +246,7 @@ ADFE56F306E24BF5006628C4 /* Projects */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EBCE0C4F61CA0018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -496,113 +511,47 @@ /* Begin XCBuildConfiguration section */ ADA078B2085738AB00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBD00C4F61CA0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGHttp-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3400000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGHttp; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA078B3085738AB00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBD10C4F61CA0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGHttp-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3400000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGHttp; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA078B4085738AB00993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - 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 = "NGHttp-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC3400000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGHttp; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -615,11 +564,6 @@ ADA078B7085738AB00993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj index 6436348f..ec3549f8 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj @@ -115,6 +115,7 @@ AD51811406FF7ED0006397CD /* NGImap4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD51811206FF7ED0006397CD /* NGImap4.framework */; }; AD51811506FF7ED0006397CD /* NGMail.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD51811306FF7ED0006397CD /* NGMail.framework */; }; AD8BF0AA07018CC600EC239A /* WOServerDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = AD8BF0A907018CC600EC239A /* WOServerDefaults.m */; }; + AD9FEFBC0BB04F6C007B0038 /* WOActionURL.h in Headers */ = {isa = PBXBuildFile; fileRef = AD9FEFBB0BB04F6C007B0038 /* WOActionURL.h */; settings = {ATTRIBUTES = (Public, ); }; }; ADD65F6406DA3AF6007161CA /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = ADD65C7006DA343C007161CA /* common.h */; }; ADD65F6506DA3B38007161CA /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = ADD65C7106DA343C007161CA /* COPYING */; }; ADD65F6606DA3B38007161CA /* COPYRIGHT in Resources */ = {isa = PBXBuildFile; fileRef = ADD65C7206DA343C007161CA /* COPYRIGHT */; }; @@ -177,7 +178,7 @@ ADFE554006E2493D006628C4 /* WOGenericElement.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFE53C706E2493C006628C4 /* WOGenericElement.m */; }; ADFE554106E2493D006628C4 /* WOHiddenField.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFE53C806E2493C006628C4 /* WOHiddenField.m */; }; ADFE554206E2493D006628C4 /* WOHtml.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFE53C906E2493C006628C4 /* WOHtml.m */; }; - ADFE554306E2493D006628C4 /* WOHTMLDynamicElement.h in Headers */ = {isa = PBXBuildFile; fileRef = ADFE53CA06E2493C006628C4 /* WOHTMLDynamicElement.h */; }; + ADFE554306E2493D006628C4 /* WOHTMLDynamicElement.h in Headers */ = {isa = PBXBuildFile; fileRef = ADFE53CA06E2493C006628C4 /* WOHTMLDynamicElement.h */; settings = {ATTRIBUTES = (Public, ); }; }; ADFE554406E2493D006628C4 /* WOHTMLDynamicElement.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFE53CB06E2493C006628C4 /* WOHTMLDynamicElement.m */; }; ADFE554506E2493D006628C4 /* WOHyperlink.h in Headers */ = {isa = PBXBuildFile; fileRef = ADFE53CC06E2493C006628C4 /* WOHyperlink.h */; }; ADFE554606E2493D006628C4 /* WOHyperlink.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFE53CD06E2493C006628C4 /* WOHyperlink.m */; }; @@ -553,7 +554,13 @@ AD4F35310BAAF99E00323EB9 /* WOFragment.api */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 4; path = WOFragment.api; sourceTree = ""; }; AD51811206FF7ED0006397CD /* NGImap4.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGImap4.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGImap4.framework"; sourceTree = ""; }; AD51811306FF7ED0006397CD /* NGMail.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMail.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGMail.framework"; sourceTree = ""; }; + AD72A74A0BBD7B0700BB95F1 /* WOJavaScriptWriter.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = WOJavaScriptWriter.h; path = NGObjWeb/WOJavaScriptWriter.h; sourceTree = ""; }; + AD72A74B0BBD7B0700BB95F1 /* WOJavaScriptWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WOJavaScriptWriter.m; sourceTree = ""; }; + AD77EBFC0C4F63E70018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EBFD0C4F63E70018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EBFE0C4F63E70018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8BF0A907018CC600EC239A /* WOServerDefaults.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WOServerDefaults.m; sourceTree = ""; }; + AD9FEFBB0BB04F6C007B0038 /* WOActionURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WOActionURL.h; path = ../NGObjWeb/WOActionURL.h; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7006DA343C007161CA /* common.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; ADD65C7106DA343C007161CA /* COPYING */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; @@ -630,7 +637,7 @@ ADFE53C706E2493C006628C4 /* WOGenericElement.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = WOGenericElement.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; ADFE53C806E2493C006628C4 /* WOHiddenField.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = WOHiddenField.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; ADFE53C906E2493C006628C4 /* WOHtml.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = WOHtml.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; - ADFE53CA06E2493C006628C4 /* WOHTMLDynamicElement.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = WOHTMLDynamicElement.h; sourceTree = ""; }; + ADFE53CA06E2493C006628C4 /* WOHTMLDynamicElement.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = WOHTMLDynamicElement.h; path = ../NGObjWeb/WOHTMLDynamicElement.h; sourceTree = ""; }; ADFE53CB06E2493C006628C4 /* WOHTMLDynamicElement.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = WOHTMLDynamicElement.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; ADFE53CC06E2493C006628C4 /* WOHyperlink.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = WOHyperlink.h; sourceTree = ""; }; ADFE53CD06E2493C006628C4 /* WOHyperlink.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = WOHyperlink.m; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; @@ -977,6 +984,7 @@ ADFE542D06E2493C006628C4 /* WOTemplate.h */, ADFE542E06E2493C006628C4 /* WOTemplateBuilder.h */, ADFE542F06E2493C006628C4 /* WOxElemBuilder.h */, + AD72A74A0BBD7B0700BB95F1 /* WOJavaScriptWriter.h */, ); fileEncoding = 5; indentWidth = 2; @@ -1050,6 +1058,17 @@ name = Definitions; sourceTree = ""; }; + AD77EBFB0C4F63E70018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EBFC0C4F63E70018A131 /* Common.xcconfig */, + AD77EBFD0C4F63E70018A131 /* Development.xcconfig */, + AD77EBFE0C4F63E70018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -1073,6 +1092,7 @@ ADFE538B06E248EB006628C4 /* Projects */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EBFB0C4F63E70018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -1125,6 +1145,7 @@ ADFE550806E2493D006628C4 /* WOSimpleHTTPParser.m */, ADFE550906E2493D006628C4 /* WOStatisticsStore.m */, ADFE550A06E2493D006628C4 /* WOStats.m */, + AD72A74B0BBD7B0700BB95F1 /* WOJavaScriptWriter.m */, ); fileEncoding = 5; indentWidth = 2; @@ -1222,6 +1243,7 @@ AD433CC007F864D200206C08 /* _WOStaticHTMLElement.m */, AD433CC107F864D200206C08 /* WONoContentElement.h */, AD433CC207F864D200206C08 /* WONoContentElement.m */, + AD9FEFBB0BB04F6C007B0038 /* WOActionURL.h */, ADFE53B206E2493C006628C4 /* WOActionURL.m */, ADFE53B306E2493C006628C4 /* WOActiveImage.m */, ADFE53B406E2493C006628C4 /* WOBody.m */, @@ -1871,6 +1893,7 @@ AD433CC507F864D200206C08 /* WONoContentElement.h in Headers */, AD4D5F9809C83A7D009BFDAF /* SoCookieAuthenticator.h in Headers */, AD4D5F9A09C83A7D009BFDAF /* SoProductLoader.h in Headers */, + AD9FEFBC0BB04F6C007B0038 /* WOActionURL.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2315,234 +2338,85 @@ /* Begin XCBuildConfiguration section */ ADA078EC085738C500993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBFD0C4F63E70018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 4.7.0; - DYLIB_CURRENT_VERSION = 4.7.5; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ..; INFOPLIST_FILE = "NGObjWeb-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DSOPE_SUBMINOR_VERSION=4", + "$(OTHER_CFLAGS)", + "-DSOPE_SUBMINOR_VERSION=12", ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC4900000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGObjWeb; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA078ED085738C500993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBFE0C4F63E70018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ..; INFOPLIST_FILE = "NGObjWeb-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DSOPE_SUBMINOR_VERSION=255", + "$(OTHER_CFLAGS)", + "-DSOPE_SUBMINOR_VERSION=12", ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC4900000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGObjWeb; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA078EE085738C500993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - 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; - HEADER_SEARCH_PATHS = ..; - INFOPLIST_FILE = "NGObjWeb-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DSOPE_SUBMINOR_VERSION=255", - ); - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC4900000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGObjWeb; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; ADA078F0085738C500993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBFD0C4F63E70018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADER_SEARCH_PATHS = ..; INFOPLIST_FILE = "SoObjects/SoCore-SXP-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/SoProducts"; - OTHER_CFLAGS = ( - "-I..", - "-DAPPLE_RUNTIME=1", - "-DNeXT_RUNTIME=1", - "-DCOCOA_Foundation_LIBRARY=1", - "-DCOMPILE_AS_FRAMEWORK=1", - "-DNeXT_Foundation_LIBRARY=1", - ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = SoCore; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = sxp; }; name = Development; }; ADA078F1085738C500993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBFE0C4F63E70018A131 /* Wrapper.xcconfig */; 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_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADER_SEARCH_PATHS = ..; INFOPLIST_FILE = "SoObjects/SoCore-SXP-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/SoProducts"; - OTHER_CFLAGS = ( - "-I..", - "-DAPPLE_RUNTIME=1", - "-DNeXT_RUNTIME=1", - "-DCOCOA_Foundation_LIBRARY=1", - "-DCOMPILE_AS_FRAMEWORK=1", - "-DNeXT_Foundation_LIBRARY=1", - ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = SoCore; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = sxp; - ZERO_LINK = NO; }; name = Wrapper; }; ADA078F2085738C500993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "SoObjects/SoCore-SXP-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/SoProducts"; - OTHER_CFLAGS = ( - "-I..", - "-DAPPLE_RUNTIME=1", - "-DNeXT_RUNTIME=1", - "-DCOCOA_Foundation_LIBRARY=1", - "-DCOMPILE_AS_FRAMEWORK=1", - "-DNeXT_Foundation_LIBRARY=1", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = SoCore; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - WRAPPER_EXTENSION = sxp; }; name = Default; }; @@ -2875,11 +2749,6 @@ ADA0790A085738C500993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-appserver/NGObjWeb/NGObjWeb/WOActionURL.h b/sope-appserver/NGObjWeb/NGObjWeb/WOActionURL.h new file mode 100644 index 00000000..c07319d3 --- /dev/null +++ b/sope-appserver/NGObjWeb/NGObjWeb/WOActionURL.h @@ -0,0 +1,56 @@ +/* + Copyright (C) 2007 OpenGroupware.org. + + This file is part of SOPE. + + SOPE 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 + Free Software Foundation; either version 2, or (at your option) any + later version. + + SOPE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with SOPE; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#ifndef __NGObjWeb_WOActionURL_H__ +#define __NGObjWeb_WOActionURL_H__ + +#include + +@class WOAssociation; +@class WOElement; +@class NSDictionary; + +/* + WOActionURL associations: + + pageName | action | (directActionName & actionClass) + fragmentIdentifier + queryDictionary +*/ + +@interface WOActionURL : WOHTMLDynamicElement +{ + // WODynamicElement: extraAttributes + // WODynamicElement: otherTagString + @protected + WOAssociation *fragmentIdentifier; + WOElement *template; + + /* new in WO4: */ + WOAssociation *queryDictionary; + NSDictionary *queryParameters; /* associations beginning with ? */ +} + ++ (BOOL)containsLinkInAssociations:(NSDictionary *)_assocs; + +@end /* WOActionURL */ + +#endif /* __NGObjWeb_WOActionURL_H__ */ diff --git a/sope-appserver/NGObjWeb/NGObjWeb/WOHTMLDynamicElement.h b/sope-appserver/NGObjWeb/NGObjWeb/WOHTMLDynamicElement.h new file mode 100644 index 00000000..37b3b029 --- /dev/null +++ b/sope-appserver/NGObjWeb/NGObjWeb/WOHTMLDynamicElement.h @@ -0,0 +1,46 @@ +/* + Copyright (C) 2000-2005 SKYRIX Software AG + + This file is part of SOPE. + + SOPE 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 + Free Software Foundation; either version 2, or (at your option) any + later version. + + SOPE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with SOPE; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#ifndef __NGObjWeb_WOHTMLDynamicElement_H__ +#define __NGObjWeb_WOHTMLDynamicElement_H__ + +#include + +@class NSDictionary; +@class WOAssociation, WOContext; + +@interface WOHTMLDynamicElement : WODynamicElement +{ + // WODynamicElement: extraAttributes + // WODynamicElement: otherTagString +} + +@end + +@interface WOHTMLDynamicElement(ActiveElement) +- (id)executeAction:(WOAssociation *)_action inContext:(WOContext *)_ctx; +@end + +/* private functions */ + +NSDictionary *OWExtractQueryParameters(NSDictionary *_set); + +#endif /* __NGObjWeb_WOHTMLDynamicElement_H__ */ diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj index 4ffce290..6dbdf5c3 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj @@ -45,57 +45,13 @@ ADFE720106E284CC006628C4 /* WORequest+So.h in Headers */ = {isa = PBXBuildFile; fileRef = ADFE71E206E284CC006628C4 /* WORequest+So.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013B8506E20AC5000910D8 /* NOTES */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = NOTES; sourceTree = ""; }; AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; AD0CFDAD0721A7EC00E72147 /* SoActionInvocation.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SoActionInvocation.h; sourceTree = ""; }; + AD77EBE90C4F62A90018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EBEA0C4F62A90018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EBEB0C4F62A90018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADD65C7406DA343C007161CA /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; ADD65C7506DA343C007161CA /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = ""; tabWidth = 8; }; ADD65C8A06DA343C007161CA /* TODO */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = TODO; sourceTree = ""; }; @@ -189,6 +145,17 @@ name = Headers; sourceTree = ""; }; + AD77EBE80C4F62A90018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EBE90C4F62A90018A131 /* Common.xcconfig */, + AD77EBEA0C4F62A90018A131 /* Development.xcconfig */, + AD77EBEB0C4F62A90018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -202,6 +169,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EBE80C4F62A90018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -303,54 +271,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "SoObjects-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC5AF0000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = SoObjects; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = SoObjects; productName = SoObjects; productReference = ADD65D5806DA372D007161CA /* SoObjects.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - SoObjects - CFBundleIdentifier - org.OpenGroupware.SOPE.SoObjects - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -359,12 +284,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA078D5085738B300993825 /* Build configuration list for PBXProject "SoObjects" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -401,110 +320,43 @@ /* Begin XCBuildConfiguration section */ ADA078D2085738B300993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBEA0C4F62A90018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "SoObjects-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC5AF0000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = SoObjects; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA078D3085738B300993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBEB0C4F62A90018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "SoObjects-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC5AF0000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = SoObjects; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA078D4085738B300993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "SoObjects-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC5AF0000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = SoObjects; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -517,11 +369,6 @@ ADA078D7085738B300993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index c90763d7..02fdb2ed 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=11 +SUBMINOR_VERSION:=12 # v4.7.11 requires libNGExtensions v4.7.194 # v4.5.234 requires libDOM v4.5.21 diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj index d9862c92..d6c74fa2 100644 --- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj @@ -25,55 +25,11 @@ ADFE6A3906E26FC6006628C4 /* dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFE6A3806E26FC6006628C4 /* dummy.m */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; + AD77EBAC0C4F61620018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EBAD0C4F61620018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EBAE0C4F61620018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADD65C7406DA343C007161CA /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; ADD65C7506DA343C007161CA /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = ""; tabWidth = 8; }; ADD65C8A06DA343C007161CA /* TODO */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = TODO; sourceTree = ""; }; @@ -130,6 +86,17 @@ name = Headers; sourceTree = ""; }; + AD77EBAB0C4F61620018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EBAC0C4F61620018A131 /* Common.xcconfig */, + AD77EBAD0C4F61620018A131 /* Development.xcconfig */, + AD77EBAE0C4F61620018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -143,6 +110,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EBAB0C4F61620018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -232,54 +200,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "WebDAV-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC3700000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = WebDAV; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = WebDAV; productName = WebDAV; productReference = ADD65D5806DA372D007161CA /* WebDAV.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - WebDAV - CFBundleIdentifier - org.OpenGroupware.SOPE.WebDAV - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -288,12 +213,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA0788C0857389E00993825 /* Build configuration list for PBXProject "WebDAV" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -329,110 +248,43 @@ /* Begin XCBuildConfiguration section */ ADA078890857389E00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBAD0C4F61620018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "WebDAV-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3700000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = WebDAV; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA0788A0857389E00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EBAE0C4F61620018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.12; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "WebDAV-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3700000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = WebDAV; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA0788B0857389E00993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.255; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "WebDAV-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC3700000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = WebDAV; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -445,11 +297,6 @@ ADA0788E0857389E00993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj b/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj index 22412fc4..be8970bc 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj +++ b/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj @@ -56,53 +56,6 @@ ADD6610E06DA3D1F007161CA /* EOControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADD6610D06DA3D1F007161CA /* EOControl.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013C1906E20D18000910D8 /* NGHttp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGHttp.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGHttp.framework"; sourceTree = ""; }; AD013C1E06E20D18000910D8 /* NGMime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMime.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGMime.framework"; sourceTree = ""; }; @@ -110,6 +63,9 @@ AD013C2106E20D18000910D8 /* NGStreams.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGStreams.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGStreams.framework"; sourceTree = ""; }; AD013C4706E20DAA000910D8 /* LDAP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LDAP.framework; path = /System/Library/Frameworks/LDAP.framework; sourceTree = ""; }; AD0142CE06E21A3D000910D8 /* NGExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGExtensions.framework"; sourceTree = ""; }; + AD77EC220C4F64B80018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EC230C4F64B80018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EC240C4F64B80018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADBFE6AB073EA3EA00E7F7CA /* fhs.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = fhs.make; sourceTree = ""; tabWidth = 8; }; ADBFE6AC073EA42B00E7F7CA /* NGAsyncResultProxy.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = NGAsyncResultProxy.h; sourceTree = ""; }; ADBFE6AD073EA42B00E7F7CA /* NGXmlRpc.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = NGXmlRpc.h; sourceTree = ""; }; @@ -237,6 +193,17 @@ name = "sope-mime"; sourceTree = ""; }; + AD77EC210C4F64B80018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EC220C4F64B80018A131 /* Common.xcconfig */, + AD77EC230C4F64B80018A131 /* Development.xcconfig */, + AD77EC240C4F64B80018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -248,6 +215,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EC210C4F64B80018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -366,55 +334,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.16; - 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 = "NGXmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC3D00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGXmlRpc; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = NGXmlRpc; productName = NGXmlRpc; productReference = ADD65D5806DA372D007161CA /* NGXmlRpc.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - NGXmlRpc - CFBundleIdentifier - org.OpenGroupware.SOPE.NGXmlRpc - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -423,12 +347,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA07928085738D100993825 /* Build configuration list for PBXProject "NGXmlRpc" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -482,113 +400,47 @@ /* Begin XCBuildConfiguration section */ ADA07925085738D100993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC230C4F64B80018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.16; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGXmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3D00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGXmlRpc; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA07926085738D100993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC240C4F64B80018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.16; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGXmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3D00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGXmlRpc; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA07927085738D100993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.16; - 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 = "NGXmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC3D00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGXmlRpc; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -601,11 +453,6 @@ ADA0792A085738D100993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj b/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj index d99e9a9e..f3988c52 100644 --- a/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj +++ b/sope-appserver/SoOFS/SoOFS.xcodeproj/project.pbxproj @@ -134,9 +134,12 @@ AD4606EA0789911E00E8C5A3 /* SoOFS.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SoOFS.h; sourceTree = ""; }; AD4606EB0789911E00E8C5A3 /* SoOFSProduct.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SoOFSProduct.m; sourceTree = ""; }; AD460762078992EA00E8C5A3 /* SoObjects.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SoObjects.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/SoObjects.framework"; sourceTree = ""; }; - AD5529E1079447410037E121 /* sope-4.5 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sope-4.5"; sourceTree = BUILT_PRODUCTS_DIR; }; + AD5529E1079447410037E121 /* sope-4.7 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sope-4.7"; sourceTree = BUILT_PRODUCTS_DIR; }; AD5529E6079447830037E121 /* sope.8 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 5; path = sope.8; sourceTree = ""; }; AD5529E7079447830037E121 /* sope.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = sope.m; sourceTree = ""; }; + AD77EC860C4F66880018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EC870C4F66880018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EC880C4F66880018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7006DA343C007161CA /* common.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; ADD65C7406DA343C007161CA /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; @@ -286,6 +289,17 @@ name = Documentation; sourceTree = ""; }; + AD77EC850C4F66880018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EC860C4F66880018A131 /* Common.xcconfig */, + AD77EC870C4F66880018A131 /* Development.xcconfig */, + AD77EC880C4F66880018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -300,6 +314,7 @@ AD5529E5079447640037E121 /* sope tool */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EC850C4F66880018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -347,7 +362,7 @@ isa = PBXGroup; children = ( ADD65D5806DA372D007161CA /* SoOFS.framework */, - AD5529E1079447410037E121 /* sope-4.5 */, + AD5529E1079447410037E121 /* sope-4.7 */, ); name = Products; sourceTree = ""; @@ -415,9 +430,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - AD5529E0079447410037E121 /* sope-4.5 */ = { + AD5529E0079447410037E121 /* sope-tool */ = { isa = PBXNativeTarget; - buildConfigurationList = ADA079A1085738F100993825 /* Build configuration list for PBXNativeTarget "sope-4.5" */; + buildConfigurationList = ADA079A1085738F100993825 /* Build configuration list for PBXNativeTarget "sope-tool" */; buildPhases = ( AD5529DE079447410037E121 /* Sources */, AD5529DF079447410037E121 /* Frameworks */, @@ -426,9 +441,9 @@ ); dependencies = ( ); - name = "sope-4.5"; + name = "sope-tool"; productName = sope; - productReference = AD5529E1079447410037E121 /* sope-4.5 */; + productReference = AD5529E1079447410037E121 /* sope-4.7 */; productType = "com.apple.product-type.tool"; }; ADD65D5706DA372D007161CA /* SoOFS */ = { @@ -461,7 +476,7 @@ projectDirPath = ""; targets = ( ADD65D5706DA372D007161CA /* SoOFS */, - AD5529E0079447410037E121 /* sope-4.5 */, + AD5529E0079447410037E121 /* sope-tool */, ); }; /* End PBXProject section */ @@ -519,198 +534,81 @@ /* Begin XCBuildConfiguration section */ ADA0799E085738F100993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC870C4F66880018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.25; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - 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_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-DXCODE_BUILD=1", + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3A00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = SoOFS; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA0799F085738F100993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC880C4F66880018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.25; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - 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_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-DXCODE_BUILD=1", + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC3A00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = SoOFS; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA079A0085738F100993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.25; - 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"; }; name = Default; }; ADA079A2085738F100993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC870C4F66880018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - 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", - ); INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "sope-4.5"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); + PRODUCT_NAME = "sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; }; name = Development; }; ADA079A3085738F100993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC880C4F66880018A131 /* Wrapper.xcconfig */; 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", - ); INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "sope-4.5"; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; + PRODUCT_NAME = "sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; }; name = Wrapper; }; ADA079A4085738F100993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "sope-4.5"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); + PRODUCT_NAME = "sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; }; name = Default; }; @@ -723,11 +621,6 @@ ADA079A7085738F100993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; @@ -750,7 +643,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Default; }; - ADA079A1085738F100993825 /* Build configuration list for PBXNativeTarget "sope-4.5" */ = { + ADA079A1085738F100993825 /* Build configuration list for PBXNativeTarget "sope-tool" */ = { isa = XCConfigurationList; buildConfigurations = ( ADA079A2085738F100993825 /* Development */, diff --git a/sope-appserver/WEPrototype/WEPrototype.xcodeproj/project.pbxproj b/sope-appserver/WEPrototype/WEPrototype.xcodeproj/project.pbxproj index 37d0b0f7..b9f64932 100644 --- a/sope-appserver/WEPrototype/WEPrototype.xcodeproj/project.pbxproj +++ b/sope-appserver/WEPrototype/WEPrototype.xcodeproj/project.pbxproj @@ -80,6 +80,12 @@ AD75209108826F51004EE381 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = LICENSE; path = prototype/LICENSE; sourceTree = ""; }; AD75209208826F51004EE381 /* prototype.js */ = {isa = PBXFileReference; explicitFileType = sourcecode.javascript; fileEncoding = 5; name = prototype.js; path = prototype/prototype.js; sourceTree = ""; }; AD75209308826F51004EE381 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = README; path = prototype/README; sourceTree = ""; }; + AD77EC740C4F66170018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EC750C4F66170018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EC760C4F66170018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; + AD9FEED60BB029C7007B0038 /* WEFormToRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WEFormToRemote.m; sourceTree = ""; }; + AD9FEEFD0BB02EB2007B0038 /* WELinkToRemoteScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WELinkToRemoteScript.h; sourceTree = ""; }; + AD9FEEFE0BB02EB2007B0038 /* WELinkToRemoteScript.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WELinkToRemoteScript.m; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7006DA343C007161CA /* common.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; ADD65C7106DA343C007161CA /* COPYING */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; @@ -202,6 +208,17 @@ name = prototype; sourceTree = ""; }; + AD77EC730C4F66170018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EC740C4F66170018A131 /* Common.xcconfig */, + AD77EC750C4F66170018A131 /* Development.xcconfig */, + AD77EC760C4F66170018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -219,6 +236,7 @@ ADFE77AD06E29709006628C4 /* Projects */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EC730C4F66170018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -238,6 +256,9 @@ children = ( ADD65C7006DA343C007161CA /* common.h */, AD75206208826CD3004EE381 /* WELiveLink.m */, + AD9FEED60BB029C7007B0038 /* WEFormToRemote.m */, + AD9FEEFD0BB02EB2007B0038 /* WELinkToRemoteScript.h */, + AD9FEEFE0BB02EB2007B0038 /* WELinkToRemoteScript.m */, AD75206608826CD3004EE381 /* WEPrototypeScript.m */, AD75206708826CD3004EE381 /* WEPrototypeScriptAction.m */, ADFE761B06E2918F006628C4 /* WEPrototypeBundle.m */, @@ -410,125 +431,55 @@ /* Begin XCBuildConfiguration section */ ADA0797D085738E600993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC750C4F66170018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.9; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "WEPrototype-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DWEP_SUBMINOR_VERSION=8", + "$(OTHER_CFLAGS)", + "-DWEP_SUBMINOR_VERSION=9", ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC5E00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = WEPrototype; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA0797E085738E600993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EC760C4F66170018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 4.5.1; - DYLIB_CURRENT_VERSION = 4.7.8; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; + DYLIB_CURRENT_VERSION = 4.7.9; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "WEPrototype-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DWEP_SUBMINOR_VERSION=8", + "$(OTHER_CFLAGS)", + "-DWEP_SUBMINOR_VERSION=9", ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC5E00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = WEPrototype; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA0797F085738E600993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 4.5.1; - DYLIB_CURRENT_VERSION = 4.7.8; - 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 = "WEPrototype-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DWEP_SUBMINOR_VERSION=8", - ); - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC5E00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = WEPrototype; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -541,11 +492,6 @@ ADA07982085738E600993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj b/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj index 50a8ef3c..eb645289 100644 --- a/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj +++ b/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXFileReference section */ E822B876089D54600041E72D /* 500mod_ngobjweb.info */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 500mod_ngobjweb.info; sourceTree = ""; }; E822B877089D54600041E72D /* apversion.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = apversion.sh; sourceTree = ""; }; - E822B878089D54600041E72D /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; }; + E822B878089D54600041E72D /* ChangeLog */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 5; indentWidth = 8; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; E822B879089D54600041E72D /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; E822B87A089D54600041E72D /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; E822B87B089D54600041E72D /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config.c; sourceTree = ""; }; @@ -77,19 +77,6 @@ buildConfigurationList = E822B88B089D55C00041E72D /* Build configuration list for PBXLegacyTarget "mod_ngobjweb" */; buildPhases = ( ); - buildSettings = { - OPTIMIZATION_CFLAGS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = mod_ngobjweb; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; buildToolPath = /usr/bin/make; dependencies = ( ); @@ -103,19 +90,6 @@ buildConfigurationList = E822B8E0089D57210041E72D /* Build configuration list for PBXLegacyTarget "install" */; buildPhases = ( ); - buildSettings = { - OPTIMIZATION_CFLAGS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = install; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; buildToolPath = /usr/bin/make; buildWorkingDirectory = ""; dependencies = ( @@ -130,8 +104,6 @@ E822B86D089D544D0041E72D /* Project object */ = { isa = PBXProject; buildConfigurationList = E822B86E089D544D0041E72D /* Build configuration list for PBXProject "mod_ngobjweb" */; - buildStyles = ( - ); hasScannedForEncodings = 0; mainGroup = E822B86B089D544D0041E72D; projectDirPath = ""; @@ -162,7 +134,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - OPTIMIZATION_CFLAGS = ""; + OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -181,7 +153,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - OPTIMIZATION_CFLAGS = ""; + OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -200,7 +172,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - OPTIMIZATION_CFLAGS = ""; + OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -219,7 +191,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - OPTIMIZATION_CFLAGS = ""; + OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -243,6 +215,7 @@ E822B870089D544D0041E72D /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; E822B88B089D55C00041E72D /* Build configuration list for PBXLegacyTarget "mod_ngobjweb" */ = { isa = XCConfigurationList; @@ -251,6 +224,7 @@ E822B88D089D55C00041E72D /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; E822B8E0089D57210041E72D /* Build configuration list for PBXLegacyTarget "install" */ = { isa = XCConfigurationList; @@ -259,6 +233,7 @@ E822B8E2089D57210041E72D /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/sope-appserver/sope-appserver.xcodeproj/project.pbxproj b/sope-appserver/sope-appserver.xcodeproj/project.pbxproj index 8718194e..3a6f94c1 100644 --- a/sope-appserver/sope-appserver.xcodeproj/project.pbxproj +++ b/sope-appserver/sope-appserver.xcodeproj/project.pbxproj @@ -318,7 +318,7 @@ isa = PBXGroup; children = ( ADEAC65E078A325900097697 /* SoOFS.framework */, - ADDC021007A49332009A7741 /* sope-4.5 */, + ADDC021007A49332009A7741 /* sope-4.7 */, ); name = Products; sourceTree = ""; @@ -441,10 +441,10 @@ remoteRef = ADBFE960073EA9CD00E7F7CA /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - ADDC021007A49332009A7741 /* sope-4.5 */ = { + ADDC021007A49332009A7741 /* sope-4.7 */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; - path = "sope-4.5"; + path = "sope-4.7"; remoteRef = ADDC021807A49341009A7741 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; diff --git a/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj b/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj index ac7b5d6f..a0cb4106 100644 --- a/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj +++ b/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj @@ -58,6 +58,9 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + AD77EAE90C4F5C890018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EAEA0C4F5C890018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EAEB0C4F5C890018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADDF431F06DA4E3500C4E7F8 /* EOControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = EOControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ADDF432106DA4E3500C4E7F8 /* EOControl-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "EOControl-Info.plist"; sourceTree = ""; }; ADDF435E06DA4F4800C4E7F8 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; @@ -130,6 +133,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + AD77EAE80C4F5C890018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EAE90C4F5C890018A131 /* Common.xcconfig */, + AD77EAEA0C4F5C890018A131 /* Development.xcconfig */, + AD77EAEB0C4F5C890018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADDF431006DA4E2000C4E7F8 = { isa = PBXGroup; children = ( @@ -145,6 +159,7 @@ ADDF43D506DA4FBD00C4E7F8 /* Classes */, ADDF432406DA4E4D00C4E7F8 /* Resources */, ADDF445B06DA50E900C4E7F8 /* Linked Frameworks */, + AD77EAE80C4F5C890018A131 /* xcconfig */, ADDF432006DA4E3500C4E7F8 /* Products */, ); sourceTree = ""; @@ -367,108 +382,47 @@ /* Begin XCBuildConfiguration section */ ADA077C00857382200993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EAEA0C4F5C890018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.72; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "EOControl-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1000000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = EOControl; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA077C10857382200993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EAEB0C4F5C890018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.72; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "EOControl-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1000000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = EOControl; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA077C20857382200993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.72; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "EOControl-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1000000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = EOControl; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -481,11 +435,6 @@ ADA077C50857382200993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj b/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj index 90fd9d76..00b1552e 100644 --- a/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj +++ b/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj @@ -191,6 +191,9 @@ AD595AB00745170400B2C064 /* README */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = text; path = README; sourceTree = ""; }; AD665E37071F00AF00EC5911 /* NSString+Escaping.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "NSString+Escaping.h"; sourceTree = ""; }; AD665E38071F00AF00EC5911 /* NSString+Escaping.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = "NSString+Escaping.m"; sourceTree = ""; }; + AD77EB0A0C4F5D0C0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EB0B0C4F5D0C0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EB0C0C4F5D0C0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8B5D95074CF58C001AF5D3 /* NGLogFileHandleAppender.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = NGLogFileHandleAppender.m; sourceTree = ""; }; AD8B5D98074CF614001AF5D3 /* NGLogStdoutAppender.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = NGLogStdoutAppender.m; sourceTree = ""; }; AD8B5DDC074CF7C8001AF5D3 /* NGLogFileHandleAppender.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = NGLogFileHandleAppender.h; sourceTree = ""; }; @@ -391,6 +394,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + AD77EB090C4F5D0C0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EB0A0C4F5D0C0018A131 /* Common.xcconfig */, + AD77EB0B0C4F5D0C0018A131 /* Development.xcconfig */, + AD77EB0C0C4F5D0C0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADCD51360743BBBC0071C1A1 /* NGLogging.subproj */ = { isa = PBXGroup; children = ( @@ -468,6 +482,7 @@ ADFE533506E234B7006628C4 /* Projects */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EB090C4F5D0C0018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -1069,125 +1084,55 @@ /* Begin XCBuildConfiguration section */ ADA077D10857382A00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB0B0C4F5D0C0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.191; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ., NGExtensions, ); INFOPLIST_FILE = "NGExtensions-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1200000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGExtensions; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA077D20857382A00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB0C0C4F5D0C0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.191; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ., NGExtensions, ); INFOPLIST_FILE = "NGExtensions-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1200000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGExtensions; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA077D30857382A00993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.191; - 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; - HEADER_SEARCH_PATHS = ( - ., - NGExtensions, - ); - INFOPLIST_FILE = "NGExtensions-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1200000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGExtensions; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -1200,11 +1145,6 @@ ADA077E00857382A00993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-core/NGStreams/NGStreams.xcodeproj/project.pbxproj b/sope-core/NGStreams/NGStreams.xcodeproj/project.pbxproj index c0c9fd1c..7bbfe972 100644 --- a/sope-core/NGStreams/NGStreams.xcodeproj/project.pbxproj +++ b/sope-core/NGStreams/NGStreams.xcodeproj/project.pbxproj @@ -92,55 +92,10 @@ ADDF46D306DA55AC00C4E7F8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ADDF46D206DA55AC00C4E7F8 /* libz.dylib */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADDF44AA06DA51B100C4E7F8 /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - OTHER_CFLAGS = "-DHAVE_OPENSSL=1"; - }; - name = Development; - }; - ADDF44AB06DA51B100C4E7F8 /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ + AD77EB280C4F5DCF0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EB290C4F5DCF0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EB2A0C4F5DCF0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADDF44B706DA51CB00C4E7F8 /* NGStreams.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NGStreams.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ADDF44B906DA51CC00C4E7F8 /* NGStreams-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "NGStreams-Info.plist"; sourceTree = ""; }; ADDF44BD06DA528B00C4E7F8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; @@ -263,6 +218,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + AD77EB270C4F5DCF0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EB280C4F5DCF0018A131 /* Common.xcconfig */, + AD77EB290C4F5DCF0018A131 /* Development.xcconfig */, + AD77EB2A0C4F5DCF0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADDF44A806DA51B100C4E7F8 = { isa = PBXGroup; children = ( @@ -279,8 +245,9 @@ ADDF459806DA544600C4E7F8 /* Streams */, ADDF459B06DA547800C4E7F8 /* Network */, ADDF46D106DA548900C4E7F8 /* Unused */, - ADDF44BC06DA525800C4E7F8 /* Linked Frameworks */, ADDF44C106DA529200C4E7F8 /* Resources */, + ADDF44BC06DA525800C4E7F8 /* Linked Frameworks */, + AD77EB270C4F5DCF0018A131 /* xcconfig */, ADDF44B806DA51CB00C4E7F8 /* Products */, ); sourceTree = ""; @@ -533,55 +500,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.51; - 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 = YES; - INFOPLIST_FILE = "NGStreams-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1400000, - "-headerpad_max_install_names", - "-lssl", - "-lcrypto", - ); - PRODUCT_NAME = NGStreams; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = NGStreams; productName = NGStreams; productReference = ADDF44B706DA51CB00C4E7F8 /* NGStreams.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - NGStreams - CFBundleIdentifier - com.yourcompany.NGStreams - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -590,12 +513,6 @@ ADDF44AC06DA51B100C4E7F8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA077FC0857383500993825 /* Build configuration list for PBXProject "NGStreams" */; - buildSettings = { - }; - buildStyles = ( - ADDF44AA06DA51B100C4E7F8 /* Development */, - ADDF44AB06DA51B100C4E7F8 /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADDF44A806DA51B100C4E7F8; productRefGroup = ADDF44B806DA51CB00C4E7F8 /* Products */; @@ -666,30 +583,20 @@ /* Begin XCBuildConfiguration section */ ADA077F90857383500993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB290C4F5DCF0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.51; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = YES; INFOPLIST_FILE = "NGStreams-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-DHAVE_OPENSSL=1"; + OTHER_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-DHAVE_OPENSSL=1", + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1400000, "-headerpad_max_install_names", @@ -697,42 +604,25 @@ "-lcrypto", ); PRODUCT_NAME = NGStreams; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA077FA0857383500993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB2A0C4F5DCF0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.51; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = YES; INFOPLIST_FILE = "NGStreams-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; + OTHER_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-DHAVE_OPENSSL=1", + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1400000, "-headerpad_max_install_names", @@ -740,40 +630,12 @@ "-lcrypto", ); PRODUCT_NAME = NGStreams; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA077FB0857383500993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.51; - 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 = YES; - INFOPLIST_FILE = "NGStreams-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1400000, - "-headerpad_max_install_names", - "-lssl", - "-lcrypto", - ); - PRODUCT_NAME = NGStreams; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -786,11 +648,6 @@ ADA077FE0857383500993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-core/sope-core.xcodeproj/project.pbxproj b/sope-core/sope-core.xcodeproj/project.pbxproj index 672d3e5d..a80eacc6 100644 --- a/sope-core/sope-core.xcodeproj/project.pbxproj +++ b/sope-core/sope-core.xcodeproj/project.pbxproj @@ -12,9 +12,6 @@ buildConfigurationList = ADA077E90857382F00993825 /* Build configuration list for PBXAggregateTarget "Wrapper Contents" */; buildPhases = ( ); - buildSettings = { - PRODUCT_NAME = "Wrapper Contents"; - }; dependencies = ( ADDF479306DA586100C4E7F8 /* PBXTargetDependency */, ADDF479106DA586100C4E7F8 /* PBXTargetDependency */, @@ -28,9 +25,6 @@ buildConfigurationList = ADA077ED0857382F00993825 /* Build configuration list for PBXAggregateTarget "all" */; buildPhases = ( ); - buildSettings = { - PRODUCT_NAME = all; - }; dependencies = ( ADDF479B06DA58DD00C4E7F8 /* PBXTargetDependency */, ); @@ -39,53 +33,6 @@ }; /* End PBXAggregateTarget section */ -/* Begin PBXBuildStyle section */ - ADDF476806DA572500C4E7F8 /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADDF476906DA572500C4E7F8 /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXContainerItemProxy section */ ADDF478E06DA586100C4E7F8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -228,12 +175,6 @@ ADDF476A06DA572500C4E7F8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA077F10857382F00993825 /* Build configuration list for PBXProject "sope-core" */; - buildSettings = { - }; - buildStyles = ( - ADDF476806DA572500C4E7F8 /* Development */, - ADDF476906DA572500C4E7F8 /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADDF476606DA572500C4E7F8; projectDirPath = ""; diff --git a/sope-gdl1/GDLAccess/GDLAccess.xcodeproj/project.pbxproj b/sope-gdl1/GDLAccess/GDLAccess.xcodeproj/project.pbxproj index cc2f6b74..bde3e597 100644 --- a/sope-gdl1/GDLAccess/GDLAccess.xcodeproj/project.pbxproj +++ b/sope-gdl1/GDLAccess/GDLAccess.xcodeproj/project.pbxproj @@ -110,57 +110,13 @@ ADD65F7506DA3C51007161CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADD65F7406DA3C51007161CA /* Foundation.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; AD013C2106E20D18000910D8 /* NGStreams.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGStreams.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGStreams.framework"; sourceTree = ""; }; AD0142CE06E21A3D000910D8 /* NGExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGExtensions.framework"; sourceTree = ""; }; + AD77EDD50C4F6C710018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EDD60C4F6C710018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EDD70C4F6C710018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8BF2A207019AE300EC239A /* COPYING.LIB */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYING.LIB; sourceTree = ""; }; AD8BF2A607019B6000EC239A /* eoaccess.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = eoaccess.m; sourceTree = ""; }; AD8BF2A707019B6000EC239A /* EOAdaptor.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = EOAdaptor.h; sourceTree = ""; }; @@ -344,6 +300,17 @@ name = "sope-core"; sourceTree = ""; }; + AD77EDD40C4F6C710018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EDD50C4F6C710018A131 /* Common.xcconfig */, + AD77EDD60C4F6C710018A131 /* Development.xcconfig */, + AD77EDD70C4F6C710018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; AD8BF35C07019C5E00EC239A /* FoundationExt */ = { isa = PBXGroup; children = ( @@ -398,8 +365,9 @@ ADD65C9406DA34FF007161CA /* Classes */, AD8BF35C07019C5E00EC239A /* FoundationExt */, ADD65D5D06DA37C7007161CA /* Resources */, - ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EDD40C4F6C710018A131 /* xcconfig */, + ADD65D5906DA372D007161CA /* Products */, ); sourceTree = ""; }; @@ -568,61 +536,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.58; - 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 = "GDLAccess-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DGDL_MAJOR_VERSION=4", - "-DGDL_MINOR_VERSION=5", - "-DXCODE_SELF_COMPILE=1", - ); - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC6000000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = GDLAccess; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = GDLAccess; productName = GDLAccess; productReference = ADD65D5806DA372D007161CA /* GDLAccess.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - GDLAccess - CFBundleIdentifier - org.OpenGroupware.SOPE.GDLAccess - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -631,12 +549,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA079D50857391C00993825 /* Build configuration list for PBXProject "GDLAccess" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -722,131 +634,59 @@ /* Begin XCBuildConfiguration section */ ADA079D20857391C00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EDD60C4F6C710018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.58; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "GDLAccess-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", + "$(OTHER_CFLAGS)", "-DGDL_MAJOR_VERSION=4", "-DGDL_MINOR_VERSION=5", "-DXCODE_SELF_COMPILE=1", ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC6000000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = GDLAccess; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA079D30857391C00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EDD70C4F6C710018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.58; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "GDLAccess-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", + "$(OTHER_CFLAGS)", "-DGDL_MAJOR_VERSION=4", "-DGDL_MINOR_VERSION=5", "-DXCODE_SELF_COMPILE=1", ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC6000000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = GDLAccess; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA079D40857391C00993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.58; - 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 = "GDLAccess-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - "-DGDL_MAJOR_VERSION=4", - "-DGDL_MINOR_VERSION=5", - "-DXCODE_SELF_COMPILE=1", - ); - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC6000000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = GDLAccess; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -859,11 +699,6 @@ ADA079D70857391C00993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-gdl1/PostgreSQL/PostgreSQL.xcodeproj/project.pbxproj b/sope-gdl1/PostgreSQL/PostgreSQL.xcodeproj/project.pbxproj index 1d33cda2..0ed198ca 100644 --- a/sope-gdl1/PostgreSQL/PostgreSQL.xcodeproj/project.pbxproj +++ b/sope-gdl1/PostgreSQL/PostgreSQL.xcodeproj/project.pbxproj @@ -39,6 +39,9 @@ AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; AD013C2106E20D18000910D8 /* NGStreams.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGStreams.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGStreams.framework"; sourceTree = ""; }; AD0142CE06E21A3D000910D8 /* NGExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/NGExtensions.framework"; sourceTree = ""; }; + AD77EE160C4F6E230018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EE170C4F6E230018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EE180C4F6E230018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8BF94C0701B04C00EC239A /* PostgreSQL.gdladaptor */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PostgreSQL.gdladaptor; sourceTree = BUILT_PRODUCTS_DIR; }; AD8BF94E0701B16D00EC239A /* EOAttribute+PostgreSQL72.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "EOAttribute+PostgreSQL72.h"; sourceTree = ""; }; AD8BF94F0701B16D00EC239A /* EOAttribute+PostgreSQL72.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = "EOAttribute+PostgreSQL72.m"; sourceTree = ""; }; @@ -133,6 +136,17 @@ name = "sope-core"; sourceTree = ""; }; + AD77EE150C4F6E230018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EE160C4F6E230018A131 /* Common.xcconfig */, + AD77EE170C4F6E230018A131 /* Development.xcconfig */, + AD77EE180C4F6E230018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; AD8BF9F80701B24300EC239A /* sope-gdl1 */ = { isa = PBXGroup; children = ( @@ -155,6 +169,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EE150C4F6E230018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -308,98 +323,63 @@ /* Begin XCBuildConfiguration section */ ADA079EC0857392600993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EE170C4F6E230018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", + HEADER_SEARCH_PATHS = ( + "$(HEADER_SEARCH_PATHS)", + /usr/local/pgsql/include, ); - HEADER_SEARCH_PATHS = /usr/local/pgsql/include; INFOPLIST_FILE = "PostgreSQL-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5"; - LIBRARY_SEARCH_PATHS = /usr/local/pgsql/lib; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; + LIBRARY_SEARCH_PATHS = ( + "$(LIBRARY_SEARCH_PATHS)", + /usr/local/pgsql/lib, + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-L/usr/local/pgsql/lib", "-lpq", "-lssl", "-lcrypto", ); PRODUCT_NAME = PostgreSQL; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = gdladaptor; }; name = Development; }; ADA079ED0857392600993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EE180C4F6E230018A131 /* Wrapper.xcconfig */; 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_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", + HEADER_SEARCH_PATHS = ( + "$(HEADER_SEARCH_PATHS)", + /usr/local/pgsql/include, ); - HEADER_SEARCH_PATHS = /usr/local/pgsql/include; INFOPLIST_FILE = "PostgreSQL-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5"; - LIBRARY_SEARCH_PATHS = /usr/local/pgsql/lib; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; + LIBRARY_SEARCH_PATHS = ( + "$(LIBRARY_SEARCH_PATHS)", + /usr/local/pgsql/lib, + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-L/usr/local/pgsql/lib", "-lpq", "-lssl", "-lcrypto", ); PRODUCT_NAME = PostgreSQL; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = gdladaptor; - ZERO_LINK = NO; }; name = Wrapper; }; ADA079EE0857392600993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - HEADER_SEARCH_PATHS = /usr/local/pgsql/include; - INFOPLIST_FILE = "PostgreSQL-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5"; - LIBRARY_SEARCH_PATHS = /usr/local/pgsql/lib; - OTHER_LDFLAGS = ( - "-L/usr/local/pgsql/lib", - "-lpq", - "-lssl", - "-lcrypto", - ); - PRODUCT_NAME = PostgreSQL; - WARNING_CFLAGS = "-Wmost"; - WRAPPER_EXTENSION = gdladaptor; }; name = Default; }; @@ -412,11 +392,6 @@ ADA079F10857392600993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj b/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj index c2add7eb..759deaa5 100644 --- a/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj +++ b/sope-gdl1/SQLite3/SQLite3.xcodeproj/project.pbxproj @@ -64,6 +64,9 @@ AD50D74007C9ED1E00C9F415 /* SQLiteValues.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SQLiteValues.h; sourceTree = ""; }; AD50D74107C9ED1E00C9F415 /* SQLiteValues.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SQLiteValues.m; sourceTree = ""; }; AD50D74207C9ED1E00C9F415 /* test.eomodel */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = test.eomodel; sourceTree = ""; }; + AD77EDF50C4F6D460018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EDF60C4F6D460018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EDF70C4F6D460018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7006DA343C007161CA /* common.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; ADD65C7406DA343C007161CA /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; @@ -133,10 +136,20 @@ name = "sope-gdl1"; sourceTree = ""; }; + AD77EDF40C4F6D460018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EDF50C4F6D460018A131 /* Common.xcconfig */, + AD77EDF60C4F6D460018A131 /* Development.xcconfig */, + AD77EDF70C4F6D460018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( - ADFF761F0AF531A600AC953A /* libsqlite3.dylib */, AD013B8706E20AC5000910D8 /* README */, AD50D72707C9ECD600C9F415 /* COPYING.LIB */, ADD65C6F06DA343C007161CA /* ChangeLog */, @@ -147,6 +160,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EDF40C4F6D460018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -205,6 +219,7 @@ isa = PBXGroup; children = ( ADD65F7406DA3C51007161CA /* Foundation.framework */, + ADFF761F0AF531A600AC953A /* libsqlite3.dylib */, ADD6603106DA3CE2007161CA /* sope-xml */, AD013C9E06E20E99000910D8 /* sope-core */, AD50D72107C9EC6000C9F415 /* sope-gdl1 */, @@ -296,73 +311,38 @@ /* Begin XCBuildConfiguration section */ ADA07A060857392D00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EDF60C4F6D460018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); INFOPLIST_FILE = "SQLite3-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; PRODUCT_NAME = SQLite3; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = gdladaptor; }; name = Development; }; ADA07A070857392D00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EDF70C4F6D460018A131 /* Wrapper.xcconfig */; 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_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); INFOPLIST_FILE = "SQLite3-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; PRODUCT_NAME = SQLite3; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = gdladaptor; - ZERO_LINK = NO; }; name = Wrapper; }; ADA07A080857392D00993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; INFOPLIST_FILE = "SQLite3-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-4.5"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/GDLAdaptors-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; PRODUCT_NAME = SQLite3; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = gdladaptor; }; name = Default; @@ -376,11 +356,6 @@ ADA07A0B0857392D00993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj index 2d010eed..d5f654ee 100644 --- a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj +++ b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj @@ -143,6 +143,9 @@ AD770E6807AE627500F5C7A1 /* iCalRecurrenceRule.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = iCalRecurrenceRule.m; sourceTree = ""; }; AD77103C07AE8F8500F5C7A1 /* iCalRepeatableEntityObject.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = iCalRepeatableEntityObject.h; sourceTree = ""; }; AD77103D07AE8F8500F5C7A1 /* iCalRepeatableEntityObject.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = iCalRepeatableEntityObject.m; sourceTree = ""; }; + AD77ED8A0C4F6B2D0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77ED8B0C4F6B2D0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77ED8C0C4F6B2D0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8BF0F70701902800EC239A /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/XmlRpc.framework"; sourceTree = ""; }; ADAACE6607B3973900FC48D6 /* iCalRecurrenceCalculator.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = iCalRecurrenceCalculator.h; sourceTree = ""; }; ADAACE6707B3973900FC48D6 /* iCalRecurrenceCalculator.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = iCalRecurrenceCalculator.m; sourceTree = ""; }; @@ -290,6 +293,17 @@ name = Classes; sourceTree = ""; }; + AD77ED890C4F6B2D0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77ED8A0C4F6B2D0018A131 /* Common.xcconfig */, + AD77ED8B0C4F6B2D0018A131 /* Development.xcconfig */, + AD77ED8C0C4F6B2D0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADAACFFF07B6AF0E00FC48D6 /* Unit Tests */ = { isa = PBXGroup; children = ( @@ -336,6 +350,7 @@ ADDF4E6506DE500200C4E7F8 /* Resources */, ADDF4E6106DE4FF200C4E7F8 /* Products */, ADDF503A06DE524200C4E7F8 /* Linked Frameworks */, + AD77ED890C4F6B2D0018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -676,216 +691,77 @@ /* Begin XCBuildConfiguration section */ ADA07A4A0857394900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77ED8B0C4F6B2D0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.80; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGiCal-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1E00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGiCal; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA07A4B0857394900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77ED8C0C4F6B2D0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.80; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGiCal-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1E00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGiCal; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA07A4C0857394900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.80; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "NGiCal-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - ); - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1E00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGiCal; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; ADA07A4E0857394900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77ED8B0C4F6B2D0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.80; - FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\""; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "tests/NGiCalTests-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-fobjc-exceptions"; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGiCalTests; - SECTORDER_FLAGS = ""; - TEST_AFTER_BUILD = YES; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA07A4F0857394900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77ED8C0C4F6B2D0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.80; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "tests/NGiCalTests-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-fobjc-exceptions"; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGiCalTests; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - TEST_AFTER_BUILD = YES; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA07A500857394900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.80; - FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\""; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "tests/NGiCalTests-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-fobjc-exceptions"; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGiCalTests; - SECTORDER_FLAGS = ""; - TEST_AFTER_BUILD = YES; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -898,11 +774,6 @@ ADA07A530857394900993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-ical/sope-ical.xcodeproj/project.pbxproj b/sope-ical/sope-ical.xcodeproj/project.pbxproj index 1acaee8b..440629e4 100644 --- a/sope-ical/sope-ical.xcodeproj/project.pbxproj +++ b/sope-ical/sope-ical.xcodeproj/project.pbxproj @@ -12,9 +12,6 @@ buildConfigurationList = ADA07A690857395C00993825 /* Build configuration list for PBXAggregateTarget "Wrapper Contents" */; buildPhases = ( ); - buildSettings = { - PRODUCT_NAME = "Wrapper Contents"; - }; dependencies = ( AD8BF1A80701972A00EC239A /* PBXTargetDependency */, ADBE3ECE07271FDD000FEA6A /* PBXTargetDependency */, @@ -27,9 +24,6 @@ buildConfigurationList = ADA07A6D0857395C00993825 /* Build configuration list for PBXAggregateTarget "all" */; buildPhases = ( ); - buildSettings = { - PRODUCT_NAME = all; - }; dependencies = ( AD8BF1A60701971D00EC239A /* PBXTargetDependency */, ); @@ -38,53 +32,6 @@ }; /* End PBXAggregateTarget section */ -/* Begin PBXBuildStyle section */ - ADDF476806DA572500C4E7F8 /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADDF476906DA572500C4E7F8 /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXContainerItemProxy section */ AD8BF1A50701971D00EC239A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -227,12 +174,6 @@ ADDF476A06DA572500C4E7F8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA07A710857395C00993825 /* Build configuration list for PBXProject "sope-ical" */; - buildSettings = { - }; - buildStyles = ( - ADDF476806DA572500C4E7F8 /* Development */, - ADDF476906DA572500C4E7F8 /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADDF476606DA572500C4E7F8; projectDirPath = ""; diff --git a/sope-ical/versitSaxDriver/versitSaxDriver.xcodeproj/project.pbxproj b/sope-ical/versitSaxDriver/versitSaxDriver.xcodeproj/project.pbxproj index 13775a4e..aadce778 100644 --- a/sope-ical/versitSaxDriver/versitSaxDriver.xcodeproj/project.pbxproj +++ b/sope-ical/versitSaxDriver/versitSaxDriver.xcodeproj/project.pbxproj @@ -25,30 +25,6 @@ AD665AB6071EB38C00EC5911 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = AD665AB5071EB38C00EC5911 /* common.h */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 1656CC9F058802980012D2BC /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - ZERO_LINK = YES; - }; - name = Development; - }; - 1656CCA0058802990012D2BC /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ 1656CCB80588036A0012D2BC /* versitSaxDriver-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist; path = "versitSaxDriver-Info.plist"; sourceTree = ""; }; 1656CCE2058805BB0012D2BC /* VSiCalSaxDriver.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = VSiCalSaxDriver.h; sourceTree = ""; }; @@ -73,6 +49,9 @@ AD665AB7071EB39600EC5911 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; AD665AB8071EB39600EC5911 /* GNUmakefile.postamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile.postamble; sourceTree = ""; tabWidth = 8; }; AD665AB9071EB39600EC5911 /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = ""; tabWidth = 8; }; + AD77EDB70C4F6BD00018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EDB80C4F6BD00018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EDB90C4F6BD00018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADB07DC207666226003C5ACF /* fhs.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = fhs.make; sourceTree = ""; tabWidth = 8; }; /* End PBXFileReference section */ @@ -104,6 +83,7 @@ 1656CD8F058809E30012D2BC /* Resources */, 1656CD92058809FD0012D2BC /* Frameworks */, 16800E3905880EA1007700A5 /* Products */, + AD77EDB60C4F6BD00018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -167,6 +147,17 @@ name = Headers; sourceTree = ""; }; + AD77EDB60C4F6BD00018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EDB70C4F6BD00018A131 /* Common.xcconfig */, + AD77EDB80C4F6BD00018A131 /* Development.xcconfig */, + AD77EDB90C4F6BD00018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -196,48 +187,11 @@ ); buildRules = ( ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - INFOPLIST_FILE = "versitSaxDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-4.5"; - PRODUCT_NAME = versitSaxDriver; - WARNING_CFLAGS = "-Wmost"; - WRAPPER_EXTENSION = sax; - }; dependencies = ( ); name = versitSaxDriver; productName = versitSaxDriver; productReference = 16800E2F05880E8E007700A5 /* versitSaxDriver.sax */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - versitSaxDriver - CFBundleGetInfoString - - CFBundleIconFile - - CFBundleIdentifier - com.MySoftwareCompany.versitSaxDriver - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleShortVersionString - - CFBundleSignature - ???? - CFBundleVersion - 1.0.0d1 - - -"; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -246,12 +200,6 @@ 1656CCA1058802990012D2BC /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA07A650857395900993825 /* Build configuration list for PBXProject "versitSaxDriver" */; - buildSettings = { - }; - buildStyles = ( - 1656CC9F058802980012D2BC /* Development */, - 1656CCA0058802990012D2BC /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 1656CC9D058802980012D2BC; productRefGroup = 1656CC9D058802980012D2BC; @@ -294,54 +242,33 @@ /* Begin XCBuildConfiguration section */ ADA07A620857395900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EDB80C4F6BD00018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; INFOPLIST_FILE = "versitSaxDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-4.5"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; PRODUCT_NAME = versitSaxDriver; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = sax; - ZERO_LINK = YES; }; name = Development; }; ADA07A630857395900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EDB90C4F6BD00018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; INFOPLIST_FILE = "versitSaxDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-4.5"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; PRODUCT_NAME = versitSaxDriver; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = sax; - ZERO_LINK = NO; }; name = Wrapper; }; ADA07A640857395900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - INFOPLIST_FILE = "versitSaxDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-4.5"; - PRODUCT_NAME = versitSaxDriver; - WARNING_CFLAGS = "-Wmost"; - WRAPPER_EXTENSION = sax; }; name = Default; }; @@ -354,11 +281,6 @@ ADA07A670857395900993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj b/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj index 8f3e803d..fe8f3203 100644 --- a/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj +++ b/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj @@ -44,53 +44,6 @@ ADD6610E06DA3D1F007161CA /* EOControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADD6610D06DA3D1F007161CA /* EOControl.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; AD013C4706E20DAA000910D8 /* LDAP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LDAP.framework; path = /System/Library/Frameworks/LDAP.framework; sourceTree = ""; }; @@ -120,6 +73,9 @@ AD01446306E21EED000910D8 /* NGLdapURL.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = NGLdapURL.m; sourceTree = ""; }; AD01446406E21EED000910D8 /* NSString+DN.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "NSString+DN.h"; sourceTree = ""; }; AD01446506E21EED000910D8 /* NSString+DN.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = "NSString+DN.m"; sourceTree = ""; }; + AD77ED400C4F6AB30018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77ED410C4F6AB30018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77ED420C4F6AB30018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8BF1DA070198D900EC239A /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/XmlRpc.framework"; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7006DA343C007161CA /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; @@ -183,6 +139,17 @@ name = Headers; sourceTree = ""; }; + AD77ED3F0C4F6AB30018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77ED400C4F6AB30018A131 /* Common.xcconfig */, + AD77ED410C4F6AB30018A131 /* Development.xcconfig */, + AD77ED420C4F6AB30018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -197,6 +164,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77ED3F0C4F6AB30018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -304,55 +272,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.30; - 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 = "NGLdap-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1C00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGLdap; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = NGLdap; productName = NGLdap; productReference = ADD65D5806DA372D007161CA /* NGLdap.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - NGLdap - CFBundleIdentifier - org.OpenGroupware.SOPE.NGLdap - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -361,12 +285,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA07CAC085753B900993825 /* Build configuration list for PBXProject "NGLdap" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -414,113 +332,47 @@ /* Begin XCBuildConfiguration section */ ADA07CA9085753B900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77ED410C4F6AB30018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.30; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGLdap-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1C00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGLdap; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA07CAA085753B900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77ED420C4F6AB30018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.30; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGLdap-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1C00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGLdap; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA07CAB085753B900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.30; - 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 = "NGLdap-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1C00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGLdap; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -533,11 +385,6 @@ ADA07CAE085753B900993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-ldap/sope-ldap.xcodeproj/project.pbxproj b/sope-ldap/sope-ldap.xcodeproj/project.pbxproj index cc392488..c25089dd 100644 --- a/sope-ldap/sope-ldap.xcodeproj/project.pbxproj +++ b/sope-ldap/sope-ldap.xcodeproj/project.pbxproj @@ -12,9 +12,6 @@ buildConfigurationList = ADA07A150857393700993825 /* Build configuration list for PBXAggregateTarget "Wrapper Contents" */; buildPhases = ( ); - buildSettings = { - PRODUCT_NAME = "Wrapper Contents"; - }; dependencies = ( AD8BF26C0701996900EC239A /* PBXTargetDependency */, ); @@ -26,9 +23,6 @@ buildConfigurationList = ADA07A190857393700993825 /* Build configuration list for PBXAggregateTarget "all" */; buildPhases = ( ); - buildSettings = { - PRODUCT_NAME = all; - }; dependencies = ( ADDF479B06DA58DD00C4E7F8 /* PBXTargetDependency */, ); @@ -37,53 +31,6 @@ }; /* End PBXAggregateTarget section */ -/* Begin PBXBuildStyle section */ - ADDF476806DA572500C4E7F8 /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADDF476906DA572500C4E7F8 /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXContainerItemProxy section */ AD8BF26B0701996900EC239A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -154,12 +101,6 @@ ADDF476A06DA572500C4E7F8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA07A1D0857393700993825 /* Build configuration list for PBXProject "sope-ldap" */; - buildSettings = { - }; - buildStyles = ( - ADDF476806DA572500C4E7F8 /* Development */, - ADDF476906DA572500C4E7F8 /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADDF476606DA572500C4E7F8; projectDirPath = ""; diff --git a/sope-mime/NGImap4/NGImap4.xcodeproj/project.pbxproj b/sope-mime/NGImap4/NGImap4.xcodeproj/project.pbxproj index a08b159b..97c14d3c 100644 --- a/sope-mime/NGImap4/NGImap4.xcodeproj/project.pbxproj +++ b/sope-mime/NGImap4/NGImap4.xcodeproj/project.pbxproj @@ -37,55 +37,11 @@ ADFE632C06E25E7B006628C4 /* NSString+Imap4.h in Headers */ = {isa = PBXBuildFile; fileRef = ADFE631806E25E7B006628C4 /* NSString+Imap4.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; + AD77EB5B0C4F5F870018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EB5C0C4F5F870018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EB5D0C4F5F870018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7106DA343C007161CA /* COPYING */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; ADD65C7406DA343C007161CA /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; @@ -167,6 +123,17 @@ name = Headers; sourceTree = ""; }; + AD77EB5A0C4F5F870018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EB5B0C4F5F870018A131 /* Common.xcconfig */, + AD77EB5C0C4F5F870018A131 /* Development.xcconfig */, + AD77EB5D0C4F5F870018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -182,6 +149,7 @@ ADD65D5D06DA37C7007161CA /* Resources */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EB5A0C4F5F870018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -283,54 +251,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "NGImap4-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1600000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGImap4; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = NGImap4; productName = NGImap4; productReference = ADD65D5806DA372D007161CA /* NGImap4.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - NGImap4 - CFBundleIdentifier - org.OpenGroupware.SOPE.NGImap4 - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -339,12 +264,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA0782B0857387100993825 /* Build configuration list for PBXProject "NGImap4" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -381,110 +300,45 @@ /* Begin XCBuildConfiguration section */ ADA078280857387100993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB5C0C4F5F870018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGImap4-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1600000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGImap4; SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA078290857387100993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB5D0C4F5F870018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.242; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGImap4-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1600000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGImap4; SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA0782A0857387100993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "NGImap4-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1600000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGImap4; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -497,11 +351,6 @@ ADA0782D0857387100993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-mime/NGMail/NGMail.xcodeproj/project.pbxproj b/sope-mime/NGMail/NGMail.xcodeproj/project.pbxproj index 77c6e538..6ff15c19 100644 --- a/sope-mime/NGMail/NGMail.xcodeproj/project.pbxproj +++ b/sope-mime/NGMail/NGMail.xcodeproj/project.pbxproj @@ -28,55 +28,11 @@ ADFE614606E2577B006628C4 /* dummy.c in Sources */ = {isa = PBXBuildFile; fileRef = ADFE614506E2577B006628C4 /* dummy.c */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - ADD65B6806DA32D6007161CA /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - ADD65B6906DA32D6007161CA /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ AD013B8706E20AC5000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; + AD77EB6F0C4F5FFF0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EB700C4F5FFF0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EB710C4F5FFF0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADC07368072FFB9800C125E0 /* NGSendMail.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = NGSendMail.h; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; ADD65C7106DA343C007161CA /* COPYING */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; @@ -140,6 +96,17 @@ name = Headers; sourceTree = ""; }; + AD77EB6E0C4F5FFF0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EB6F0C4F5FFF0018A131 /* Common.xcconfig */, + AD77EB700C4F5FFF0018A131 /* Development.xcconfig */, + AD77EB710C4F5FFF0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -154,6 +121,7 @@ ADFE5DE606E25546006628C4 /* Projects */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EB6E0C4F5FFF0018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -254,54 +222,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "NGMail-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1800000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGMail; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = NGMail; productName = NGMail; productReference = ADD65D5806DA372D007161CA /* NGMail.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - NGMail - CFBundleIdentifier - org.OpenGroupware.SOPE.NGMail - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -310,12 +235,6 @@ ADD65B6A06DA32D6007161CA /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA0783E0857387C00993825 /* Build configuration list for PBXProject "NGMail" */; - buildSettings = { - }; - buildStyles = ( - ADD65B6806DA32D6007161CA /* Development */, - ADD65B6906DA32D6007161CA /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = ADD65B6606DA32D6007161CA; productRefGroup = ADD65D5906DA372D007161CA /* Products */; @@ -358,110 +277,43 @@ /* Begin XCBuildConfiguration section */ ADA078390857387C00993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB700C4F5FFF0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGMail-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1800000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGMail; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA0783A0857387C00993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB710C4F5FFF0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.242; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGMail-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1800000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGMail; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA0783B0857387C00993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "NGMail-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1800000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGMail; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -474,11 +326,6 @@ ADA078400857387C00993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-mime/NGMime/NGMime.xcodeproj/project.pbxproj b/sope-mime/NGMime/NGMime.xcodeproj/project.pbxproj index e7b70e6e..d1604381 100644 --- a/sope-mime/NGMime/NGMime.xcodeproj/project.pbxproj +++ b/sope-mime/NGMime/NGMime.xcodeproj/project.pbxproj @@ -175,6 +175,9 @@ AD2E222707C0B5160012FE12 /* EOSortOrdering+IMAPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = "EOSortOrdering+IMAPAdditions.m"; path = "../NGImap4/EOSortOrdering+IMAPAdditions.m"; sourceTree = ""; }; AD770DE407AE503200F5C7A1 /* NGMimeMultipartBodyGenerator.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = NGMimeMultipartBodyGenerator.m; sourceTree = ""; }; AD770E0107AE509000F5C7A1 /* NGMailBase64Encoding.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = NGMailBase64Encoding.m; sourceTree = ""; }; + AD77EB840C4F607D0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EB850C4F607D0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EB860C4F607D0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD83A1B306FE09CB001A2EAD /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/XmlRpc.framework"; sourceTree = ""; }; ADC07377072FFC0C00C125E0 /* NGSendMail.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = NGSendMail.m; sourceTree = ""; }; ADD65C6F06DA343C007161CA /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; @@ -367,6 +370,17 @@ name = "sope-core"; sourceTree = ""; }; + AD77EB830C4F607D0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EB840C4F607D0018A131 /* Common.xcconfig */, + AD77EB850C4F607D0018A131 /* Development.xcconfig */, + AD77EB860C4F607D0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADD65B6606DA32D6007161CA = { isa = PBXGroup; children = ( @@ -386,6 +400,7 @@ ADFE5C5A06E25169006628C4 /* Projects */, ADD65D5906DA372D007161CA /* Products */, ADD65F7306DA3C02007161CA /* Linked Frameworks */, + AD77EB830C4F607D0018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -854,113 +869,47 @@ /* Begin XCBuildConfiguration section */ ADA078640857388900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB850C4F607D0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.242; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGMime-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1A00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGMime; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA078650857388900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EB860C4F607D0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.242; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "NGMime-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC1A00000, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = NGMime; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA078660857388900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.242; - 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 = "NGMime-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC1A00000, - "-headerpad_max_install_names", - ); - OTHER_REZFLAGS = ""; - PRODUCT_NAME = NGMime; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -973,11 +922,6 @@ ADA078690857388900993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-xml/DOM/DOM.xcodeproj/project.pbxproj b/sope-xml/DOM/DOM.xcodeproj/project.pbxproj index 1fd66c88..6a1b6a44 100644 --- a/sope-xml/DOM/DOM.xcodeproj/project.pbxproj +++ b/sope-xml/DOM/DOM.xcodeproj/project.pbxproj @@ -84,38 +84,6 @@ AD01336106DE7B08000910D8 /* SaxObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD01336006DE7B04000910D8 /* SaxObjC.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - AD01311206DE7937000910D8 /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - }; - name = Development; - }; - AD01311306DE7937000910D8 /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - ZERO_LINK = NO; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXContainerItemProxy section */ AD01336406DE7B39000910D8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -217,6 +185,9 @@ AD01317006DE797E000910D8 /* Version */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; indentWidth = 8; path = Version; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; AD01333606DE7A3E000910D8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; AD01333B06DE7AF1000910D8 /* SaxObjC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SaxObjC.xcodeproj; path = ../SaxObjC/SaxObjC.xcodeproj; sourceTree = ""; }; + AD77EA960C4F59F10018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EA970C4F59F10018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EA9A0C4F59F10018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADAD5B57076F68D000AAD24E /* SaxObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SaxObjC.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/SaxObjC.framework"; sourceTree = ""; }; ADECEC78078A481500B7221D /* fhs.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = fhs.make; sourceTree = ""; tabWidth = 8; }; /* End PBXFileReference section */ @@ -251,6 +222,7 @@ AD01333A06DE7AD4000910D8 /* Projects */, AD01312006DE794E000910D8 /* Products */, AD01333506DE7A14000910D8 /* Linked Frameworks */, + AD77EA950C4F59F10018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -398,6 +370,17 @@ name = Products; sourceTree = ""; }; + AD77EA950C4F59F10018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EA960C4F59F10018A131 /* Common.xcconfig */, + AD77EA970C4F59F10018A131 /* Development.xcconfig */, + AD77EA9A0C4F59F10018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -458,58 +441,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.23; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "DOM-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC0200000, - "-headerpad_max_install_names", - ); - PRODUCT_NAME = DOM; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = DOM; productName = DOM; productReference = AD01311F06DE794E000910D8 /* DOM.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - DOM - CFBundleIdentifier - com.yourcompany.DOM - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -518,12 +454,6 @@ AD01311406DE7937000910D8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA076890857284000993825 /* Build configuration list for PBXProject "DOM" */; - buildSettings = { - }; - buildStyles = ( - AD01311206DE7937000910D8 /* Development */, - AD01311306DE7937000910D8 /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = AD01311006DE7937000910D8; productRefGroup = AD01312006DE794E000910D8 /* Products */; @@ -617,108 +547,47 @@ /* Begin XCBuildConfiguration section */ ADA076800857284000993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EA970C4F59F10018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.23; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "DOM-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC0200000, "-headerpad_max_install_names", ); PRODUCT_NAME = DOM; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA076810857284000993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EA9A0C4F59F10018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.23; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "DOM-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC0200000, "-headerpad_max_install_names", ); PRODUCT_NAME = DOM; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA076820857284000993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.23; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "DOM-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC0200000, - "-headerpad_max_install_names", - ); - PRODUCT_NAME = DOM; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -731,11 +600,6 @@ ADA0768B0857284000993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj b/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj index 73793c94..18b3b396 100644 --- a/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj +++ b/sope-xml/SaxObjC/SaxObjC.xcodeproj/project.pbxproj @@ -157,6 +157,9 @@ /* Begin PBXFileReference section */ AD0130DE06DE76DB000910D8 /* libxmlSAXDriver.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxmlSAXDriver.xcodeproj; path = ../libxmlSAXDriver/libxmlSAXDriver.xcodeproj; sourceTree = ""; }; + AD2643D90C4675C700186AAB /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD2643DA0C4675C700186AAB /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD2643DD0C4675C700186AAB /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; AD8571A007EF23BB00D5FC5B /* saxxml.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = saxxml.m; path = ../samples/saxxml.m; sourceTree = ""; }; 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; }; @@ -248,6 +251,17 @@ name = Products; sourceTree = ""; }; + AD2643D80C4675C700186AAB /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD2643D90C4675C700186AAB /* Common.xcconfig */, + AD2643DA0C4675C700186AAB /* Development.xcconfig */, + AD2643DD0C4675C700186AAB /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; AD85719F07EF239100D5FC5B /* Tools */ = { isa = PBXGroup; children = ( @@ -274,6 +288,7 @@ ADDF54AA06DE727A00C4E7F8 /* Products */, AD0130C106DE7697000910D8 /* Projects */, ADDF55D706DE732C00C4E7F8 /* Linked Frameworks */, + AD2643D80C4675C700186AAB /* xcconfig */, ); sourceTree = ""; }; @@ -601,105 +616,45 @@ /* Begin XCBuildConfiguration section */ ADA076640857283900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2643DA0C4675C700186AAB /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.65; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); INFOPLIST_FILE = "SaxObjC-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - ); OTHER_LDFLAGS = ( "-seg1addr", 0xC0000000, "-headerpad_max_install_names", ); PRODUCT_NAME = SaxObjC; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA076650857283900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2643DD0C4675C700186AAB /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.65; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); INFOPLIST_FILE = "SaxObjC-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - ); OTHER_LDFLAGS = ( "-seg1addr", 0xC0000000, "-headerpad_max_install_names", ); PRODUCT_NAME = SaxObjC; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA076660857283900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.65; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - INFOPLIST_FILE = "SaxObjC-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = ( - "-DSOPE_MAJOR_VERSION=4", - "-DSOPE_MINOR_VERSION=7", - ); - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC0000000, - "-headerpad_max_install_names", - ); - PRODUCT_NAME = SaxObjC; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -918,84 +873,25 @@ }; ADA076740857283900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2643DA0C4675C700186AAB /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_REZFLAGS = ""; PRODUCT_NAME = saxxml; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); }; name = Development; }; ADA076750857283900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2643DD0C4675C700186AAB /* Wrapper.xcconfig */; 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_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_REZFLAGS = ""; PRODUCT_NAME = saxxml; - SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; }; name = Wrapper; }; ADA076760857283900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = NO; - INSTALL_PATH = /usr/local/bin; - OTHER_CFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = saxxml; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); }; name = Default; }; @@ -1054,20 +950,15 @@ }; ADA0767C0857283900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2643DA0C4675C700186AAB /* Development.xcconfig */; buildSettings = { }; name = Development; }; ADA0767D0857283900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2643DD0C4675C700186AAB /* Wrapper.xcconfig */; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_MODEL_TUNING = G4; - MACOSX_DEPLOYMENT_TARGET = ""; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-xml/XmlRpc/XmlRpc.xcodeproj/project.pbxproj b/sope-xml/XmlRpc/XmlRpc.xcodeproj/project.pbxproj index c6f1bcfa..4e4e86eb 100644 --- a/sope-xml/XmlRpc/XmlRpc.xcodeproj/project.pbxproj +++ b/sope-xml/XmlRpc/XmlRpc.xcodeproj/project.pbxproj @@ -40,53 +40,6 @@ AD01347E06DE7FCB000910D8 /* DOM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD01347606DE7F98000910D8 /* DOM.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - AD0133A906DE7D97000910D8 /* Development */ = { - isa = PBXBuildStyle; - 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", - ); - }; - name = Development; - }; - AD0133AA06DE7D97000910D8 /* Wrapper */ = { - isa = PBXBuildStyle; - 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; - }; - name = Wrapper; - }; -/* End PBXBuildStyle section */ - /* Begin PBXContainerItemProxy section */ AD01347906DE7FB8000910D8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -154,6 +107,9 @@ AD01347106DE7F83000910D8 /* SaxObjC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SaxObjC.xcodeproj; path = ../SaxObjC/SaxObjC.xcodeproj; sourceTree = ""; }; AD01347306DE7F96000910D8 /* DOM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DOM.xcodeproj; path = ../DOM/DOM.xcodeproj; sourceTree = ""; }; AD01347B06DE7FBB000910D8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + AD77EABC0C4F5A9D0018A131 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD77EABD0C4F5A9D0018A131 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD77EABE0C4F5A9D0018A131 /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADAD5C6E076F699E00AAD24E /* DOM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DOM.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/DOM.framework"; sourceTree = ""; }; ADAD5C6F076F699E00AAD24E /* SaxObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SaxObjC.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/Wrapper/SaxObjC.framework"; sourceTree = ""; }; ADECEC91078A484E00B7221D /* fhs.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = fhs.make; sourceTree = ""; tabWidth = 8; }; @@ -189,6 +145,7 @@ AD0133B706DE7DB0000910D8 /* Products */, AD01346906DE7EAA000910D8 /* Projects */, AD01346C06DE7EAF000910D8 /* Linked Frameworks */, + AD77EABB0C4F5A9D0018A131 /* xcconfig */, ); sourceTree = ""; }; @@ -302,6 +259,17 @@ name = Products; sourceTree = ""; }; + AD77EABB0C4F5A9D0018A131 /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD77EABC0C4F5A9D0018A131 /* Common.xcconfig */, + AD77EABD0C4F5A9D0018A131 /* Development.xcconfig */, + AD77EABE0C4F5A9D0018A131 /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADFA0CFD06E227BC009429E9 /* Unused */ = { isa = PBXGroup; children = ( @@ -345,51 +313,11 @@ ); buildRules = ( ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.31; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "XmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-DHAVE_NSXMLPARSER=1"; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC0400000, - "-headerpad_max_install_names", - ); - PRODUCT_NAME = XmlRpc; - WARNING_CFLAGS = "-Wmost"; - }; dependencies = ( ); name = XmlRpc; productName = XmlRpc; productReference = AD0133B606DE7DB0000910D8 /* XmlRpc.framework */; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - XmlRpc - CFBundleIdentifier - com.yourcompany.XmlRpc - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - -"; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -398,12 +326,6 @@ AD0133AB06DE7D97000910D8 /* Project object */ = { isa = PBXProject; buildConfigurationList = ADA076970857284900993825 /* Build configuration list for PBXProject "XmlRpc" */; - buildSettings = { - }; - buildStyles = ( - AD0133A906DE7D97000910D8 /* Development */, - AD0133AA06DE7D97000910D8 /* Wrapper */, - ); hasScannedForEncodings = 0; mainGroup = AD0133A706DE7D97000910D8; productRefGroup = AD0133B706DE7DB0000910D8 /* Products */; @@ -491,102 +413,55 @@ /* Begin XCBuildConfiguration section */ ADA076940857284900993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EABD0C4F5A9D0018A131 /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.31; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "XmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-DHAVE_NSXMLPARSER=1"; + OTHER_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-DHAVE_NSXMLPARSER=1", + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC0400000, "-headerpad_max_install_names", ); PRODUCT_NAME = XmlRpc; - WARNING_CFLAGS = "-Wmost"; }; name = Development; }; ADA076950857284900993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD77EABE0C4F5A9D0018A131 /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 4.7.0; DYLIB_CURRENT_VERSION = 4.7.31; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "XmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-DHAVE_NSXMLPARSER=1"; + OTHER_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-DHAVE_NSXMLPARSER=1", + ); OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC0400000, "-headerpad_max_install_names", ); PRODUCT_NAME = XmlRpc; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; - ZERO_LINK = NO; }; name = Wrapper; }; ADA076960857284900993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.7.31; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "XmlRpc-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OTHER_CFLAGS = "-DHAVE_NSXMLPARSER=1"; - OTHER_LDFLAGS = ( - "-seg1addr", - 0xC0400000, - "-headerpad_max_install_names", - ); - PRODUCT_NAME = XmlRpc; - WARNING_CFLAGS = "-Wmost"; }; name = Default; }; @@ -599,11 +474,6 @@ ADA076990857284900993825 /* Wrapper */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj index 14f35b20..a42ac91b 100644 --- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj +++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj @@ -35,6 +35,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + AD2644520C4679E400186AAB /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; + AD2644530C4679E400186AAB /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = ""; }; + AD2644560C4679E400186AAB /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = Wrapper.xcconfig; sourceTree = ""; }; ADDF535406DE6CC800C4E7F8 /* libxmlSAXDriver.sax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = libxmlSAXDriver.sax; sourceTree = BUILT_PRODUCTS_DIR; }; ADDF535606DE6CC800C4E7F8 /* libxmlSAXDriver-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "libxmlSAXDriver-Info.plist"; sourceTree = ""; }; ADDF538506DE6EA300C4E7F8 /* bundle-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = "bundle-info.plist"; sourceTree = ""; }; @@ -76,6 +79,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + AD2644510C4679E400186AAB /* xcconfig */ = { + isa = PBXGroup; + children = ( + AD2644520C4679E400186AAB /* Common.xcconfig */, + AD2644530C4679E400186AAB /* Development.xcconfig */, + AD2644560C4679E400186AAB /* Wrapper.xcconfig */, + ); + name = xcconfig; + path = ../../xcconfig; + sourceTree = ""; + }; ADDF534406DE6C5300C4E7F8 = { isa = PBXGroup; children = ( @@ -91,6 +105,7 @@ ADDF53C606DE6EE300C4E7F8 /* Resources */, ADDF535506DE6CC800C4E7F8 /* Products */, ADDF53CE06DE6FC500C4E7F8 /* Linked Frameworks */, + AD2644510C4679E400186AAB /* xcconfig */, ); sourceTree = ""; }; @@ -225,101 +240,63 @@ /* Begin XCBuildConfiguration section */ ADA0769C0857286600993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2644530C4679E400186AAB /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - "DEBUG=1", - ); INFOPLIST_FILE = "libxmlSAXDriver-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers"; - OTHER_CFLAGS = "-I/usr/include/libxml2"; - OTHER_LDFLAGS = "-lxml2"; + OTHER_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-I/usr/include/libxml2", + ); + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lxml2", + ); PRODUCT_NAME = libxmlSAXDriver; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = sax; - ZERO_LINK = YES; }; name = Development; }; ADA0769D0857286600993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2644560C4679E400186AAB /* Wrapper.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_LOCATION = NO; - DEPLOYMENT_POSTPROCESSING = YES; - DSTROOT = /; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "APPLE_RUNTIME=1", - "NeXT_Foundation_LIBRARY=1", - "COCOA_Foundation_LIBRARY=1", - "NeXT_RUNTIME=1", - "COMPILE_AS_FRAMEWORK=1", - ); INFOPLIST_FILE = "libxmlSAXDriver-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers"; - OTHER_CFLAGS = "-I/usr/include/libxml2"; - OTHER_LDFLAGS = "-lxml2"; + OTHER_CFLAGS = ( + "$(OTHER_CFLAGS)", + "-I/usr/include/libxml2", + ); + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lxml2", + ); PRODUCT_NAME = libxmlSAXDriver; - SKIP_INSTALL = YES; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - UNSTRIPPED_PRODUCT = NO; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = sax; - ZERO_LINK = NO; }; name = Wrapper; }; ADA0769E0857286600993825 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = common.h; - INFOPLIST_FILE = "libxmlSAXDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers"; - OTHER_CFLAGS = "-I/usr/include/libxml2"; - OTHER_LDFLAGS = "-lxml2"; - PRODUCT_NAME = libxmlSAXDriver; - WARNING_CFLAGS = "-Wmost"; - WRAPPER_EXTENSION = sax; }; name = Default; }; ADA076A00857286600993825 /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2644530C4679E400186AAB /* Development.xcconfig */; buildSettings = { }; name = Development; }; ADA076A10857286600993825 /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2644560C4679E400186AAB /* Wrapper.xcconfig */; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Wrapper; }; diff --git a/xcconfig/Common.xcconfig b/xcconfig/Common.xcconfig new file mode 100644 index 00000000..db5cb3d2 --- /dev/null +++ b/xcconfig/Common.xcconfig @@ -0,0 +1,4 @@ +SOPE_MAJOR_VERSION = 4 +SOPE_MINOR_VERSION = 7 + +GCC_PREPROCESSOR_DEFINITIONS = SOPE_MAJOR_VERSION=$(SOPE_MAJOR_VERSION) SOPE_MINOR_VERSION=$(SOPE_MINOR_VERSION) APPLE_RUNTIME=1 NeXT_Foundation_LIBRARY=1 COCOA_Foundation_LIBRARY=1 NeXT_RUNTIME=1 COMPILE_AS_FRAMEWORK=1 diff --git a/xcconfig/Development.xcconfig b/xcconfig/Development.xcconfig new file mode 100644 index 00000000..12f5143b --- /dev/null +++ b/xcconfig/Development.xcconfig @@ -0,0 +1,6 @@ +#include "Common" + +COPY_PHASE_STRIP = NO +GCC_GENERATE_DEBUGGING_SYMBOLS = YES +GCC_OPTIMIZATION_LEVEL = 0 +OTHER_CFLAGS = -DDEBUG=1 diff --git a/xcconfig/Wrapper.xcconfig b/xcconfig/Wrapper.xcconfig new file mode 100644 index 00000000..73a397e7 --- /dev/null +++ b/xcconfig/Wrapper.xcconfig @@ -0,0 +1,28 @@ +#include "Common" + +// Target and SDK +MACOSX_DEPLOYMENT_TARGET = 10.4 +SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk + +// Tuning +GCC_MODEL_TUNING_ppc = G5 + +ARCHS = i386 ppc + +GCC_ENABLE_FIX_AND_CONTINUE = NO +GCC_GENERATE_DEBUGGING_SYMBOLS = NO +GCC_OPTIMIZATION_LEVEL = 3 + +COPY_PHASE_STRIP = YES +SKIP_INSTALL = YES +UNSTRIPPED_PRODUCT = NO + +DEPLOYMENT_LOCATION = NO +DEPLOYMENT_POSTPROCESSING = YES +DSTROOT = / + +DYLIB_INSTALL_NAME_BASE = @executable_path/../Frameworks/ +FRAMEWORK_SEARCH_PATHS = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION) +SYMROOT = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION) +TEMP_DIR = $(SYMROOT)/$(PROJECT_NAME).build +ZERO_LINK = NO -- 2.39.5