]> err.no Git - sope/commitdiff
projects / sope / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3e743ea)
provide real umbrella support
authorznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Fri, 20 Jul 2007 17:30:23 +0000 (17:30 +0000)
committerznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Fri, 20 Jul 2007 17:30:23 +0000 (17:30 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1513 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

SOPE.xcodeproj/project.pbxproj patch | blob | history
xcconfig/Wrapper.xcconfig patch | blob | history

diff --git a/SOPE.xcodeproj/project.pbxproj b/SOPE.xcodeproj/project.pbxproj
index 5c3c4f55afda3bc1fba560319e264035b8631071..75cb81dd6cd08ad8e03e4067becf98fe274efc28 100644 (file)
--- a/SOPE.xcodeproj/project.pbxproj
+++ b/SOPE.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
                                AD8BF1BB0701978A00EC239A /* PBXTargetDependency */,
                                AD8BF279070199A200EC239A /* PBXTargetDependency */,
                                AD8BF8660701ADF800EC239A /* PBXTargetDependency */,
+                               ADE017B40C50ECF6000453BD /* PBXTargetDependency */,
                                AD2209A90C4FA0DE004B863D /* PBXTargetDependency */,
                                AD2209AB0C4FA0E9004B863D /* PBXTargetDependency */,
                        );
@@ -49,7 +50,6 @@
 
 /* Begin PBXBuildFile section */
                AD0C92F108AC9E6F00952E9F /* dummy.c in Sources */ = {isa = PBXBuildFile; fileRef = AD0C92F008AC9E6F00952E9F /* dummy.c */; };
-               AD0C94AD08ACA1EA00952E9F /* WEPrototype.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C94AC08ACA1EA00952E9F /* WEPrototype.framework */; };
                AD205D4508ACA3120023743A /* SaxObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C945708ACA18700952E9F /* SaxObjC.framework */; };
                AD205D4808ACA3160023743A /* DOM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C945808ACA18700952E9F /* DOM.framework */; };
                AD205D4908ACA31C0023743A /* XmlRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C945908ACA18700952E9F /* XmlRpc.framework */; };
@@ -64,25 +64,22 @@
                AD205D5B08ACA3490023743A /* NGImap4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C946508ACA18700952E9F /* NGImap4.framework */; };
                AD205D5E08ACA34C0023743A /* NGMail.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C946608ACA18700952E9F /* NGMail.framework */; };
                AD205D5F08ACA3500023743A /* NGMime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD0C946708ACA18700952E9F /* NGMime.framework */; };
-               AD205D6408ACA5550023743A /* WEExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD205D6208ACA5550023743A /* WEExtensions.framework */; };
-               AD205D6508ACA5550023743A /* WOExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD205D6308ACA5550023743A /* WOExtensions.framework */; };
-               AD205F8608AE19E10023743A /* NGImap4.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946508ACA18700952E9F /* NGImap4.framework */; };
-               AD205F8708AE19E10023743A /* NGMail.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946608ACA18700952E9F /* NGMail.framework */; };
-               AD205F8808AE19E10023743A /* NGMime.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946708ACA18700952E9F /* NGMime.framework */; };
-               AD205F8908AE19EA0023743A /* NGHttp.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945F08ACA18700952E9F /* NGHttp.framework */; };
-               AD205F8A08AE19EA0023743A /* NGObjWeb.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946008ACA18700952E9F /* NGObjWeb.framework */; };
-               AD205F8B08AE19EA0023743A /* NGXmlRpc.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946108ACA18700952E9F /* NGXmlRpc.framework */; };
-               AD205F8C08AE19EA0023743A /* SoObjects.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946208ACA18700952E9F /* SoObjects.framework */; };
-               AD205F8D08AE19EA0023743A /* WebDAV.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C946308ACA18700952E9F /* WebDAV.framework */; };
-               AD205F8E08AE19EA0023743A /* WOExtensions.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD205D6308ACA5550023743A /* WOExtensions.framework */; };
-               AD205F8F08AE19EA0023743A /* WEExtensions.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD205D6208ACA5550023743A /* WEExtensions.framework */; };
-               AD205F9008AE19EA0023743A /* WEPrototype.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C94AC08ACA1EA00952E9F /* WEPrototype.framework */; };
-               AD205F9108AE19F20023743A /* EOControl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945B08ACA18700952E9F /* EOControl.framework */; };
-               AD205F9208AE19F20023743A /* NGExtensions.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945C08ACA18700952E9F /* NGExtensions.framework */; };
-               AD205F9308AE19F20023743A /* NGStreams.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945D08ACA18700952E9F /* NGStreams.framework */; };
-               AD205F9408AE19F80023743A /* SaxObjC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945708ACA18700952E9F /* SaxObjC.framework */; };
-               AD205F9508AE19F80023743A /* DOM.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945808ACA18700952E9F /* DOM.framework */; };
-               AD205F9608AE19F80023743A /* XmlRpc.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD0C945908ACA18700952E9F /* XmlRpc.framework */; };
+               AD205F8608AE19E10023743A /* NGImap4.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946508ACA18700952E9F /* NGImap4.framework */; };
+               AD205F8708AE19E10023743A /* NGMail.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946608ACA18700952E9F /* NGMail.framework */; };
+               AD205F8808AE19E10023743A /* NGMime.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946708ACA18700952E9F /* NGMime.framework */; };
+               AD205F8908AE19EA0023743A /* NGHttp.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945F08ACA18700952E9F /* NGHttp.framework */; };
+               AD205F8A08AE19EA0023743A /* NGObjWeb.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946008ACA18700952E9F /* NGObjWeb.framework */; };
+               AD205F8B08AE19EA0023743A /* NGXmlRpc.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946108ACA18700952E9F /* NGXmlRpc.framework */; };
+               AD205F8C08AE19EA0023743A /* SoObjects.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946208ACA18700952E9F /* SoObjects.framework */; };
+               AD205F8D08AE19EA0023743A /* WebDAV.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C946308ACA18700952E9F /* WebDAV.framework */; };
+               AD205F9108AE19F20023743A /* EOControl.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945B08ACA18700952E9F /* EOControl.framework */; };
+               AD205F9208AE19F20023743A /* NGExtensions.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945C08ACA18700952E9F /* NGExtensions.framework */; };
+               AD205F9308AE19F20023743A /* NGStreams.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945D08ACA18700952E9F /* NGStreams.framework */; };
+               AD205F9408AE19F80023743A /* SaxObjC.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945708ACA18700952E9F /* SaxObjC.framework */; };
+               AD205F9508AE19F80023743A /* DOM.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945808ACA18700952E9F /* DOM.framework */; };
+               AD205F9608AE19F80023743A /* XmlRpc.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = AD0C945908ACA18700952E9F /* XmlRpc.framework */; };
+               ADB2CC1E0C50EA5A00871885 /* SoOFS.framework in Copy SOPE Frameworks Into Umbrella */ = {isa = PBXBuildFile; fileRef = ADE495970C50E3D1000EBA5B /* SoOFS.framework */; };
+               ADE495980C50E3D1000EBA5B /* SoOFS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE495970C50E3D1000EBA5B /* SoOFS.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -226,34 +223,40 @@
                        remoteGlobalIDString = ADDF478006DA57DA00C4E7F8;
                        remoteInfo = "Wrapper Contents";
                };
+               ADE017B30C50ECF6000453BD /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = ADDF476A06DA572500C4E7F8 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = AD0C92DC08AC9E0C00952E9F;
+                       remoteInfo = SOPE;
+               };
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-               AD205F8408AE19C10023743A /* CopyFiles */ = {
+               AD205F8408AE19C10023743A /* Copy SOPE Frameworks Into Umbrella */ = {
                        isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 12;
+                       buildActionMask = 8;
                        dstPath = "";
                        dstSubfolderSpec = 10;
                        files = (
-                               AD205F8608AE19E10023743A /* NGImap4.framework in CopyFiles */,
-                               AD205F8708AE19E10023743A /* NGMail.framework in CopyFiles */,
-                               AD205F8808AE19E10023743A /* NGMime.framework in CopyFiles */,
-                               AD205F8908AE19EA0023743A /* NGHttp.framework in CopyFiles */,
-                               AD205F8A08AE19EA0023743A /* NGObjWeb.framework in CopyFiles */,
-                               AD205F8B08AE19EA0023743A /* NGXmlRpc.framework in CopyFiles */,
-                               AD205F8C08AE19EA0023743A /* SoObjects.framework in CopyFiles */,
-                               AD205F8D08AE19EA0023743A /* WebDAV.framework in CopyFiles */,
-                               AD205F8E08AE19EA0023743A /* WOExtensions.framework in CopyFiles */,
-                               AD205F8F08AE19EA0023743A /* WEExtensions.framework in CopyFiles */,
-                               AD205F9008AE19EA0023743A /* WEPrototype.framework in CopyFiles */,
-                               AD205F9108AE19F20023743A /* EOControl.framework in CopyFiles */,
-                               AD205F9208AE19F20023743A /* NGExtensions.framework in CopyFiles */,
-                               AD205F9308AE19F20023743A /* NGStreams.framework in CopyFiles */,
-                               AD205F9408AE19F80023743A /* SaxObjC.framework in CopyFiles */,
-                               AD205F9508AE19F80023743A /* DOM.framework in CopyFiles */,
-                               AD205F9608AE19F80023743A /* XmlRpc.framework in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+                               AD205F9408AE19F80023743A /* SaxObjC.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F9508AE19F80023743A /* DOM.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F9608AE19F80023743A /* XmlRpc.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F9108AE19F20023743A /* EOControl.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F9208AE19F20023743A /* NGExtensions.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F9308AE19F20023743A /* NGStreams.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8608AE19E10023743A /* NGImap4.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8708AE19E10023743A /* NGMail.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8808AE19E10023743A /* NGMime.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8D08AE19EA0023743A /* WebDAV.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8908AE19EA0023743A /* NGHttp.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8A08AE19EA0023743A /* NGObjWeb.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8B08AE19EA0023743A /* NGXmlRpc.framework in Copy SOPE Frameworks Into Umbrella */,
+                               AD205F8C08AE19EA0023743A /* SoObjects.framework in Copy SOPE Frameworks Into Umbrella */,
+                               ADB2CC1E0C50EA5A00871885 /* SoOFS.framework in Copy SOPE Frameworks Into Umbrella */,
+                       );
+                       name = "Copy SOPE Frameworks Into Umbrella";
+                       runOnlyForDeploymentPostprocessing = 1;
                };
 /* End PBXCopyFilesBuildPhase section */
 
@@ -261,23 +264,23 @@
                AD0C92DD08AC9E0C00952E9F /* SOPE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SOPE.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                AD0C92DF08AC9E0C00952E9F /* SOPE-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "SOPE-Info.plist"; sourceTree = "<group>"; };
                AD0C92F008AC9E6F00952E9F /* dummy.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = dummy.c; path = "sope-core/dummy.c"; sourceTree = "<group>"; };
-               AD0C945708ACA18700952E9F /* SaxObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SaxObjC.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/SaxObjC.framework"; sourceTree = "<absolute>"; };
-               AD0C945808ACA18700952E9F /* DOM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DOM.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/DOM.framework"; sourceTree = "<absolute>"; };
-               AD0C945908ACA18700952E9F /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/XmlRpc.framework"; sourceTree = "<absolute>"; };
-               AD0C945B08ACA18700952E9F /* EOControl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EOControl.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/EOControl.framework"; sourceTree = "<absolute>"; };
-               AD0C945C08ACA18700952E9F /* NGExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGExtensions.framework"; sourceTree = "<absolute>"; };
-               AD0C945D08ACA18700952E9F /* NGStreams.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGStreams.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGStreams.framework"; sourceTree = "<absolute>"; };
-               AD0C945F08ACA18700952E9F /* NGHttp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGHttp.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGHttp.framework"; sourceTree = "<absolute>"; };
-               AD0C946008ACA18700952E9F /* NGObjWeb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGObjWeb.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGObjWeb.framework"; sourceTree = "<absolute>"; };
-               AD0C946108ACA18700952E9F /* NGXmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGXmlRpc.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGXmlRpc.framework"; sourceTree = "<absolute>"; };
-               AD0C946208ACA18700952E9F /* SoObjects.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SoObjects.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/SoObjects.framework"; sourceTree = "<absolute>"; };
-               AD0C946308ACA18700952E9F /* WebDAV.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebDAV.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WebDAV.framework"; sourceTree = "<absolute>"; };
-               AD0C946508ACA18700952E9F /* NGImap4.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGImap4.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGImap4.framework"; sourceTree = "<absolute>"; };
-               AD0C946608ACA18700952E9F /* NGMail.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMail.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGMail.framework"; sourceTree = "<absolute>"; };
-               AD0C946708ACA18700952E9F /* NGMime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMime.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/NGMime.framework"; sourceTree = "<absolute>"; };
-               AD0C94AC08ACA1EA00952E9F /* WEPrototype.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WEPrototype.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WEPrototype.framework"; sourceTree = "<absolute>"; };
-               AD205D6208ACA5550023743A /* WEExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WEExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WEExtensions.framework"; sourceTree = "<absolute>"; };
-               AD205D6308ACA5550023743A /* WOExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WOExtensions.framework; path = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)/WOExtensions.framework"; sourceTree = "<absolute>"; };
+               AD0C945708ACA18700952E9F /* SaxObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SaxObjC.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/SaxObjC.framework"; sourceTree = "<absolute>"; };
+               AD0C945808ACA18700952E9F /* DOM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DOM.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/DOM.framework"; sourceTree = "<absolute>"; };
+               AD0C945908ACA18700952E9F /* XmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XmlRpc.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/XmlRpc.framework"; sourceTree = "<absolute>"; };
+               AD0C945B08ACA18700952E9F /* EOControl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EOControl.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/EOControl.framework"; sourceTree = "<absolute>"; };
+               AD0C945C08ACA18700952E9F /* NGExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGExtensions.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGExtensions.framework"; sourceTree = "<absolute>"; };
+               AD0C945D08ACA18700952E9F /* NGStreams.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGStreams.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGStreams.framework"; sourceTree = "<absolute>"; };
+               AD0C945F08ACA18700952E9F /* NGHttp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGHttp.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGHttp.framework"; sourceTree = "<absolute>"; };
+               AD0C946008ACA18700952E9F /* NGObjWeb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGObjWeb.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGObjWeb.framework"; sourceTree = "<absolute>"; };
+               AD0C946108ACA18700952E9F /* NGXmlRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGXmlRpc.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGXmlRpc.framework"; sourceTree = "<absolute>"; };
+               AD0C946208ACA18700952E9F /* SoObjects.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SoObjects.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/SoObjects.framework"; sourceTree = "<absolute>"; };
+               AD0C946308ACA18700952E9F /* WebDAV.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebDAV.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/WebDAV.framework"; sourceTree = "<absolute>"; };
+               AD0C946508ACA18700952E9F /* NGImap4.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGImap4.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGImap4.framework"; sourceTree = "<absolute>"; };
+               AD0C946608ACA18700952E9F /* NGMail.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMail.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGMail.framework"; sourceTree = "<absolute>"; };
+               AD0C946708ACA18700952E9F /* NGMime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NGMime.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/NGMime.framework"; sourceTree = "<absolute>"; };
+               AD0C94AC08ACA1EA00952E9F /* WEPrototype.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WEPrototype.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/WEPrototype.framework"; sourceTree = "<absolute>"; };
+               AD205D6208ACA5550023743A /* WEExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WEExtensions.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/WEExtensions.framework"; sourceTree = "<absolute>"; };
+               AD205D6308ACA5550023743A /* WOExtensions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WOExtensions.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/WOExtensions.framework"; sourceTree = "<absolute>"; };
                AD263F730C4670E400186AAB /* Wrapper.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; name = Wrapper.xcconfig; path = xcconfig/Wrapper.xcconfig; sourceTree = "<group>"; };
                AD2640D70C46729500186AAB /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; name = Development.xcconfig; path = xcconfig/Development.xcconfig; sourceTree = "<group>"; };
                AD2640E30C46730000186AAB /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; name = Common.xcconfig; path = xcconfig/Common.xcconfig; sourceTree = "<group>"; };
@@ -300,6 +303,7 @@
                ADDF477406DA575700C4E7F8 /* PROJECTLEAD */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = PROJECTLEAD; sourceTree = "<group>"; };
                ADDF477506DA575700C4E7F8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
                ADDF477706DA575700C4E7F8 /* Version */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = Version; sourceTree = "<group>"; tabWidth = 8; };
+               ADE495970C50E3D1000EBA5B /* SoOFS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SoOFS.framework; path = "$(EMBEDDED_FRAMEWORKS_DIR)/SoOFS.framework"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -313,17 +317,15 @@
                                AD205D4D08ACA3210023743A /* EOControl.framework in Frameworks */,
                                AD205D4E08ACA3250023743A /* NGExtensions.framework in Frameworks */,
                                AD205D4F08ACA3280023743A /* NGStreams.framework in Frameworks */,
+                               AD205D5B08ACA3490023743A /* NGImap4.framework in Frameworks */,
+                               AD205D5E08ACA34C0023743A /* NGMail.framework in Frameworks */,
+                               AD205D5F08ACA3500023743A /* NGMime.framework in Frameworks */,
+                               AD205D5908ACA3440023743A /* WebDAV.framework in Frameworks */,
                                AD205D5408ACA3370023743A /* NGHttp.framework in Frameworks */,
                                AD205D5608ACA33B0023743A /* NGObjWeb.framework in Frameworks */,
                                AD205D5708ACA33E0023743A /* NGXmlRpc.framework in Frameworks */,
                                AD205D5808ACA3410023743A /* SoObjects.framework in Frameworks */,
-                               AD205D5908ACA3440023743A /* WebDAV.framework in Frameworks */,
-                               AD0C94AD08ACA1EA00952E9F /* WEPrototype.framework in Frameworks */,
-                               AD205D5B08ACA3490023743A /* NGImap4.framework in Frameworks */,
-                               AD205D5E08ACA34C0023743A /* NGMail.framework in Frameworks */,
-                               AD205D5F08ACA3500023743A /* NGMime.framework in Frameworks */,
-                               AD205D6408ACA5550023743A /* WEExtensions.framework in Frameworks */,
-                               AD205D6508ACA5550023743A /* WOExtensions.framework in Frameworks */,
+                               ADE495980C50E3D1000EBA5B /* SoOFS.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -349,10 +351,10 @@
                AD0C945308ACA18700952E9F /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
-                               AD0C946408ACA18700952E9F /* sope-mime */,
-                               AD0C945E08ACA18700952E9F /* sope-appserver */,
-                               AD0C945A08ACA18700952E9F /* sope-core */,
                                AD0C945608ACA18700952E9F /* sope-xml */,
+                               AD0C945A08ACA18700952E9F /* sope-core */,
+                               AD0C945E08ACA18700952E9F /* sope-appserver */,
+                               AD0C946408ACA18700952E9F /* sope-mime */,
                        );
                        name = Frameworks;
                        path = /Users/znek/Projects/OGo/SOPE;
@@ -383,11 +385,12 @@
                AD0C945E08ACA18700952E9F /* sope-appserver */ = {
                        isa = PBXGroup;
                        children = (
+                               AD0C946308ACA18700952E9F /* WebDAV.framework */,
                                AD0C945F08ACA18700952E9F /* NGHttp.framework */,
                                AD0C946008ACA18700952E9F /* NGObjWeb.framework */,
                                AD0C946108ACA18700952E9F /* NGXmlRpc.framework */,
                                AD0C946208ACA18700952E9F /* SoObjects.framework */,
-                               AD0C946308ACA18700952E9F /* WebDAV.framework */,
+                               ADE495970C50E3D1000EBA5B /* SoOFS.framework */,
                                AD205D6308ACA5550023743A /* WOExtensions.framework */,
                                AD205D6208ACA5550023743A /* WEExtensions.framework */,
                                AD0C94AC08ACA1EA00952E9F /* WEPrototype.framework */,
@@ -501,14 +504,14 @@
                                ADDF477406DA575700C4E7F8 /* PROJECTLEAD */,
                                ADDCEE81073ED2F500EAEC3C /* TODO.txt */,
                                ADDF477706DA575700C4E7F8 /* Version */,
+                               AD0C92DF08AC9E0C00952E9F /* SOPE-Info.plist */,
                                AD8BF0C207018DB100EC239A /* maintenance */,
+                               AD263F720C4670C600186AAB /* xcconfig */,
                                ADDF477D06DA577400C4E7F8 /* Makefiles */,
                                AD0C92EE08AC9E5600952E9F /* Classes */,
                                ADDF478306DA57F500C4E7F8 /* Projects */,
                                AD0C92DE08AC9E0C00952E9F /* Products */,
                                AD0C945308ACA18700952E9F /* Frameworks */,
-                               AD263F720C4670C600186AAB /* xcconfig */,
-                               AD0C92DF08AC9E0C00952E9F /* SOPE-Info.plist */,
                        );
                        sourceTree = "<group>";
                };
@@ -557,8 +560,8 @@
                                AD0C92D908AC9E0C00952E9F /* Resources */,
                                AD0C92DA08AC9E0C00952E9F /* Sources */,
                                AD0C92DB08AC9E0C00952E9F /* Frameworks */,
-                               AD205F8408AE19C10023743A /* CopyFiles */,
-                               AD205F9708AE1BD40023743A /* ShellScript */,
+                               AD205F8408AE19C10023743A /* Copy SOPE Frameworks Into Umbrella */,
+                               AD16B1010C51040F00FEC5CF /* Prepare Umbrella For Wrapper Deployment */,
                        );
                        buildRules = (
                        );
@@ -653,18 +656,20 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               AD205F9708AE1BD40023743A /* ShellScript */ = {
+               AD16B1010C51040F00FEC5CF /* Prepare Umbrella For Wrapper Deployment */ = {
                        isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
+                       buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
+                               "${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH}/SaxObjC.framework",
                        );
+                       name = "Prepare Umbrella For Wrapper Deployment";
                        outputPaths = (
                        );
-                       runOnlyForDeploymentPostprocessing = 0;
+                       runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
-                       shellScript = set;
+                       shellScript = "#    setenv PRODUCT_NAME SOPE\n#    setenv FULL_PRODUCT_NAME SOPE.framework\n#    setenv FRAMEWORKS_FOLDER_PATH SOPE.framework/Versions/A/Frameworks\n\n## defs\n\nUMBRELLA_EXE=${UMBRELLA_DEPLOYMENT_DIR}/${FULL_PRODUCT_NAME}/${PRODUCT_NAME}\nUMBRELLA_FRAMEWORKS_DIR=${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH}\n\n\n## sub\n\nfix_installnames_in_framework() {\n  FW_EXE=\"$1\"\n#  echo \"=========== $1 ============\"\n#  otool -L ${FW_EXE}\n\n  FW_ID=`otool -L \"${FW_EXE}\" | tail -n +2 | head -1| grep \"${EMBEDDED_FRAMEWORKS_DIR}\" | awk -F\\( '{print $1}'`\n\n  if [ \"$FW_ID\" != \"\" ]; then\n    x=`echo $FW_ID | sed -e \"s;${EMBEDDED_FRAMEWORKS_DIR};@executable_path/\\.\\./Frameworks/${FRAMEWORKS_FOLDER_PATH};\"`\n    install_name_tool -id ${x} ${FW_EXE}\n    echo \"Changed ID: ${FW_EXE}\"\n  fi\n\n  INSTALL_NAMES=`otool -L \"${FW_EXE}\" | tail -n +3 | grep \"${EMBEDDED_FRAMEWORKS_DIR}\" | awk -F\\( '{print $1}'`\n#  echo $INSTALL_NAMES\n\n  install_name_tool_args=\"\"\n\n  for i in ${INSTALL_NAMES}\n  do\n    x=`echo $i | sed -e \"s;${EMBEDDED_FRAMEWORKS_DIR};@executable_path/\\.\\./Frameworks/${FRAMEWORKS_FOLDER_PATH};\"`\n#    echo \"$i -> $x\"\n    install_name_tool_args=\"${install_name_tool_args} -change $i $x\"\n   done\n#  echo \"install_name_tool ${install_name_tool_args} ${FW_EXE}\"\n  if [ \"${install_name_tool_args}\" != \"\" ]; then\n    install_name_tool ${install_name_tool_args} ${FW_EXE}\n    echo \"Fixed: ${FW_EXE}\"\n  fi\n}\n\n## main\n\n# copy raw umbrella to intended destination dir\n\nrm -rf \"${UMBRELLA_DEPLOYMENT_DIR}/${FULL_PRODUCT_NAME}\"\ncp -R  \"${EMBEDDED_FRAMEWORKS_DIR}/${FULL_PRODUCT_NAME}\" \"${UMBRELLA_DEPLOYMENT_DIR}\"\n\nfix_installnames_in_framework ${UMBRELLA_EXE}\nFRAMEWORK_DIRS=`find ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name '*.framework'`\nfor fw in ${FRAMEWORK_DIRS}\ndo\n  fw_exe=\"${fw##*/}\"\n  fw_exe=\"${fw}/${fw_exe%.framework}\"\n  fix_installnames_in_framework ${fw_exe}\ndone\n\n# remove Headers\n\nfind ${UMBRELLA_DEPLOYMENT_DIR}/${FRAMEWORKS_FOLDER_PATH} -type d -name Headers -exec rm -rf {} \\; > /dev/null 2>&1\nexit 0\n";
                };
 /* End PBXShellScriptBuildPhase section */
 
@@ -770,6 +775,11 @@
                        name = "Wrapper Contents (from sope-gdl1.xcodeproj)";
                        targetProxy = AD8BF8670701AE0600EC239A /* PBXContainerItemProxy */;
                };
+               ADE017B40C50ECF6000453BD /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = AD0C92DC08AC9E0C00952E9F /* SOPE */;
+                       targetProxy = ADE017B30C50ECF6000453BD /* PBXContainerItemProxy */;
+               };
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -798,27 +808,23 @@
                                        "-sub_umbrella",
                                        NGStreams,
                                        "-sub_umbrella",
-                                       NGHttp,
+                                       NGImap4,
                                        "-sub_umbrella",
-                                       NGObjWeb,
+                                       NGMail,
                                        "-sub_umbrella",
-                                       NGXmlRpc,
+                                       NGMime,
                                        "-sub_umbrella",
-                                       SoObjects,
+                                       NGHttp,
                                        "-sub_umbrella",
                                        WebDAV,
                                        "-sub_umbrella",
-                                       WEExtensions,
-                                       "-sub_umbrella",
-                                       WOExtensions,
-                                       "-sub_umbrella",
-                                       WEPrototype,
+                                       NGObjWeb,
                                        "-sub_umbrella",
-                                       NGImap4,
+                                       NGXmlRpc,
                                        "-sub_umbrella",
-                                       NGMail,
+                                       SoObjects,
                                        "-sub_umbrella",
-                                       NGMime,
+                                       SoOFS,
                                        "-headerpad_max_install_names",
                                );
                                PRODUCT_NAME = SOPE;
@@ -831,6 +837,7 @@
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = "$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION).0";
                                DYLIB_CURRENT_VERSION = "$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION).0";
+                               DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_VERSION = A;
                                INFOPLIST_FILE = "SOPE-Info.plist";
                                OTHER_LDFLAGS = (
@@ -850,27 +857,23 @@
                                        "-sub_umbrella",
                                        NGStreams,
                                        "-sub_umbrella",
-                                       NGHttp,
+                                       NGImap4,
                                        "-sub_umbrella",
-                                       NGObjWeb,
+                                       NGMail,
                                        "-sub_umbrella",
-                                       NGXmlRpc,
+                                       NGMime,
                                        "-sub_umbrella",
-                                       SoObjects,
+                                       NGHttp,
                                        "-sub_umbrella",
                                        WebDAV,
                                        "-sub_umbrella",
-                                       WEExtensions,
-                                       "-sub_umbrella",
-                                       WOExtensions,
-                                       "-sub_umbrella",
-                                       WEPrototype,
+                                       NGObjWeb,
                                        "-sub_umbrella",
-                                       NGImap4,
+                                       NGXmlRpc,
                                        "-sub_umbrella",
-                                       NGMail,
+                                       SoObjects,
                                        "-sub_umbrella",
-                                       NGMime,
+                                       SoOFS,
                                        "-headerpad_max_install_names",
                                );
                                PRODUCT_NAME = SOPE;
@@ -903,7 +906,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
-                               FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)";
+                               FRAMEWORK_SEARCH_PATHS = "$(EMBEDDED_FRAMEWORKS_DIR)";
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_OPTIMIZATION_LEVEL = 3;
@@ -916,7 +919,7 @@
                                );
                                PRODUCT_NAME = all;
                                SKIP_INSTALL = YES;
-                               SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)";
+                               SYMROOT = "$(EMBEDDED_FRAMEWORKS_DIR)";
                                TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build";
                                UNSTRIPPED_PRODUCT = NO;
                                ZERO_LINK = NO;
diff --git a/xcconfig/Wrapper.xcconfig b/xcconfig/Wrapper.xcconfig
index c727249d64544a5acd36720eedcf027ada326f3f..3984b67220ca1ad0e2667850bfeefefc043ba0e3 100644 (file)
--- a/xcconfig/Wrapper.xcconfig
+++ b/xcconfig/Wrapper.xcconfig
@@ -2,32 +2,42 @@
 
 // Target and SDK
 MACOSX_DEPLOYMENT_TARGET = 10.4
-SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk
+SDKROOT                  = /Developer/SDKs/MacOSX10.4u.sdk
+PREBINDING               = NO
 
 // Tuning
 GCC_MODEL_TUNING_ppc = G5
 
 ARCHS = i386 ppc
 
-GCC_ENABLE_FIX_AND_CONTINUE = NO
+GCC_ENABLE_FIX_AND_CONTINUE    = NO
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO
-GCC_OPTIMIZATION_LEVEL = 3
+GCC_OPTIMIZATION_LEVEL         = 3
 
-COPY_PHASE_STRIP = YES
-SKIP_INSTALL = YES
+COPY_PHASE_STRIP   = YES
+SKIP_INSTALL       = YES
 UNSTRIPPED_PRODUCT = NO
 
-DEPLOYMENT_LOCATION = NO
+DEPLOYMENT_LOCATION       = NO
 DEPLOYMENT_POSTPROCESSING = YES
-DSTROOT = /
+DSTROOT                   = /
 
 ZERO_LINK = NO
 
-// install_header
-DYLIB_INSTALL_NAME_BASE = @executable_path/../Frameworks/
 // the directory, where the built product can be fetched later
 // TARGET_BUILD_DIR = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)
 
+SYMROOT                 = $(USER_LIBRARY_DIR)/EmbeddedFrameworks
+EMBEDDED_FRAMEWORKS_DIR = $(SYMROOT)
+UMBRELLA_DEPLOYMENT_DIR = $(SYMROOT)/Wrapper
+
+// install_header
+DYLIB_INSTALL_NAME_BASE = $(EMBEDDED_FRAMEWORKS_DIR)
+// if you need to have the frameworks separate for AppWrapper inclusion, use
+// this:
+// DYLIB_INSTALL_NAME_BASE = @executable_path/../Frameworks/
+
+
 // the following build variables appear to look normal, but when omitted
 // the Xcode build engine fails miserably. It appears that Xcode tries to
 // evaluate these variables several times and mysterious substitutions to
@@ -37,10 +47,16 @@ DYLIB_INSTALL_NAME_BASE = @executable_path/../Frameworks/
 // seems to eliminate the problem.
 // Problem verified with Xcode build 2.4.1, later versions might be ok.
 
-SYMROOT                 = $(USER_LIBRARY_DIR)/EmbeddedFrameworks
 OBJROOT                 = $(SYMROOT)/build
 TEMP_DIR                = $(SYMROOT)/$(PROJECT_NAME).build
 PROJECT_TEMP_DIR        = $(SYMROOT)/$(PROJECT_NAME).build
-CONFIGURATION_BUILD_DIR = $(BUILD_DIR)/$(CONFIGURATION)
-CONFIGURATION_TEMP_DIR  = $(PROJECT_TEMP_DIR)/$(CONFIGURATION)
-FRAMEWORK_SEARCH_PATHS  = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)
+
+CONFIGURATION_BUILD_DIR = $(BUILD_DIR)
+CONFIGURATION_TEMP_DIR  = $(PROJECT_TEMP_DIR)
+FRAMEWORK_SEARCH_PATHS  = $(EMBEDDED_FRAMEWORKS_DIR)
+
+// for reference - the old way to do it:
+//EMBEDDED_FRAMEWORKS_DIR = $(SYMROOT)/$(CONFIGURATION)
+//CONFIGURATION_BUILD_DIR = $(BUILD_DIR)/$(CONFIGURATION)
+//CONFIGURATION_TEMP_DIR  = $(PROJECT_TEMP_DIR)/$(CONFIGURATION)
+//FRAMEWORK_SEARCH_PATHS  = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)
Unnamed repository; edit this file to name it for gitweb.