fixed Xcode build

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

diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog
index 8f235fe7155ee622236e431221609b4c29a22fd8..e0ae79208295836114c5a39df0c9626d57a79324 100644 (file)
--- a/sope-appserver/ChangeLog
+++ b/sope-appserver/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * NGExtensions.xcode: Fixed dependencies to resemble the make process
+         more closely. Our aim should be to stick to the make process
+         as closely as possible, so we shouldn't introduce dependencies in
+         non-toplevel projects.
+
 2004-08-30  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * sope-appserver.xcode: new Xcode aggregate project

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b56898f299b2f647a76e4d4d17c0a1fdd7991430..9f9e42d30ffb3bf4a9e76d589906c297d425b175 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,6 +1,15 @@
 2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-       * NGObjWeb.xcode: minor fixes
+       * v4.3.41
+
+       * Templates/common.h, SoObjects/common.h: fixed duplicate interface
+         declarations by renaming them. I believe this only affected Xcode
+         builds.
+
+       * NGObjWeb.xcode: Fixed dependencies to resemble the make process
+         more closely. Our aim should be to stick to the make process
+         as closely as possible, so we shouldn't introduce dependencies in
+         non-toplevel projects.
 
 2004-09-20  Marcus Mueller  <znek@mulle-kybernetik.com>
 

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
index 84615573e32dc9c7cb897697275490b407f9b879..e43ea09bc3b0135efb9e1b6fc08e6c6072f79419 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
@@ -116,30 +116,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               AD915D3E06E29F85004720C2 = {
-                       containerPortal = ADFE62AC06E25BF4006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
-                       remoteInfo = NGExtensions;
-               };
-               AD915D3F06E29F85004720C2 = {
-                       isa = PBXTargetDependency;
-                       name = "NGExtensions (from NGExtensions.xcode)";
-                       targetProxy = AD915D3E06E29F85004720C2;
-               };
-               AD915D4006E29F85004720C2 = {
-                       containerPortal = ADFE62A606E25B6C006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
-                       remoteInfo = NGMime;
-               };
-               AD915D4106E29F85004720C2 = {
-                       isa = PBXTargetDependency;
-                       name = "NGMime (from NGMime.xcode)";
-                       targetProxy = AD915D4006E29F85004720C2;
-               };
                AD915D4206E29F90004720C2 = {
                        children = (
                                AD915D4306E29F90004720C2,
@@ -157,18 +133,6 @@
                        remoteRef = AD915D4906E29FC5004720C2;
                        sourceTree = BUILT_PRODUCTS_DIR;
                };
-               AD915D4406E29F97004720C2 = {
-                       containerPortal = AD915D3A06E29F74004720C2;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADDF431E06DA4E3500C4E7F8;
-                       remoteInfo = EOControl;
-               };
-               AD915D4506E29F97004720C2 = {
-                       isa = PBXTargetDependency;
-                       name = "EOControl (from EOControl.xcode)";
-                       targetProxy = AD915D4406E29F97004720C2;
-               };
                AD915D4806E29FA7004720C2 = {
                        fileRef = AD915D4306E29F90004720C2;
                        isa = PBXBuildFile;
@@ -244,30 +208,6 @@
                        settings = {
                        };
                };
-               AD915D5406E2A1E1004720C2 = {
-                       containerPortal = AD915D4C06E2A1BB004720C2;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADDF54A806DE727A00C4E7F8;
-                       remoteInfo = SaxObjC;
-               };
-               AD915D5506E2A1E1004720C2 = {
-                       isa = PBXTargetDependency;
-                       name = "SaxObjC (from SaxObjC.xcode)";
-                       targetProxy = AD915D5406E2A1E1004720C2;
-               };
-               AD915D5606E2A1E1004720C2 = {
-                       containerPortal = AD915D4A06E2A19F004720C2;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = AD01311E06DE794E000910D8;
-                       remoteInfo = DOM;
-               };
-               AD915D5706E2A1E1004720C2 = {
-                       isa = PBXTargetDependency;
-                       name = "DOM (from DOM.xcode)";
-                       targetProxy = AD915D5606E2A1E1004720C2;
-               };
                AD915D5806E2A203004720C2 = {
                        containerPortal = AD915D4C06E2A1BB004720C2;
                        isa = PBXContainerItemProxy;
@@ -524,7 +464,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.40;
+                               DYLIB_CURRENT_VERSION = 4.3.41;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -542,12 +482,6 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               AD915D5506E2A1E1004720C2,
-                               AD915D5706E2A1E1004720C2,
-                               AD915D4506E29F97004720C2,
-                               ADFE56FA06E24C3D006628C4,
-                               AD915D3F06E29F85004720C2,
-                               AD915D4106E29F85004720C2,
                        );
                        isa = PBXNativeTarget;
                        name = NGHttp;
@@ -1018,18 +952,6 @@
                        settings = {
                        };
                };
-               ADFE56F906E24C3D006628C4 = {
-                       containerPortal = ADFE56F406E24C1C006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADDF44B606DA51CB00C4E7F8;
-                       remoteInfo = NGStreams;
-               };
-               ADFE56FA06E24C3D006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "NGStreams (from NGStreams.xcode)";
-                       targetProxy = ADFE56F906E24C3D006628C4;
-               };
                ADFE56FB06E24C41006628C4 = {
                        containerPortal = ADFE56F406E24C1C006628C4;
                        isa = PBXContainerItemProxy;

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
index 83217ec4755169ee04670ab5378f18a95c2b0bd1..9d5d7aa5f712d40e4fe2d0e432bc2b2c9728fb72 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
@@ -758,7 +758,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.40;
+                               DYLIB_CURRENT_VERSION = 4.3.41;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -777,10 +777,6 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               ADFE6F2F06E2712D006628C4,
-                               ADFE6F3306E2712D006628C4,
-                               ADFE737206E289EF006628C4,
-                               ADFE6F3106E2712D006628C4,
                        );
                        isa = PBXNativeTarget;
                        name = NGObjWeb;
@@ -6201,42 +6197,6 @@
                        remoteGlobalIDString = ADD65D5806DA372D007161CA;
                        remoteInfo = WebDAV;
                };
-               ADFE6F2E06E2712D006628C4 = {
-                       containerPortal = ADFE63E606E265AB006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADDF478006DA57DA00C4E7F8;
-                       remoteInfo = "Wrapper Contents";
-               };
-               ADFE6F2F06E2712D006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "Wrapper Contents (from sope-core.xcode)";
-                       targetProxy = ADFE6F2E06E2712D006628C4;
-               };
-               ADFE6F3006E2712D006628C4 = {
-                       containerPortal = ADFE63E206E2656F006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
-                       remoteInfo = NGHttp;
-               };
-               ADFE6F3106E2712D006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "NGHttp (from NGHttp.xcode)";
-                       targetProxy = ADFE6F3006E2712D006628C4;
-               };
-               ADFE6F3206E2712D006628C4 = {
-                       containerPortal = ADFE6C9706E27071006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
-                       remoteInfo = WebDAV;
-               };
-               ADFE6F3306E2712D006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "WebDAV (from WebDAV.xcode)";
-                       targetProxy = ADFE6F3206E2712D006628C4;
-               };
                ADFE6F4D06E27364006628C4 = {
                        children = (
                                ADFE6F5406E27364006628C4,
@@ -7127,18 +7087,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               ADFE737106E289EF006628C4 = {
-                       containerPortal = ADFE736706E287E6006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
-                       remoteInfo = SoObjects;
-               };
-               ADFE737206E289EF006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "SoObjects (from SoObjects.xcode)";
-                       targetProxy = ADFE737106E289EF006628C4;
-               };
        };
        rootObject = ADD65B6A06DA32D6007161CA;
 }

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
index 678ecaa847148534fcec2d59e435b3b9dd4d4e31..fa60f73129be951dac11d1b02125b0e1e226e9be 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj
@@ -270,7 +270,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.17;
+                               DYLIB_CURRENT_VERSION = 4.3.41;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGObjWeb/SoObjects/common.h b/sope-appserver/NGObjWeb/SoObjects/common.h
index b396b6da5640c0eca461f8de140b553cd0c8e486..1a2cc8bef86b1dfe71790b9e85c91d5416ea6edc 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/common.h
+++ b/sope-appserver/NGObjWeb/SoObjects/common.h
@@ -22,7 +22,7 @@
 #import <Foundation/Foundation.h>
 #include <NGExtensions/NGExtensions.h>
 
-@interface NSException(setUserInfo)
+@interface NSException(SoObjects_setUserInfo)
 - (id)setReason:(NSString *)_reason;
 - (id)setUserInfo:(NSDictionary *)_userInfo;
 @end

diff --git a/sope-appserver/NGObjWeb/Templates/common.h b/sope-appserver/NGObjWeb/Templates/common.h
index 1bde14bfb22b80ae7320dfc09a96a4c43d0d3222..434addde770aca680bd113ddef56a657c38ac3da 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/common.h
+++ b/sope-appserver/NGObjWeb/Templates/common.h
@@ -32,7 +32,7 @@
   NSLog(@"WARNING: used deprecated method: %s:%i.", \
         __PRETTY_FUNCTION__, __LINE__);
 
-@interface NSException(setUserInfo)
+@interface NSException(NGObjWeb_Templates_setUserInfo)
 - (id)setReason:(NSString *)_reason;
 - (id)setUserInfo:(NSDictionary *)_userInfo;
 @end

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 51459395c1c482415442026384b9360feeeb451d..903192e4aa6eee0ea45beac3420bbf255b6f35da 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=40
+SUBMINOR_VERSION:=41
 
 # v4.3.40  requires libNGExtensions v4.3.115
 # v4.2.413 requires libSaxObjC      v4.2.33

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
index 8f6ae188785277704d1a1817c81c509c1227fb64..93c14df2fbee38dd7d827027c9d39a148763fcd5 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj
@@ -229,7 +229,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.17;
+                               DYLIB_CURRENT_VERSION = 4.3.41;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index 56c8f20ef02b6c054a6483985a5cddb2d7b3c58b..99ae770594ecf9abe66063a493d06d256f391b7e 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,6 +1,10 @@
 2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-       * WEExtensions.xcode: fixed dependencies
+       * WEExtensions.xcode: Fixed dependencies to resemble the make process
+         more closely. Our aim should be to stick to the make process
+         as closely as possible, so we shouldn't introduce dependencies in
+         non-toplevel projects. Also corrected inclusion of .js resources
+         (these were accidentaly treated as source files before).
 
 2004-08-30  Marcus Mueller  <znek@mulle-kybernetik.com>
 

diff --git a/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj b/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
index 6288eea8c329e6d972d66a3261a2975e5cc0e02f..8ad0265eb6419f6910ce87cdbeb8cad8613369f2 100644 (file)
--- a/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
+++ b/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
@@ -536,6 +536,8 @@
                                ADFE765606E2918F006628C4,
                                ADFE766B06E2918F006628C4,
                                ADFE767D06E29190006628C4,
+                               ADFE766A06E2918F006628C4,
+                               ADFE765306E2918F006628C4,
                        );
                        isa = PBXResourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -543,7 +545,6 @@
                ADD65D5506DA372D007161CA = {
                        buildActionMask = 2147483647;
                        files = (
-                               ADFE765306E2918F006628C4,
                                ADFE765506E2918F006628C4,
                                ADFE765706E2918F006628C4,
                                ADFE765906E2918F006628C4,
@@ -558,7 +559,6 @@
                                ADFE766606E2918F006628C4,
                                ADFE766706E2918F006628C4,
                                ADFE766806E2918F006628C4,
-                               ADFE766A06E2918F006628C4,
                                ADFE766C06E2918F006628C4,
                                ADFE766D06E2918F006628C4,
                                ADFE766E06E2918F006628C4,
@@ -634,7 +634,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.40;
+                               DYLIB_CURRENT_VERSION = 4.3.58;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -652,7 +652,6 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               ADFE77B506E2979A006628C4,
                        );
                        isa = PBXNativeTarget;
                        name = WEExtensions;
@@ -2150,18 +2149,6 @@
                        settings = {
                        };
                };
-               ADFE77B406E2979A006628C4 = {
-                       containerPortal = ADFE77AE06E2975E006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
-                       remoteInfo = NGObjWeb;
-               };
-               ADFE77B506E2979A006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "NGObjWeb (from NGObjWeb.xcode)";
-                       targetProxy = ADFE77B406E2979A006628C4;
-               };
                ADFE77B606E297B2006628C4 = {
                        containerPortal = ADFE77AE06E2975E006628C4;
                        isa = PBXContainerItemProxy;

diff --git a/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj b/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj
index 80018415b7c7dede8c8313b4906de70cd0087542..6bf4fce426a21ae2488997d150876dcab6c64921 100644 (file)
--- a/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj
+++ b/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj
@@ -543,7 +543,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.40;
+                               DYLIB_CURRENT_VERSION = 4.3.19;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/sope-appserver.xcode/project.pbxproj b/sope-appserver/sope-appserver.xcode/project.pbxproj
index 34aacf516b2c862cddce92f5d7002def32007054..5747a61289b54d73c2e8eadc5ba3b9ac5174506a 100644 (file)
--- a/sope-appserver/sope-appserver.xcode/project.pbxproj
+++ b/sope-appserver/sope-appserver.xcode/project.pbxproj
@@ -5,6 +5,120 @@
        };
        objectVersion = 39;
        objects = {
+               AD8BEFED07005D9B00EC239A = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = "wrapper.pb-project";
+                       name = NGHttp.xcode;
+                       path = NGObjWeb/NGHttp/NGHttp.xcode;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8BEFEE07005D9B00EC239A = {
+                       children = (
+                               AD8BEFF207005DC000EC239A,
+                       );
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8BEFEF07005DBE00EC239A = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = "wrapper.pb-project";
+                       name = SoObjects.xcode;
+                       path = NGObjWeb/SoObjects/SoObjects.xcode;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8BEFF007005DBE00EC239A = {
+                       children = (
+                               AD8BEFF107005DC000EC239A,
+                       );
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8BEFF107005DC000EC239A = {
+                       fileType = wrapper.framework;
+                       isa = PBXReferenceProxy;
+                       path = SoObjects.framework;
+                       refType = 3;
+                       remoteRef = AD8BEFF407005DDF00EC239A;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD8BEFF207005DC000EC239A = {
+                       fileType = wrapper.framework;
+                       isa = PBXReferenceProxy;
+                       path = NGHttp.framework;
+                       refType = 3;
+                       remoteRef = AD8BEFF307005DDF00EC239A;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD8BEFF307005DDF00EC239A = {
+                       containerPortal = AD8BEFED07005D9B00EC239A;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 2;
+                       remoteGlobalIDString = ADD65D5806DA372D007161CA;
+                       remoteInfo = NGHttp;
+               };
+               AD8BEFF407005DDF00EC239A = {
+                       containerPortal = AD8BEFEF07005DBE00EC239A;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 2;
+                       remoteGlobalIDString = ADD65D5806DA372D007161CA;
+                       remoteInfo = SoObjects;
+               };
+               AD8BEFF507005E0200EC239A = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = "wrapper.pb-project";
+                       name = WebDAV.xcode;
+                       path = NGObjWeb/WebDAV/WebDAV.xcode;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8BEFF607005E0200EC239A = {
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8BEFF707005E1A00EC239A = {
+                       containerPortal = AD8BEFED07005D9B00EC239A;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
+                       remoteInfo = NGHttp;
+               };
+               AD8BEFF807005E1A00EC239A = {
+                       isa = PBXTargetDependency;
+                       name = "NGHttp (from NGHttp.xcode)";
+                       targetProxy = AD8BEFF707005E1A00EC239A;
+               };
+               AD8BEFF907005E2500EC239A = {
+                       containerPortal = AD8BEFF507005E0200EC239A;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
+                       remoteInfo = WebDAV;
+               };
+               AD8BEFFA07005E2500EC239A = {
+                       isa = PBXTargetDependency;
+                       name = "WebDAV (from WebDAV.xcode)";
+                       targetProxy = AD8BEFF907005E2500EC239A;
+               };
+               AD8BEFFB07005E2D00EC239A = {
+                       containerPortal = AD8BEFEF07005DBE00EC239A;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
+                       remoteInfo = SoObjects;
+               };
+               AD8BEFFC07005E2D00EC239A = {
+                       isa = PBXTargetDependency;
+                       name = "SoObjects (from SoObjects.xcode)";
+                       targetProxy = AD8BEFFB07005E2D00EC239A;
+               };
                AD915D0A06E29B43004720C2 = {
                        isa = PBXFileReference;
                        lastKnownFileType = "wrapper.pb-project";
@@ -213,16 +327,28 @@
                        projectDirPath = "";
                        projectReferences = (
                                {
-                                       ProductGroup = AD915D0B06E29B43004720C2;
-                                       ProjectRef = AD915D0A06E29B43004720C2;
+                                       ProductGroup = AD915D0F06E29B5D004720C2;
+                                       ProjectRef = AD915D0E06E29B5D004720C2;
+                               },
+                               {
+                                       ProductGroup = AD8BEFF607005E0200EC239A;
+                                       ProjectRef = AD8BEFF507005E0200EC239A;
                                },
                                {
                                        ProductGroup = AD915D0D06E29B51004720C2;
                                        ProjectRef = AD915D0C06E29B51004720C2;
                                },
                                {
-                                       ProductGroup = AD915D0F06E29B5D004720C2;
-                                       ProjectRef = AD915D0E06E29B5D004720C2;
+                                       ProductGroup = AD8BEFEE07005D9B00EC239A;
+                                       ProjectRef = AD8BEFED07005D9B00EC239A;
+                               },
+                               {
+                                       ProductGroup = AD915D0B06E29B43004720C2;
+                                       ProjectRef = AD915D0A06E29B43004720C2;
+                               },
+                               {
+                                       ProductGroup = AD8BEFF007005DBE00EC239A;
+                                       ProjectRef = AD8BEFEF07005DBE00EC239A;
                                },
                        );
                        targets = (
@@ -328,6 +454,9 @@
                                PRODUCT_NAME = "Wrapper Contents";
                        };
                        dependencies = (
+                               AD8BEFF807005E1A00EC239A,
+                               AD8BEFFA07005E2500EC239A,
+                               AD8BEFFC07005E2D00EC239A,
                                AD915D2706E29B83004720C2,
                                AD915D2B06E29B83004720C2,
                                AD915D2906E29B83004720C2,
@@ -338,6 +467,9 @@
                };
                ADDF478306DA57F500C4E7F8 = {
                        children = (
+                               AD8BEFF507005E0200EC239A,
+                               AD8BEFED07005D9B00EC239A,
+                               AD8BEFEF07005DBE00EC239A,
                                AD915D0A06E29B43004720C2,
                                AD915D0E06E29B5D004720C2,
                                AD915D0C06E29B51004720C2,