From fa56d78ffeaf2a4b2640cd69a06b50d18a73b0ba Mon Sep 17 00:00:00 2001 From: helge Date: Fri, 20 Aug 2004 19:20:03 +0000 Subject: [PATCH] sope-mime cleanups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@11 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- .../NGExtensions/EODataSource+NGExtensions.h | 2 +- sope-mime/GNUmakefile | 21 ++++++++++++ sope-mime/GNUmakefile.preamble | 16 ++++++---- sope-mime/NGImap4/ChangeLog | 4 +++ sope-mime/NGImap4/GNUmakefile | 13 -------- sope-mime/NGImap4/GNUmakefile.preamble | 5 +++ sope-mime/NGImap4/NGImap4.h | 3 +- sope-mime/NGImap4/NGImap4FolderFlags.m | 5 ++- sope-mime/NGImap4/NGImap4FolderGlobalID.m | 23 +++++++++++-- sope-mime/NGImap4/NGImap4FolderMailRegistry.m | 2 +- sope-mime/NGImap4/NGImap4MessageGlobalID.m | 5 ++- sope-mime/NGImap4/NGImap4ResponseNormalizer.m | 3 +- sope-mime/NGImap4/NGImap4ServerGlobalID.m | 23 +++++++++++-- sope-mime/NGMail/ChangeLog | 4 +++ sope-mime/NGMail/GNUmakefile | 5 --- sope-mime/NGMail/GNUmakefile.preamble | 5 +++ sope-mime/NGMail/NGMimeMessageGenerator.m | 2 +- sope-mime/NGMail/NGPop3Client.h | 24 +++++++------- sope-mime/NGMime/ChangeLog | 3 ++ sope-mime/NGMime/GNUmakefile | 32 ++++++------------- sope-mime/NGMime/GNUmakefile.preamble | 10 ++++++ sope-mime/NGMime/Version | 5 --- sope-mime/Version | 7 ++++ 23 files changed, 141 insertions(+), 81 deletions(-) create mode 100644 sope-mime/GNUmakefile create mode 100644 sope-mime/NGImap4/GNUmakefile.preamble create mode 100644 sope-mime/NGMail/GNUmakefile.preamble create mode 100644 sope-mime/NGMime/GNUmakefile.preamble delete mode 100644 sope-mime/NGMime/Version create mode 100644 sope-mime/Version diff --git a/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h b/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h index ffe0f3d8..718b9af1 100644 --- a/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h +++ b/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h @@ -23,7 +23,7 @@ #ifndef __NGExtensions_EODataSource_NGExtensions_H__ #define __NGExtensions_EODataSource_NGExtensions_H__ -#import +#include #include @class EOFetchSpecification; diff --git a/sope-mime/GNUmakefile b/sope-mime/GNUmakefile new file mode 100644 index 00000000..8212ae59 --- /dev/null +++ b/sope-mime/GNUmakefile @@ -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 diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble index 9efd299a..59aef0dc 100644 --- a/sope-mime/GNUmakefile.preamble +++ b/sope-mime/GNUmakefile.preamble @@ -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 diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog index 1c29d8c0..fe572194 100644 --- a/sope-mime/NGImap4/ChangeLog +++ b/sope-mime/NGImap4/ChangeLog @@ -1,3 +1,7 @@ +2004-08-20 Helge Hess + + * fixed for SOPE 3.3 structure (v4.3.173) + 2004-07-15 Helge Hess * v4.2.169 diff --git a/sope-mime/NGImap4/GNUmakefile b/sope-mime/NGImap4/GNUmakefile index 2506b3e0..e628ab98 100644 --- a/sope-mime/NGImap4/GNUmakefile +++ b/sope-mime/NGImap4/GNUmakefile @@ -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 index 00000000..1c1a2c07 --- /dev/null +++ b/sope-mime/NGImap4/GNUmakefile.preamble @@ -0,0 +1,5 @@ +NGImap4_INCLUDE_DIRS += \ + -I.. -I../.. \ + -I../../sope-core/NGStreams/ \ + -I../../sope-core/NGExtensions/ \ + -I../../sope-core/ diff --git a/sope-mime/NGImap4/NGImap4.h b/sope-mime/NGImap4/NGImap4.h index b9d37453..9846b7bb 100644 --- a/sope-mime/NGImap4/NGImap4.h +++ b/sope-mime/NGImap4/NGImap4.h @@ -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__ diff --git a/sope-mime/NGImap4/NGImap4FolderFlags.m b/sope-mime/NGImap4/NGImap4FolderFlags.m index f3ce1e64..646174ad 100644 --- a/sope-mime/NGImap4/NGImap4FolderFlags.m +++ b/sope-mime/NGImap4/NGImap4FolderFlags.m @@ -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,10 +18,9 @@ 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 diff --git a/sope-mime/NGImap4/NGImap4FolderGlobalID.m b/sope-mime/NGImap4/NGImap4FolderGlobalID.m index 701abed1..93fe47c1 100644 --- a/sope-mime/NGImap4/NGImap4FolderGlobalID.m +++ b/sope-mime/NGImap4/NGImap4FolderGlobalID.m @@ -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 diff --git a/sope-mime/NGImap4/NGImap4FolderMailRegistry.m b/sope-mime/NGImap4/NGImap4FolderMailRegistry.m index c3d29f5f..caa27ff9 100644 --- a/sope-mime/NGImap4/NGImap4FolderMailRegistry.m +++ b/sope-mime/NGImap4/NGImap4FolderMailRegistry.m @@ -22,7 +22,7 @@ #include "NGImap4FolderMailRegistry.h" #include "NGImap4Message.h" -#include "common.h" +#include "imCommon.h" @interface NGImap4Message(UsedPrivates) - (NSString *)_addFlagNotificationName; diff --git a/sope-mime/NGImap4/NGImap4MessageGlobalID.m b/sope-mime/NGImap4/NGImap4MessageGlobalID.m index bbd862a7..78f6229a 100644 --- a/sope-mime/NGImap4/NGImap4MessageGlobalID.m +++ b/sope-mime/NGImap4/NGImap4MessageGlobalID.m @@ -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,10 +18,9 @@ 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 diff --git a/sope-mime/NGImap4/NGImap4ResponseNormalizer.m b/sope-mime/NGImap4/NGImap4ResponseNormalizer.m index 1176a0d5..4c5cb88a 100644 --- a/sope-mime/NGImap4/NGImap4ResponseNormalizer.m +++ b/sope-mime/NGImap4/NGImap4ResponseNormalizer.m @@ -18,11 +18,10 @@ 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; diff --git a/sope-mime/NGImap4/NGImap4ServerGlobalID.m b/sope-mime/NGImap4/NGImap4ServerGlobalID.m index 974ce1bb..193cb1fd 100644 --- a/sope-mime/NGImap4/NGImap4ServerGlobalID.m +++ b/sope-mime/NGImap4/NGImap4ServerGlobalID.m @@ -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 diff --git a/sope-mime/NGMail/ChangeLog b/sope-mime/NGMail/ChangeLog index 970022f8..a335ff5c 100644 --- a/sope-mime/NGMail/ChangeLog +++ b/sope-mime/NGMail/ChangeLog @@ -1,3 +1,7 @@ +2004-08-20 Helge Hess + + * fixed for SOPE 3.3 structure (v4.3.173) + 2004-07-22 Helge Hess * NGMBoxReader.m: fixed a gcc 3.4 warning (v4.2.170) diff --git a/sope-mime/NGMail/GNUmakefile b/sope-mime/NGMail/GNUmakefile index 40aaf7c8..ed54a602 100644 --- a/sope-mime/NGMail/GNUmakefile +++ b/sope-mime/NGMail/GNUmakefile @@ -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 index 00000000..b139c43a --- /dev/null +++ b/sope-mime/NGMail/GNUmakefile.preamble @@ -0,0 +1,5 @@ +NGMail_INCLUDE_DIRS += \ + -I.. -I../.. \ + -I../../sope-core/NGStreams/ \ + -I../../sope-core/NGExtensions/ \ + -I../../sope-core/ diff --git a/sope-mime/NGMail/NGMimeMessageGenerator.m b/sope-mime/NGMail/NGMimeMessageGenerator.m index 6e4dcc2c..4f4928aa 100644 --- a/sope-mime/NGMail/NGMimeMessageGenerator.m +++ b/sope-mime/NGMail/NGMimeMessageGenerator.m @@ -22,7 +22,7 @@ #include "NGMimeMessageGenerator.h" #include "NGMimeMessage.h" -#include "NGMimeFileData.h" +#include #include "common.h" /* Defaults diff --git a/sope-mime/NGMail/NGPop3Client.h b/sope-mime/NGMail/NGPop3Client.h index eb44ab78..0c883c0a 100644 --- a/sope-mime/NGMail/NGPop3Client.h +++ b/sope-mime/NGMail/NGPop3Client.h @@ -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 -#import -#import +#include +#include @class NSString, NSData; @class NGBufferedStream; @@ -55,7 +55,7 @@ typedef enum { + (id)pop3Client; - (id)initWithSocket:(id)_socket; // designated initializer -// accessors +/* accessors */ - (id)socket; - (NGPop3State)state; @@ -64,24 +64,24 @@ typedef enum { - (void)setDebuggingEnabled:(BOOL)_flag; - (BOOL)isDebuggingEnabled; -// connection +/* connection */ - (BOOL)connectToHost:(id)_host; - (BOOL)connectToAddress:(id)_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; diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog index db06b088..30c09920 100644 --- a/sope-mime/NGMime/ChangeLog +++ b/sope-mime/NGMime/ChangeLog @@ -1,5 +1,8 @@ 2004-08-20 Helge Hess + * 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) diff --git a/sope-mime/NGMime/GNUmakefile b/sope-mime/NGMime/GNUmakefile index 523290d2..7e790429 100644 --- a/sope-mime/NGMime/GNUmakefile +++ b/sope-mime/NGMime/GNUmakefile @@ -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 index 00000000..6baeed73 --- /dev/null +++ b/sope-mime/NGMime/GNUmakefile.preamble @@ -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 index 6a7ae504..00000000 --- a/sope-mime/NGMime/Version +++ /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 index 00000000..5c078793 --- /dev/null +++ b/sope-mime/Version @@ -0,0 +1,7 @@ +# $Id$ + +MAJOR_VERSION=4 +MINOR_VERSION=3 +SUBMINOR_VERSION:=173 + +# v4.2.149 requires libNGStreams v4.2.34 -- 2.39.5