]> err.no Git - sope/commitdiff
sope-mime cleanups
authorhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Fri, 20 Aug 2004 19:20:03 +0000 (19:20 +0000)
committerhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Fri, 20 Aug 2004 19:20:03 +0000 (19:20 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@11 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

23 files changed:
sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h
sope-mime/GNUmakefile [new file with mode: 0644]
sope-mime/GNUmakefile.preamble
sope-mime/NGImap4/ChangeLog
sope-mime/NGImap4/GNUmakefile
sope-mime/NGImap4/GNUmakefile.preamble [new file with mode: 0644]
sope-mime/NGImap4/NGImap4.h
sope-mime/NGImap4/NGImap4FolderFlags.m
sope-mime/NGImap4/NGImap4FolderGlobalID.m
sope-mime/NGImap4/NGImap4FolderMailRegistry.m
sope-mime/NGImap4/NGImap4MessageGlobalID.m
sope-mime/NGImap4/NGImap4ResponseNormalizer.m
sope-mime/NGImap4/NGImap4ServerGlobalID.m
sope-mime/NGMail/ChangeLog
sope-mime/NGMail/GNUmakefile
sope-mime/NGMail/GNUmakefile.preamble [new file with mode: 0644]
sope-mime/NGMail/NGMimeMessageGenerator.m
sope-mime/NGMail/NGPop3Client.h
sope-mime/NGMime/ChangeLog
sope-mime/NGMime/GNUmakefile
sope-mime/NGMime/GNUmakefile.preamble [new file with mode: 0644]
sope-mime/NGMime/Version [deleted file]
sope-mime/Version [new file with mode: 0644]

index ffe0f3d8eb909d4092ddde2b26fb19dbb8bde4a6..718b9af1e7700ca9ea44e0cf9e565df259132c5a 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef __NGExtensions_EODataSource_NGExtensions_H__
 #define __NGExtensions_EODataSource_NGExtensions_H__
 
-#import <EOControl/EODataSource.h>
+#include <EOControl/EODataSource.h>
 #include <NGExtensions/NGExtensionsDecls.h>
 
 @class EOFetchSpecification;
diff --git a/sope-mime/GNUmakefile b/sope-mime/GNUmakefile
new file mode 100644 (file)
index 0000000..8212ae5
--- /dev/null
@@ -0,0 +1,21 @@
+# $Id$
+
+include $(GNUSTEP_MAKEFILES)/common.make
+
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+
+LIBRARY_NAME = libNGMime
+
+libNGMime_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libNGMime_HEADER_FILES_DIR         = .
+libNGMime_HEADER_FILES_INSTALL_DIR = /NGMime
+
+libNGMime_SUBPROJECTS = NGMime NGMail NGImap4
+
+ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
+                      -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
+                      -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
+
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/library.make
+-include GNUmakefile.postamble
index 9efd299afa097160f3988d4eae1475d2eb5e0037..59aef0dccfcf4d074d4402deb0c59941359b5301 100644 (file)
@@ -7,11 +7,13 @@ libNGMime_LIBRARIES_DEPEND_UPON += \
        -lDOM -lSaxObjC
 
 libNGMime_INCLUDE_DIRS += \
-       -I.. -I../NGStreams -I../NGExtensions
+       -I..    \
+       -I../sope-core/NGStreams/       \
+       -I../sope-core/NGExtensions/
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml
+RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../sope-core
+RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../sope-xml
 
 libNGMime_LIB_DIRS += \
        -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
@@ -21,9 +23,11 @@ libNGMime_LIB_DIRS += \
        -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
 libNGMime_LIB_DIRS += \
-       -L../NGStreams/$(GNUSTEP_OBJ_DIR)       \
-       -L../NGExtensions/$(GNUSTEP_OBJ_DIR)    \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR)
+       -L../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)     \
+       -L../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)  \
+       -L../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)     \
+       -L../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)            \
+       -L../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
 
index 1c29d8c0e5551a788363038521494ba0f356a363..fe572194d92d8f6b0f852ade4bdb975ea34d0083 100644 (file)
@@ -1,3 +1,7 @@
+2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * fixed for SOPE 3.3 structure (v4.3.173)
+
 2004-07-15  Helge Hess  <helge.hess@skyrix.com>
 
        * v4.2.169
index 2506b3e047599fcf009c2b152777d6310246a24b..e628ab98577db65b54247d28f709e44037f13faf 100644 (file)
@@ -1,5 +1,3 @@
-# $Id$
-
 include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECT_NAME = NGImap4
@@ -44,17 +42,6 @@ NGImap4_OBJC_FILES = \
        NGImap4FolderFlags.m            \
        NGImap4ResponseNormalizer.m     \
 
-#TOOL_NAME = imap_tool
-
-#imap_tool_OBJC_FILES = imap_tool.m #$(NGImap4_OBJC_FILES)
-ADDITIONAL_TOOL_LIBS += -lNGMime
-
-NGImap4_INCLUDE_DIRS += \
-       -I.. -I../..            \
-       -I../../NGStreams/      \
-       -I../../NGExtensions/
-
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/subproject.make
-include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
diff --git a/sope-mime/NGImap4/GNUmakefile.preamble b/sope-mime/NGImap4/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..1c1a2c0
--- /dev/null
@@ -0,0 +1,5 @@
+NGImap4_INCLUDE_DIRS += \
+       -I.. -I../..                    \
+       -I../../sope-core/NGStreams/    \
+       -I../../sope-core/NGExtensions/ \
+       -I../../sope-core/
index b9d374532fc22b47530bfe93272fcb7ed5750c1e..9846b7bb04d6c1606780cfc3dd6a7f450499a928 100644 (file)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo 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
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGImap4_NGImap4_H__
 #define __NGImap4_NGImap4_H__
index f3ce1e64754b301eb8c9d11450d60889cc6f4f31..646174ad17b5149aa97370d6df44c63b5124c62b 100644 (file)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo 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, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "NGImap4FolderFlags.h"
-#include "common.h"
+#include "imCommon.h"
 
 @implementation NGImap4FolderFlags
 
index 701abed1d73ddf9c9a7bd34c3570ea6c647f6e47..93fe47c1ba1f61aaec60ce0aacdb6dfaa686ee46 100644 (file)
@@ -1,7 +1,26 @@
-// $Id$
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo 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.
+
+  OGo 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 OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #include "NGImap4FolderGlobalID.h"
-#include "common.h"
+#include "imCommon.h"
 
 @implementation NGImap4FolderGlobalID
 
index c3d29f5fb4eb6846d503c681c1323796ae4113fc..caa27ff9d5bb9b1c2931f02e0275ff48572e5846 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "NGImap4FolderMailRegistry.h"
 #include "NGImap4Message.h"
-#include "common.h"
+#include "imCommon.h"
 
 @interface NGImap4Message(UsedPrivates)
 - (NSString *)_addFlagNotificationName;
index bbd862a79f09578a309b2eea0155339237930d3e..78f6229a8b9e47fffd8a0bb2fe4035a1cec14e6c 100644 (file)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo 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, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "NGImap4MessageGlobalID.h"
-#include "common.h"
+#include "imCommon.h"
 
 @implementation NGImap4MessageGlobalID
 
index 1176a0d5a7341d8df50474cf087f417bff88636e..4c5cb88a1a66dd48bd241bf3ac98865769362a3a 100644 (file)
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "NGImap4ResponseNormalizer.h"
 #include "NGImap4Client.h"
-#include "common.h"
+#include "imCommon.h"
 
 @interface NGImap4Client(UsedPrivates)
 - (NSString *)delimiter;
index 974ce1bb79fb5830f8c131843ccfa096445ecb56..193cb1fd3bc34f4631550813e73f823a9c4f0cc1 100644 (file)
@@ -1,7 +1,26 @@
-// $Id$
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo 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.
+
+  OGo 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 OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #include "NGImap4ServerGlobalID.h"
-#include "common.h"
+#include "imCommon.h"
 
 @implementation NGImap4ServerGlobalID
 
index 970022f8a3b0b52179b885aa5dd7a52b8f834559..a335ff5c5e9e8f62538eb177140475fb8529c94b 100644 (file)
@@ -1,3 +1,7 @@
+2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * fixed for SOPE 3.3 structure (v4.3.173)
+
 2004-07-22  Helge Hess  <helge.hess@skyrix.com>
 
        * NGMBoxReader.m: fixed a gcc 3.4 warning (v4.2.170)
index 40aaf7c8c46deb4d6c837824fd77bab4a85a8860..ed54a602a3a5612708b66a70f09990827485e128 100644 (file)
@@ -43,11 +43,6 @@ NGMail_OBJC_FILES = \
        NGMimeMessageRfc822BodyGenerator.m      \
        NGMimeMessageTextBodyGenerator.m        \
 
-NGMail_INCLUDE_DIRS += \
-       -I.. -I../..            \
-       -I../../NGStreams/      \
-       -I../../NGExtensions/
-
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/subproject.make
 -include GNUmakefile.postamble
diff --git a/sope-mime/NGMail/GNUmakefile.preamble b/sope-mime/NGMail/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..b139c43
--- /dev/null
@@ -0,0 +1,5 @@
+NGMail_INCLUDE_DIRS += \
+       -I.. -I../..                    \
+       -I../../sope-core/NGStreams/    \
+       -I../../sope-core/NGExtensions/ \
+       -I../../sope-core/
index 6e4dcc2c32f6f4710a6c0120384419b53c61bd7f..4f4928aa1afa3aec2c1ca37b8a62bf70058fe2a2 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "NGMimeMessageGenerator.h"
 #include "NGMimeMessage.h"
-#include "NGMimeFileData.h"
+#include <NGMime/NGMimeFileData.h>
 #include "common.h"
 
 /* Defaults
index eb44ab788e7a05c3e979c06ed53416d204a54e6a..0c883c0aacf77a06fc1672b19572637bf82a0af3 100644 (file)
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo 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
@@ -24,8 +24,8 @@
 #define __NGMail_NGPop3Client_H__
 
 #import <Foundation/NSObject.h>
-#import <NGStreams/NGStreams.h>
-#import <NGStreams/NGSocketProtocols.h>
+#include <NGStreams/NGStreams.h>
+#include <NGStreams/NGSocketProtocols.h>
 
 @class NSString, NSData;
 @class NGBufferedStream;
@@ -55,7 +55,7 @@ typedef enum {
 + (id)pop3Client;
 - (id)initWithSocket:(id<NGActiveSocket>)_socket; // designated initializer
 
-// accessors
+/* accessors */
 
 - (id<NGActiveSocket>)socket;
 - (NGPop3State)state;
@@ -64,24 +64,24 @@ typedef enum {
 - (void)setDebuggingEnabled:(BOOL)_flag;
 - (BOOL)isDebuggingEnabled;
 
-// connection
+/* connection */
 
 - (BOOL)connectToHost:(id)_host;
 - (BOOL)connectToAddress:(id<NGSocketAddress>)_address;
 - (void)disconnect;
 
-// state
+/* state */
 
 - (void)requireState:(NGPop3State)_state;
 - (void)gotoState:(NGPop3State)_state;
 
-// commands
+/* commands */
 
 - (NGPop3Response *)sendCommand:(NSString *)_command;
 - (NGPop3Response *)sendCommand:(NSString *)_command argument:(NSString *)arg;
-- (NGPop3Response *)sendCommand:(NSString *)_command intArgument:(int)_argument;
+- (NGPop3Response *)sendCommand:(NSString *)_command intArgument:(int)_arg;
 
-// service commands
+/* service commands */
 
 - (BOOL)login:(NSString *)_user password:(NSString *)_passwd;
 - (BOOL)quit;
@@ -94,13 +94,13 @@ typedef enum {
 - (BOOL)noop;
 - (BOOL)reset;
 
-// optional service commands
+/* optional service commands */
 
 - (NSData *)retrieveMessage:(int)_msgNumber bodyLineCount:(int)_numberOfLines;
 - (NSDictionary *)uniqueIdMappings;
 - (NSString *)uniqueIdOfMessage:(int)_msgNumber;
 
-// MIME support
+/* MIME support */
 
 - (NSEnumerator *)messageEnumerator;
 - (NGMimeMessage *)messageWithNumber:(int)_messageNumber;
index db06b08860ff1e2be40df04db9e37abe3f50c6ef..30c09920a736b9f35bbdc7c1f85d2cf2bfc6f2d4 100644 (file)
@@ -1,5 +1,8 @@
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * now is a subproject of the sope-mime library just like NGImap4 and
+         NGMail (v4.3.173)
+
        * moved to sope-mime
 
        * moved to SOPE 4.3 (v4.3.172)
index 523290d2da06a2aeb592b56f32d4ca6c8edff2da..7e790429292765d3a6346c8c4914b384e84356aa 100644 (file)
@@ -1,17 +1,13 @@
-# $Id$
+# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $
 
-include ../common.make
+include $(GNUSTEP_MAKEFILES)/common.make
 
-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+SUBPROJECT_NAME = NGMime
 
-LIBRARY_NAME = libNGMime
+NGMime_HEADER_FILES_DIR         = .
+NGMime_HEADER_FILES_INSTALL_DIR = /NGMime
 
-libNGMime_DLL_DEF                  = libNGMime.def
-libNGMime_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libNGMime_HEADER_FILES_DIR         = .
-libNGMime_HEADER_FILES_INSTALL_DIR = /NGMime
-
-libNGMime_HEADER_FILES = \
+NGMime_HEADER_FILES = \
        NGMimeDecls.h                   \
        NGMime.h                        \
        \
@@ -34,7 +30,7 @@ libNGMime_HEADER_FILES = \
        NGMimeFileData.h                \
        NGMimeJoinedData.h              \
 
-libNGMime_OBJC_FILES = \
+NGMime_OBJC_FILES = \
        NGMime.m                        \
        \
        NGConcreteMimeType.m            \
@@ -72,17 +68,7 @@ libNGMime_OBJC_FILES = \
        NGMimeRFC822DateHeaderFieldGenerator.m          \
        NGMimeStringHeaderFieldGenerator.m              \
 
-libNGMime_SUBPROJECTS = NGMail NGImap4
-
-ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
-                      -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-                      -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
-
-autodoc :
-       autodoc $(AUTODOC_FLAGS) -dest ../Documentation/NGMime/ -proj .
-       autodoc $(AUTODOC_FLAGS) -dest ../Documentation/NGMail/ -proj ./NGMail/
-       autodoc $(AUTODOC_FLAGS) -dest ../Documentation/NGImap4/ -proj ./NGImap4/
-
 -include GNUmakefile.preamble
-include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/subproject.make
+include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
diff --git a/sope-mime/NGMime/GNUmakefile.preamble b/sope-mime/NGMime/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..6baeed7
--- /dev/null
@@ -0,0 +1,10 @@
+NGMime_INCLUDE_DIRS += \
+       -I.. -I../..                    \
+       -I../../sope-core/NGStreams/    \
+       -I../../sope-core/NGExtensions/ \
+       -I../../sope-core
+
+ADDITIONAL_CPPFLAGS += \
+       -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
+       -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
+       -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION}
diff --git a/sope-mime/NGMime/Version b/sope-mime/NGMime/Version
deleted file mode 100644 (file)
index 6a7ae50..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-SUBMINOR_VERSION:=172
-
-# v4.2.149 requires libNGStreams v4.2.34
diff --git a/sope-mime/Version b/sope-mime/Version
new file mode 100644 (file)
index 0000000..5c07879
--- /dev/null
@@ -0,0 +1,7 @@
+# $Id$
+
+MAJOR_VERSION=4
+MINOR_VERSION=3
+SUBMINOR_VERSION:=173
+
+# v4.2.149 requires libNGStreams v4.2.34