Fixed 171: Updated CMakefile to latest changes

6 files changed, 212 insertions, 260 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d314aea..d90246c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ ELSE()
 ENDIF()
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(public-headers)
 include(core)
 include(async)
 include(objc)
@@ -93,10 +94,7 @@ SET_SOURCE_FILES_PROPERTIES(
 )
 
 file(COPY
-  MailCore.h
-  ${public_headers_objc}
-  ${public_headers_core}
-  ${public_headers_async}
+  ${public_headers}
 
   DESTINATION
   ${CMAKE_CURRENT_BINARY_DIR}/include/MailCore
diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake
index 239d3cce..8b4857ea 100644
--- a/src/cmake/async.cmake
+++ b/src/cmake/async.cmake
@@ -1,48 +1,3 @@
-# public headers
-
-set(public_headers_async_imap
-  async/imap/MCAsyncIMAP.h
-  async/imap/MCIMAPAppendMessageOperation.h
-  async/imap/MCIMAPAsyncSession.h
-  async/imap/MCIMAPCapabilityOperation.h
-  async/imap/MCIMAPCopyMessagesOperation.h
-  async/imap/MCIMAPFetchContentOperation.h
-  async/imap/MCIMAPFetchFoldersOperation.h
-  async/imap/MCIMAPFetchMessagesOperation.h
-  async/imap/MCIMAPFetchNamespaceOperation.h
-  async/imap/MCIMAPFolderInfoOperation.h
-  async/imap/MCIMAPFolderStatusOperation.h
-  async/imap/MCIMAPIdentityOperation.h
-  async/imap/MCIMAPIdleOperation.h
-  async/imap/MCIMAPOperation.h
-  async/imap/MCIMAPOperationCallback.h
-  async/imap/MCIMAPSearchOperation.h
-)
-
-set(public_headers_async_pop
-  async/pop/MCAsyncPOP.h
-  async/pop/MCPOPAsyncSession.h
-  async/pop/MCPOPFetchHeaderOperation.h
-  async/pop/MCPOPFetchMessageOperation.h
-  async/pop/MCPOPFetchMessagesOperation.h
-  async/pop/MCPOPOperation.h
-  async/pop/MCPOPOperationCallback.h
-)
-
-set(public_headers_async_smtp
-  async/smtp/MCAsyncSMTP.h
-  async/smtp/MCSMTPAsyncSession.h
-  async/smtp/MCSMTPOperation.h
-  async/smtp/MCSMTPOperationCallback.h
-)
-
-set(public_headers_async
-  async/MCAsync.h
-  ${public_headers_async_pop}
-  ${public_headers_async_smtp}
-  ${public_headers_async_imap}
-)
-
 # Files to build
 
 set(async_imap_files
@@ -54,14 +9,17 @@ set(async_imap_files
   async/imap/MCIMAPCopyMessagesOperation.cc
   async/imap/MCIMAPCreateFolderOperation.cc
   async/imap/MCIMAPDeleteFolderOperation.cc
+  async/imap/MCIMAPDisconnectOperation.cc
   async/imap/MCIMAPExpungeOperation.cc
   async/imap/MCIMAPFetchContentOperation.cc
   async/imap/MCIMAPFetchFoldersOperation.cc
   async/imap/MCIMAPFetchMessagesOperation.cc
   async/imap/MCIMAPFetchNamespaceOperation.cc
   async/imap/MCIMAPFolderInfoOperation.cc
+  async/imap/MCIMAPFolderStatusOperation.cc
   async/imap/MCIMAPIdentityOperation.cc
   async/imap/MCIMAPIdleOperation.cc
+  async/imap/MCIMAPMessageRenderingOperation.cc
   async/imap/MCIMAPOperation.cc
   async/imap/MCIMAPRenameFolderOperation.cc
   async/imap/MCIMAPSearchOperation.cc
@@ -83,6 +41,7 @@ set(async_pop_files
 set(async_smtp_files
   async/smtp/MCSMTPAsyncSession.cc
   async/smtp/MCSMTPCheckAccountOperation.cc
+  async/smtp/MCSMTPDisconnectOperation.cc
   async/smtp/MCSMTPOperation.cc
   async/smtp/MCSMTPSendWithDataOperation.cc
 )
diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake
index 24de3963..1322318c 100644
--- a/src/cmake/core.cmake
+++ b/src/cmake/core.cmake
@@ -1,110 +1,3 @@
-# public headers
-
-set(public_headers_abstract
-  core/abstract/MCAbstract.h
-  core/abstract/MCAbstractMessage.h
-  core/abstract/MCAbstractMessagePart.h
-  core/abstract/MCAbstractMultipart.h
-  core/abstract/MCAbstractPart.h
-  core/abstract/MCAddress.h
-  core/abstract/MCMessageConstants.h
-  core/abstract/MCMessageHeader.h
-)
-
-set(public_headers_basetypes
-  core/basetypes/MCArray.h
-  core/basetypes/MCAssert.h
-  core/basetypes/MCAutoreleasePool.h
-  core/basetypes/MCBaseTypes.h
-  core/basetypes/MCData.h
-  core/basetypes/MCHash.h
-  core/basetypes/MCHashMap.h
-  core/basetypes/MCHTMLCleaner.h
-  core/basetypes/MCIndexSet.h
-  core/basetypes/MCIterator.h
-  core/basetypes/MCICUTypes.h
-  core/basetypes/MCJSON.h
-  core/basetypes/MCLibetpanTypes.h
-  core/basetypes/MCLog.h
-  core/basetypes/MCMainThread.h
-  core/basetypes/MCMD5.h
-  core/basetypes/MCNull.h
-  core/basetypes/MCObject.h
-  core/basetypes/MCOperation.h
-  core/basetypes/MCOperationCallback.h
-  core/basetypes/MCOperationQueue.h
-  core/basetypes/MCRange.h
-  core/basetypes/MCSet.h
-  core/basetypes/MCString.h
-  core/basetypes/MCUtils.h
-  core/basetypes/MCValue.h
-)
-
-set(public_headers_imap
-  core/imap/MCIMAP.h
-  core/imap/MCIMAPFolder.h
-  core/imap/MCIMAPFolderStatus.h
-  core/imap/MCIMAPMessage.h
-  core/imap/MCIMAPMessagePart.h
-  core/imap/MCIMAPMultipart.h
-  core/imap/MCIMAPNamespace.h
-  core/imap/MCIMAPNamespaceItem.h
-  core/imap/MCIMAPPart.h
-  core/imap/MCIMAPProgressCallback.h
-  core/imap/MCIMAPSearchExpression.h
-  core/imap/MCIMAPSession.h
-  core/imap/MCIMAPSyncResult.h
-)
-
-set(public_headers_pop
-  core/pop/MCPOP.h
-  core/pop/MCPOPMessageInfo.h
-  core/pop/MCPOPProgressCallback.h
-  core/pop/MCPOPSession.h
-)
-
-set(public_headers_provider
-  core/provider/MCMailProvider.h
-  core/provider/MCMailProvidersManager.h
-  core/provider/MCNetService.h
-  core/provider/MCProvider.h
-)
-
-set(public_headers_renderer
-  core/renderer/MCAddressDisplay.h
-  core/renderer/MCDateFormatter.h
-  core/renderer/MCHTMLRendererCallback.h
-  core/renderer/MCRenderer.h
-  core/renderer/MCSizeFormatter.h
-)
-
-set(public_headers_rfc822
-  core/rfc822/MCAttachment.h
-  core/rfc822/MCMessageBuilder.h
-  core/rfc822/MCMessageParser.h
-  core/rfc822/MCMessagePart.h
-  core/rfc822/MCMultipart.h
-  core/rfc822/MCRFC822.h
-)
-
-set(public_headers_smtp
-  core/smtp/MCSMTP.h
-  core/smtp/MCSMTPProgressCallback.h
-  core/smtp/MCSMTPSession.h
-)
-
-set(public_headers_core
-  core/MCCore.h
-  ${public_headers_basetypes}
-  ${public_headers_renderer}
-  ${public_headers_imap}
-  ${public_headers_pop}
-  ${public_headers_smtp}
-  ${public_headers_abstract}
-  ${public_headers_rfc822}
-  ${public_headers_provider}
-)
-
 # Files to build
 
 set(abstract_files
@@ -126,8 +19,9 @@ ENDIF()
 
 set(basetypes_files
   core/basetypes/MCArray.cc
-  core/basetypes/MCAssert.cc
+  core/basetypes/MCAssert.c
   core/basetypes/MCAutoreleasePool.cc
+  core/basetypes/MCConnectionLoggerUtils.cc
   core/basetypes/MCData.cc
   core/basetypes/MCHash.cc
   core/basetypes/MCHashMap.cc
@@ -135,7 +29,8 @@ set(basetypes_files
   core/basetypes/MCIndexSet.cc
   core/basetypes/MCJSON.cc
   core/basetypes/MCJSONParser.cc
-  core/basetypes/MCLog.cc
+  core/basetypes/MCLibetpan.cc
+  core/basetypes/MCLog.c
   core/basetypes/MCMD5.cc
   core/basetypes/MCNull.cc
   core/basetypes/MCObject.cc
@@ -176,9 +71,12 @@ set(provider_files
 set(renderer_files
   core/renderer/MCAddressDisplay.cc
   core/renderer/MCDateFormatter.cc
+  core/renderer/MCHTMLBodyRendererTemplateCallback.cc
   core/renderer/MCHTMLRenderer.cc
   core/renderer/MCHTMLRendererCallback.cc
+  core/renderer/MCHTMLRendererIMAPDataCallback.cc
   core/renderer/MCSizeFormatter.cc
+  
 )
 
 set(rfc822_files
diff --git a/src/cmake/gen-public-headers.sh b/src/cmake/gen-public-headers.sh
new file mode 100755
index 00000000..1cb591d6
--- /dev/null
+++ b/src/cmake/gen-public-headers.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+files=""
+
+list_headers()
+{
+  local filename="$1"
+  
+  if echo $files | grep "\[$filename\]" >/dev/null ; then
+    return
+  fi
+  
+  local path="`find . -name $filename`"
+  echo $path | sed 's/^.\///'
+  files="$files[$filename]"
+  subfilenames="`grep '#include <MailCore/' "$path" | sed 's/^#include <MailCore\/\(.*\)>$/\1/'`"
+  subfilenames+=" "
+  subfilenames+="`grep '#import <MailCore/' "$path" | sed 's/^#import <MailCore\/\(.*\)>$/\1/'`"
+  for include_dir in $subfilenames ; do
+    list_headers $include_dir
+  done
+}
+
+cd ..
+echo 'set(public_headers'
+list_headers MailCore.h
+echo ')'
diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake
index 72975a1f..57a8c317 100644
--- a/src/cmake/objc.cmake
+++ b/src/cmake/objc.cmake
@@ -1,105 +1,3 @@
-set(public_headers_objc_abstract
-  objc/abstract/MCOAbstract.h
-  objc/abstract/MCOAbstractMessage.h
-  objc/abstract/MCOAbstractMessagePart.h
-  objc/abstract/MCOAbstractMultipart.h
-  objc/abstract/MCOAbstractPart.h
-  objc/abstract/MCOAddress.h
-  objc/abstract/MCOConstants.h
-  objc/abstract/MCOHTMLRendererDelegate.h
-  objc/abstract/MCOHTMLRendererIMAPDelegate.h
-  objc/abstract/MCOMessageHeader.h
-)
-
-set(public_headers_objc_imap
-  objc/imap/MCOIMAP.h
-  objc/imap/MCOIMAPAppendMessageOperation.h
-  objc/imap/MCOIMAPBaseOperation.h
-  objc/imap/MCOIMAPCapabilityOperation.h
-  objc/imap/MCOIMAPCopyMessagesOperation.h
-  objc/imap/MCOIMAPFetchContentOperation.h
-  objc/imap/MCOIMAPFetchFoldersOperation.h
-  objc/imap/MCOIMAPFetchMessagesOperation.h
-  objc/imap/MCOIMAPFetchNamespaceOperation.h
-  objc/imap/MCOIMAPFolder.h
-  objc/imap/MCOIMAPFolderInfo.h
-  objc/imap/MCOIMAPFolderInfoOperation.h
-  objc/imap/MCOIMAPFolderStatus.h
-  objc/imap/MCOIMAPFolderStatusOperation.h
-  objc/imap/MCOIMAPIdentityOperation.h
-  objc/imap/MCOIMAPIdleOperation.h
-  objc/imap/MCOIMAPMessage.h
-  objc/imap/MCOIMAPMessagePart.h
-  objc/imap/MCOIMAPMultipart.h
-  objc/imap/MCOIMAPNamespace.h
-  objc/imap/MCOIMAPNamespaceItem.h
-  objc/imap/MCOIMAPOperation.h
-  objc/imap/MCOIMAPPart.h
-  objc/imap/MCOIMAPSearchExpression.h
-  objc/imap/MCOIMAPSearchOperation.h
-  objc/imap/MCOIMAPSession.h
-)
-
-set(public_headers_objc_pop
-  objc/pop/MCOPOP.h
-  objc/pop/MCOPOPFetchHeaderOperation.h
-  objc/pop/MCOPOPFetchMessageOperation.h
-  objc/pop/MCOPOPFetchMessagesOperation.h
-  objc/pop/MCOPOPMessageInfo.h
-  objc/pop/MCOPOPOperation.h
-  objc/pop/MCOPOPSession.h
-)
-
-set(public_headers_objc_provider
-  objc/provider/MCOProvider.h
-  objc/provider/MCOMailProvider.h
-  objc/provider/MCOMailProvidersManager.h
-  objc/provider/MCONetService.h
-)
-
-set(public_headers_objc_rfc822
-  objc/rfc822/MCOAttachment.h
-  objc/rfc822/MCOMessageBuilder.h
-  objc/rfc822/MCOMessageParser.h
-  objc/rfc822/MCOMessagePart.h
-  objc/rfc822/MCOMultipart.h
-  objc/rfc822/MCORFC822.h
-)
-
-set(public_headers_objc_smtp
-  objc/smtp/MCOSMTP.h
-  objc/smtp/MCOSMTPOperation.h
-  objc/smtp/MCOSMTPSendOperation.h
-  objc/smtp/MCOSMTPSession.h
-)
-
-set(public_headers_objc_utils
-  objc/utils/MCOIndexSet.h
-  objc/utils/MCOObjectWrapper.h
-  objc/utils/MCOOperation.h
-  objc/utils/MCORange.h
-  objc/utils/MCOUtils.h
-  objc/utils/NSArray+MCO.h
-  objc/utils/NSData+MCO.h
-  objc/utils/NSDictionary+MCO.h
-  objc/utils/NSError+MCO.h
-  objc/utils/NSObject+MCO.h
-  objc/utils/NSString+MCO.h
-  objc/utils/NSValue+MCO.h
-)
-
-IF(APPLE)
-set(public_headers_objc
-  objc/MCObjC.h
-  ${public_headers_objc_abstract}
-  ${public_headers_objc_imap}
-  ${public_headers_objc_pop}
-  ${public_headers_objc_rfc822}
-  ${public_headers_objc_smtp}
-  ${public_headers_objc_utils}
-)
-ENDIF()
-
 # Files to build
 
 set(async_objc_abstract
@@ -130,6 +28,7 @@ set(async_objc_imap
   objc/imap/MCOIMAPIdleOperation.mm
   objc/imap/MCOIMAPMessage.mm
   objc/imap/MCOIMAPMessagePart.mm
+  objc/imap/MCOIMAPMessageRenderingOperation.mm
   objc/imap/MCOIMAPMultipart.mm
   objc/imap/MCOIMAPNamespace.mm
   objc/imap/MCOIMAPNamespaceItem.mm
diff --git a/src/cmake/public-headers.cmake b/src/cmake/public-headers.cmake
new file mode 100644
index 00000000..41409f59
--- /dev/null
+++ b/src/cmake/public-headers.cmake
@@ -0,0 +1,171 @@
+set(public_headers
+MailCore.h
+core/MCCore.h
+core/abstract/MCAbstract.h
+core/abstract/MCAbstractMessage.h
+core/basetypes/MCBaseTypes.h
+core/basetypes/MCAutoreleasePool.h
+core/basetypes/MCObject.h
+core/basetypes/MCValue.h
+core/basetypes/MCString.h
+core/basetypes/MCRange.h
+core/basetypes/MCICUTypes.h
+core/basetypes/MCData.h
+core/abstract/MCMessageConstants.h
+core/basetypes/MCArray.h
+core/basetypes/MCHashMap.h
+core/basetypes/MCJSON.h
+core/basetypes/MCMD5.h
+core/basetypes/MCNull.h
+core/basetypes/MCSet.h
+core/basetypes/MCHash.h
+core/basetypes/MCLog.h
+core/basetypes/MCAssert.h
+core/basetypes/MCUtils.h
+core/basetypes/MCIndexSet.h
+core/basetypes/MCOperation.h
+core/basetypes/MCOperationQueue.h
+core/basetypes/MCLibetpanTypes.h
+core/basetypes/MCOperationCallback.h
+core/basetypes/MCIterator.h
+core/basetypes/MCConnectionLogger.h
+core/abstract/MCAbstractMessagePart.h
+core/abstract/MCAbstractPart.h
+core/abstract/MCAbstractMultipart.h
+core/abstract/MCAddress.h
+core/abstract/MCMessageHeader.h
+core/imap/MCIMAP.h
+core/imap/MCIMAPFolder.h
+core/imap/MCIMAPMessage.h
+core/imap/MCIMAPMessagePart.h
+core/imap/MCIMAPMultipart.h
+core/imap/MCIMAPNamespace.h
+core/imap/MCIMAPNamespaceItem.h
+core/imap/MCIMAPPart.h
+core/imap/MCIMAPProgressCallback.h
+core/imap/MCIMAPSearchExpression.h
+core/imap/MCIMAPSession.h
+core/imap/MCIMAPSyncResult.h
+core/imap/MCIMAPFolderStatus.h
+core/pop/MCPOP.h
+core/pop/MCPOPMessageInfo.h
+core/pop/MCPOPProgressCallback.h
+core/pop/MCPOPSession.h
+core/rfc822/MCRFC822.h
+core/rfc822/MCAttachment.h
+core/rfc822/MCMessageBuilder.h
+core/rfc822/MCMessageParser.h
+core/rfc822/MCMessagePart.h
+core/rfc822/MCMultipart.h
+core/smtp/MCSMTP.h
+core/smtp/MCSMTPProgressCallback.h
+core/smtp/MCSMTPSession.h
+core/renderer/MCRenderer.h
+core/renderer/MCHTMLRendererCallback.h
+core/renderer/MCDateFormatter.h
+core/renderer/MCAddressDisplay.h
+core/provider/MCProvider.h
+core/provider/MCMailProvidersManager.h
+core/provider/MCMailProvider.h
+core/provider/MCNetService.h
+async/MCAsync.h
+async/smtp/MCAsyncSMTP.h
+async/smtp/MCSMTPAsyncSession.h
+async/smtp/MCSMTPOperation.h
+async/smtp/MCSMTPOperationCallback.h
+async/imap/MCAsyncIMAP.h
+async/imap/MCIMAPAsyncSession.h
+async/imap/MCIMAPOperation.h
+async/imap/MCIMAPFetchFoldersOperation.h
+async/imap/MCIMAPAppendMessageOperation.h
+async/imap/MCIMAPCopyMessagesOperation.h
+async/imap/MCIMAPFetchMessagesOperation.h
+async/imap/MCIMAPFetchContentOperation.h
+async/imap/MCIMAPIdleOperation.h
+async/imap/MCIMAPFolderInfoOperation.h
+async/imap/MCIMAPFolderStatusOperation.h
+async/imap/MCIMAPSearchOperation.h
+async/imap/MCIMAPFetchNamespaceOperation.h
+async/imap/MCIMAPIdentityOperation.h
+async/imap/MCIMAPCapabilityOperation.h
+async/imap/MCIMAPOperationCallback.h
+async/imap/MCIMAPMessageRenderingOperation.h
+async/pop/MCAsyncPOP.h
+async/pop/MCPOPAsyncSession.h
+async/pop/MCPOPOperation.h
+async/pop/MCPOPFetchHeaderOperation.h
+async/pop/MCPOPFetchMessageOperation.h
+async/pop/MCPOPFetchMessagesOperation.h
+async/pop/MCPOPOperationCallback.h
+objc/MCObjC.h
+objc/utils/MCOUtils.h
+objc/utils/MCOObjectWrapper.h
+objc/utils/NSData+MCO.h
+objc/utils/NSString+MCO.h
+objc/utils/NSDictionary+MCO.h
+objc/utils/NSArray+MCO.h
+objc/utils/NSObject+MCO.h
+objc/utils/NSError+MCO.h
+objc/utils/NSValue+MCO.h
+objc/utils/MCOOperation.h
+objc/abstract/MCOConstants.h
+objc/utils/MCOIndexSet.h
+objc/utils/MCORange.h
+objc/abstract/MCOAbstract.h
+objc/abstract/MCOAbstractMessage.h
+objc/abstract/MCOAbstractMessagePart.h
+objc/abstract/MCOAbstractPart.h
+objc/abstract/MCOAbstractMultipart.h
+objc/abstract/MCOAddress.h
+objc/abstract/MCOMessageHeader.h
+objc/abstract/MCOHTMLRendererDelegate.h
+objc/abstract/MCOHTMLRendererIMAPDelegate.h
+objc/imap/MCOIMAP.h
+objc/imap/MCOIMAPSession.h
+objc/imap/MCOIMAPOperation.h
+objc/imap/MCOIMAPBaseOperation.h
+objc/imap/MCOIMAPFetchFoldersOperation.h
+objc/imap/MCOIMAPFolder.h
+objc/imap/MCOIMAPMessage.h
+objc/imap/MCOIMAPMessagePart.h
+objc/imap/MCOIMAPMultipart.h
+objc/imap/MCOIMAPNamespace.h
+objc/imap/MCOIMAPNamespaceItem.h
+objc/imap/MCOIMAPPart.h
+objc/imap/MCOIMAPFolderInfoOperation.h
+objc/imap/MCOIMAPFolderInfo.h
+objc/imap/MCOIMAPFolderStatusOperation.h
+objc/imap/MCOIMAPFolderStatus.h
+objc/imap/MCOIMAPAppendMessageOperation.h
+objc/imap/MCOIMAPCopyMessagesOperation.h
+objc/imap/MCOIMAPFetchMessagesOperation.h
+objc/imap/MCOIMAPFetchContentOperation.h
+objc/imap/MCOIMAPSearchOperation.h
+objc/imap/MCOIMAPIdleOperation.h
+objc/imap/MCOIMAPFetchNamespaceOperation.h
+objc/imap/MCOIMAPIdentityOperation.h
+objc/imap/MCOIMAPCapabilityOperation.h
+objc/imap/MCOIMAPSearchExpression.h
+objc/imap/MCOIMAPMessageRenderingOperation.h
+objc/rfc822/MCORFC822.h
+objc/rfc822/MCOAttachment.h
+objc/rfc822/MCOMessageBuilder.h
+objc/rfc822/MCOMessageParser.h
+objc/rfc822/MCOMessagePart.h
+objc/rfc822/MCOMultipart.h
+objc/pop/MCOPOP.h
+objc/pop/MCOPOPSession.h
+objc/pop/MCOPOPOperation.h
+objc/pop/MCOPOPFetchHeaderOperation.h
+objc/pop/MCOPOPFetchMessageOperation.h
+objc/pop/MCOPOPFetchMessagesOperation.h
+objc/pop/MCOPOPMessageInfo.h
+objc/smtp/MCOSMTP.h
+objc/smtp/MCOSMTPSession.h
+objc/smtp/MCOSMTPSendOperation.h
+objc/smtp/MCOSMTPOperation.h
+objc/provider/MCOProvider.h
+objc/provider/MCONetService.h
+objc/provider/MCOMailProvider.h
+objc/provider/MCOMailProvidersManager.h
+)