Xcode changes

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

diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog
index c16ff08d2332b65d6a839faba852eb649780f2fa..1347da23d30fd4cbecdf36d7368c63cf18270d36 100644 (file)
--- a/sope-mime/NGImap4/ChangeLog
+++ b/sope-mime/NGImap4/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * imCommon.h: Fixed duplicate interface declarations by renaming
+         them. I believe this was an Xcode only issue. (v4.3.180)
+
 2004-09-07  Helge Hess  <helge.hess@skyrix.com>
 
        * NGImap4ResponseParser.m: added some sanity checks for unexpected

diff --git a/sope-mime/NGImap4/NGImap4.xcode/project.pbxproj b/sope-mime/NGImap4/NGImap4.xcode/project.pbxproj
index 038f2347080a4ad43d1fb4b0966ecc4abe2c1482..b2903bed85db39b1eea202a5b7c9e7ffb6e97fa0 100644 (file)
--- a/sope-mime/NGImap4/NGImap4.xcode/project.pbxproj
+++ b/sope-mime/NGImap4/NGImap4.xcode/project.pbxproj
@@ -266,7 +266,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.174;
+                               DYLIB_CURRENT_VERSION = 4.3.180;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -649,6 +649,7 @@
                        isa = PBXBuildFile;
                        settings = {
                                ATTRIBUTES = (
+                                       Public,
                                );
                        };
                };

diff --git a/sope-mime/NGImap4/imCommon.h b/sope-mime/NGImap4/imCommon.h
index 9e79a5660e878af5b6a67cbc3a58c36fbdacd007..944ae79796696c994efa8760c8d6beb53e1b6705 100644 (file)
--- a/sope-mime/NGImap4/imCommon.h
+++ b/sope-mime/NGImap4/imCommon.h
@@ -43,12 +43,12 @@
 #  endif
 #endif
 
-@interface NSObject(OSXHacks)
+@interface NSObject(NGImap4_OSXHacks)
 - (void)subclassResponsibility:(SEL)_acmd;
 - (void)notImplemented:(SEL)_acmd;
 @end
 
-@interface NSException (setUserInfo)
+@interface NSException (NGImap4_setUserInfo)
 - (id)setUserInfo:(NSDictionary *)_info;
 @end
 

diff --git a/sope-mime/NGMail/ChangeLog b/sope-mime/NGMail/ChangeLog
index 90c6513aafccd348b23e02cd74385fa9d47e429e..2eed90412a4429a157e9273146fa14dd7fe93a69 100644 (file)
--- a/sope-mime/NGMail/ChangeLog
+++ b/sope-mime/NGMail/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * NGMail.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-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGMail.xcode: new Xcode project

diff --git a/sope-mime/NGMail/NGMail.xcode/project.pbxproj b/sope-mime/NGMail/NGMail.xcode/project.pbxproj
index 412d5821e14543f3fdc6588c67791ed4227b7e7a..f3fa463f7d1dcd5f1a8b3e98b1a3bfba00ebbe34 100644 (file)
--- a/sope-mime/NGMail/NGMail.xcode/project.pbxproj
+++ b/sope-mime/NGMail/NGMail.xcode/project.pbxproj
@@ -242,7 +242,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.174;
+                               DYLIB_CURRENT_VERSION = 4.3.180;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -259,7 +259,6 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               ADFE610206E255C5006628C4,
                        );
                        isa = PBXNativeTarget;
                        name = NGMail;
@@ -601,6 +600,7 @@
                        isa = PBXBuildFile;
                        settings = {
                                ATTRIBUTES = (
+                                       Public,
                                );
                        };
                };
@@ -638,18 +638,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               ADFE610106E255C5006628C4 = {
-                       containerPortal = ADFE5DE706E2557B006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADDF478006DA57DA00C4E7F8;
-                       remoteInfo = "Wrapper Contents";
-               };
-               ADFE610206E255C5006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "Wrapper Contents (from sope-core.xcode)";
-                       targetProxy = ADFE610106E255C5006628C4;
-               };
                ADFE614506E2577B006628C4 = {
                        fileEncoding = 5;
                        isa = PBXFileReference;

diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index 3b53c8e82d827a88b537ab516fd7bb95d6138d5f..2929220e35af876d465bf99a524bfac1221c4f59 100644 (file)
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,5 +1,10 @@
 2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * NGMime.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.
+
        * NGMime.xcode: fixes
 
 2004-08-31  Helge Hess  <helge.hess@skyrix.com>

diff --git a/sope-mime/NGMime/NGMime.xcode/project.pbxproj b/sope-mime/NGMime/NGMime.xcode/project.pbxproj
index 31f84b6eb4c94447801d125877a304786daeefbe..6ffd25fa7b65ff53a7b20e8b4ecb60a5fbb4d35e 100644 (file)
--- a/sope-mime/NGMime/NGMime.xcode/project.pbxproj
+++ b/sope-mime/NGMime/NGMime.xcode/project.pbxproj
@@ -454,7 +454,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.3.174;
+                               DYLIB_CURRENT_VERSION = 4.3.180;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -472,7 +472,6 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               ADFE5C6206E251F9006628C4,
                                ADFE627F06E25919006628C4,
                                ADFE63BA06E2613B006628C4,
                        );
@@ -1618,18 +1617,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               ADFE5C6106E251F9006628C4 = {
-                       containerPortal = ADFE5C5B06E251A1006628C4;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = ADDF478006DA57DA00C4E7F8;
-                       remoteInfo = "Wrapper Contents";
-               };
-               ADFE5C6206E251F9006628C4 = {
-                       isa = PBXTargetDependency;
-                       name = "Wrapper Contents (from sope-core.xcode)";
-                       targetProxy = ADFE5C6106E251F9006628C4;
-               };
                ADFE626D06E258C6006628C4 = {
                        isa = PBXFileReference;
                        lastKnownFileType = "wrapper.pb-project";

diff --git a/sope-mime/Version b/sope-mime/Version
index 5f2383a01262a2c2a6809409d40e757f59427219..33b6652ce48528350704364a57f3ae08183422bc 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,6 +2,6 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=3
-SUBMINOR_VERSION:=179
+SUBMINOR_VERSION:=180
 
 # v4.2.149 requires libNGStreams v4.2.34

diff --git a/sope-mime/sope-mime.xcode/project.pbxproj b/sope-mime/sope-mime.xcode/project.pbxproj
index de88563677fd3f655d11a680ac4918ef683ce6b6..3377174517eac0f0aae0e58d81e07a239755708a 100644 (file)
--- a/sope-mime/sope-mime.xcode/project.pbxproj
+++ b/sope-mime/sope-mime.xcode/project.pbxproj
@@ -35,6 +35,21 @@
                        remoteGlobalIDString = ADD65D5806DA372D007161CA;
                        remoteInfo = NGMime;
                };
+               AD8BF08A070063C300EC239A = {
+                       fileType = wrapper.framework;
+                       isa = PBXReferenceProxy;
+                       path = NGMail.framework;
+                       refType = 3;
+                       remoteRef = AD8BF093070063E100EC239A;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD8BF093070063E100EC239A = {
+                       containerPortal = ADFE63C606E2629E006628C4;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 2;
+                       remoteGlobalIDString = ADD65D5806DA372D007161CA;
+                       remoteInfo = NGMail;
+               };
                ADDF476606DA572500C4E7F8 = {
                        children = (
                                ADDF477606DA575700C4E7F8,
@@ -222,6 +237,9 @@
                        sourceTree = "<group>";
                };
                ADFE63C706E2629F006628C4 = {
+                       children = (
+                               AD8BF08A070063C300EC239A,
+                       );
                        isa = PBXGroup;
                        name = Products;
                        refType = 4;