Clean header list

3 files changed, 226 insertions, 201 deletions

diff --git a/build-windows/build_headers.bat b/build-windows/build_headers.bat
index 4ea101e2..df456d8d 100644
--- a/build-windows/build_headers.bat
+++ b/build-windows/build_headers.bat
@@ -1,4 +1,4 @@
 @mkdir include
 @mkdir include\MailCore
-@for /F "delims=" %%a in (build_headers.list) do @copy "..\src\%%a" include\MailCore
+@for /F "delims=" %%a in (build_headers.list) do @copy "..\%%a" include\MailCore
 @echo "done" >_headers_depends
diff --git a/build-windows/build_headers.list b/build-windows/build_headers.list
index 25074a18..2eeb6b30 100644
--- a/build-windows/build_headers.list
+++ b/build-windows/build_headers.list
@@ -1,200 +1,200 @@
-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\imap\MCIMAPIdentity.h
-core\pop\MCPOP.h
-core\pop\MCPOPMessageInfo.h
-core\pop\MCPOPProgressCallback.h
-core\pop\MCPOPSession.h
-core\nntp\MCNNTP.h
-core\nntp\MCNNTPGroupInfo.h
-core\nntp\MCNNTPProgressCallback.h
-core\nntp\MCNNTPSession.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\MCIMAPFetchParsedContentOperation.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\MCIMAPQuotaOperation.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
-async\nntp\MCAsyncNNTP.h
-async\nntp\MCNNTPAsyncSession.h
-async\nntp\MCNNTPOperation.h
-async\nntp\MCNNTPFetchHeaderOperation.h
-async\nntp\MCNNTPFetchArticleOperation.h
-async\nntp\MCNNTPFetchAllArticlesOperation.h
-async\nntp\MCNNTPListNewsgroupsOperation.h
-async\nntp\MCNNTPFetchOverviewOperation.h
-async\nntp\MCNNTPFetchServerTimeOperation.h
-async\nntp\MCNNTPOperationCallback.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\utils\NSIndexSet+MCO.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\MCOIMAPIdentity.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\MCOIMAPFetchParsedContentOperation.h
-objc\imap\MCOIMAPSearchOperation.h
-objc\imap\MCOIMAPIdleOperation.h
-objc\imap\MCOIMAPFetchNamespaceOperation.h
-objc\imap\MCOIMAPIdentityOperation.h
-objc\imap\MCOIMAPCapabilityOperation.h
-objc\imap\MCOIMAPQuotaOperation.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\nntp\MCONNTP.h
-objc\nntp\MCONNTPSession.h
-objc\nntp\MCONNTPOperation.h
-objc\nntp\MCONNTPFetchHeaderOperation.h
-objc\nntp\MCONNTPFetchArticleOperation.h
-objc\nntp\MCONNTPFetchAllArticlesOperation.h
-objc\nntp\MCONNTPListNewsgroupsOperation.h
-objc\nntp\MCONNTPFetchOverviewOperation.h
-objc\nntp\MCONNTPFetchServerTimeOperation.h
-objc\nntp\MCONNTPGroupInfo.h
-objc\provider\MCOProvider.h
-objc\provider\MCONetService.h
-objc\provider\MCOMailProvider.h
-objc\provider\MCOMailProvidersManager.h
+src\MailCore.h
+src\core\MCCore.h
+src\core\abstract\MCAbstract.h
+src\core\abstract\MCAbstractMessage.h
+src\core\basetypes\MCBaseTypes.h
+src\core\basetypes\MCAutoreleasePool.h
+src\core\basetypes\MCObject.h
+src\core\basetypes\MCUtils.h
+src\core\basetypes\MCValue.h
+src\core\basetypes\MCString.h
+src\core\basetypes\MCRange.h
+src\core\basetypes\MCICUTypes.h
+src\core\basetypes\MCData.h
+src\core\abstract\MCMessageConstants.h
+src\core\basetypes\MCArray.h
+src\core\basetypes\MCHashMap.h
+src\core\basetypes\MCJSON.h
+src\core\basetypes\MCMD5.h
+src\core\basetypes\MCNull.h
+src\core\basetypes\MCSet.h
+src\core\basetypes\MCHash.h
+src\core\basetypes\MCLog.h
+src\core\basetypes\MCAssert.h
+src\core\basetypes\MCIndexSet.h
+src\core\basetypes\MCOperation.h
+src\core\basetypes\MCOperationQueue.h
+src\core\basetypes\MCLibetpanTypes.h
+src\core\basetypes\MCOperationCallback.h
+src\core\basetypes\MCIterator.h
+src\core\basetypes\MCConnectionLogger.h
+src\core\abstract\MCAbstractMessagePart.h
+src\core\abstract\MCAbstractPart.h
+src\core\abstract\MCAbstractMultipart.h
+src\core\abstract\MCAddress.h
+src\core\abstract\MCMessageHeader.h
+src\core\imap\MCIMAP.h
+src\core\imap\MCIMAPFolder.h
+src\core\imap\MCIMAPMessage.h
+src\core\imap\MCIMAPMessagePart.h
+src\core\imap\MCIMAPMultipart.h
+src\core\imap\MCIMAPNamespace.h
+src\core\imap\MCIMAPNamespaceItem.h
+src\core\imap\MCIMAPPart.h
+src\core\imap\MCIMAPProgressCallback.h
+src\core\imap\MCIMAPSearchExpression.h
+src\core\imap\MCIMAPSession.h
+src\core\imap\MCIMAPSyncResult.h
+src\core\imap\MCIMAPFolderStatus.h
+src\core\imap\MCIMAPIdentity.h
+src\core\pop\MCPOP.h
+src\core\pop\MCPOPMessageInfo.h
+src\core\pop\MCPOPProgressCallback.h
+src\core\pop\MCPOPSession.h
+src\core\nntp\MCNNTP.h
+src\core\nntp\MCNNTPGroupInfo.h
+src\core\nntp\MCNNTPProgressCallback.h
+src\core\nntp\MCNNTPSession.h
+src\core\rfc822\MCRFC822.h
+src\core\rfc822\MCAttachment.h
+src\core\rfc822\MCMessageBuilder.h
+src\core\rfc822\MCMessageParser.h
+src\core\rfc822\MCMessagePart.h
+src\core\rfc822\MCMultipart.h
+src\core\smtp\MCSMTP.h
+src\core\smtp\MCSMTPProgressCallback.h
+src\core\smtp\MCSMTPSession.h
+src\core\renderer\MCRenderer.h
+src\core\renderer\MCHTMLRendererCallback.h
+src\core\renderer\MCDateFormatter.h
+src\core\renderer\MCAddressDisplay.h
+src\core\provider\MCProvider.h
+src\core\provider\MCMailProvidersManager.h
+src\core\provider\MCMailProvider.h
+src\core\provider\MCNetService.h
+src\async\MCAsync.h
+src\async\smtp\MCAsyncSMTP.h
+src\async\smtp\MCSMTPAsyncSession.h
+src\async\smtp\MCSMTPOperation.h
+src\async\smtp\MCSMTPOperationCallback.h
+src\async\imap\MCAsyncIMAP.h
+src\async\imap\MCIMAPAsyncSession.h
+src\async\imap\MCIMAPOperation.h
+src\async\imap\MCIMAPFetchFoldersOperation.h
+src\async\imap\MCIMAPAppendMessageOperation.h
+src\async\imap\MCIMAPCopyMessagesOperation.h
+src\async\imap\MCIMAPFetchMessagesOperation.h
+src\async\imap\MCIMAPFetchContentOperation.h
+src\async\imap\MCIMAPFetchParsedContentOperation.h
+src\async\imap\MCIMAPIdleOperation.h
+src\async\imap\MCIMAPFolderInfoOperation.h
+src\async\imap\MCIMAPFolderStatusOperation.h
+src\async\imap\MCIMAPSearchOperation.h
+src\async\imap\MCIMAPFetchNamespaceOperation.h
+src\async\imap\MCIMAPIdentityOperation.h
+src\async\imap\MCIMAPCapabilityOperation.h
+src\async\imap\MCIMAPQuotaOperation.h
+src\async\imap\MCIMAPOperationCallback.h
+src\async\imap\MCIMAPMessageRenderingOperation.h
+src\async\pop\MCAsyncPOP.h
+src\async\pop\MCPOPAsyncSession.h
+src\async\pop\MCPOPOperation.h
+src\async\pop\MCPOPFetchHeaderOperation.h
+src\async\pop\MCPOPFetchMessageOperation.h
+src\async\pop\MCPOPFetchMessagesOperation.h
+src\async\pop\MCPOPOperationCallback.h
+src\async\nntp\MCAsyncNNTP.h
+src\async\nntp\MCNNTPAsyncSession.h
+src\async\nntp\MCNNTPOperation.h
+src\async\nntp\MCNNTPFetchHeaderOperation.h
+src\async\nntp\MCNNTPFetchArticleOperation.h
+src\async\nntp\MCNNTPFetchAllArticlesOperation.h
+src\async\nntp\MCNNTPListNewsgroupsOperation.h
+src\async\nntp\MCNNTPFetchOverviewOperation.h
+src\async\nntp\MCNNTPFetchServerTimeOperation.h
+src\async\nntp\MCNNTPOperationCallback.h
+src\objc\MCObjC.h
+src\objc\utils\MCOUtils.h
+src\objc\utils\MCOObjectWrapper.h
+src\objc\utils\NSData+MCO.h
+src\objc\utils\NSString+MCO.h
+src\objc\utils\NSDictionary+MCO.h
+src\objc\utils\NSArray+MCO.h
+src\objc\utils\NSObject+MCO.h
+src\objc\utils\NSError+MCO.h
+src\objc\utils\NSValue+MCO.h
+src\objc\utils\MCOOperation.h
+src\objc\abstract\MCOConstants.h
+src\objc\utils\MCOIndexSet.h
+src\objc\utils\MCORange.h
+src\objc\utils\NSIndexSet+MCO.h
+src\objc\abstract\MCOAbstract.h
+src\objc\abstract\MCOAbstractMessage.h
+src\objc\abstract\MCOAbstractMessagePart.h
+src\objc\abstract\MCOAbstractPart.h
+src\objc\abstract\MCOAbstractMultipart.h
+src\objc\abstract\MCOAddress.h
+src\objc\abstract\MCOMessageHeader.h
+src\objc\abstract\MCOHTMLRendererDelegate.h
+src\objc\abstract\MCOHTMLRendererIMAPDelegate.h
+src\objc\imap\MCOIMAP.h
+src\objc\imap\MCOIMAPSession.h
+src\objc\imap\MCOIMAPOperation.h
+src\objc\imap\MCOIMAPBaseOperation.h
+src\objc\imap\MCOIMAPFetchFoldersOperation.h
+src\objc\imap\MCOIMAPFolder.h
+src\objc\imap\MCOIMAPMessage.h
+src\objc\imap\MCOIMAPMessagePart.h
+src\objc\imap\MCOIMAPMultipart.h
+src\objc\imap\MCOIMAPNamespace.h
+src\objc\imap\MCOIMAPNamespaceItem.h
+src\objc\imap\MCOIMAPIdentity.h
+src\objc\imap\MCOIMAPPart.h
+src\objc\imap\MCOIMAPFolderInfoOperation.h
+src\objc\imap\MCOIMAPFolderInfo.h
+src\objc\imap\MCOIMAPFolderStatusOperation.h
+src\objc\imap\MCOIMAPFolderStatus.h
+src\objc\imap\MCOIMAPAppendMessageOperation.h
+src\objc\imap\MCOIMAPCopyMessagesOperation.h
+src\objc\imap\MCOIMAPFetchMessagesOperation.h
+src\objc\imap\MCOIMAPFetchContentOperation.h
+src\objc\imap\MCOIMAPFetchParsedContentOperation.h
+src\objc\imap\MCOIMAPSearchOperation.h
+src\objc\imap\MCOIMAPIdleOperation.h
+src\objc\imap\MCOIMAPFetchNamespaceOperation.h
+src\objc\imap\MCOIMAPIdentityOperation.h
+src\objc\imap\MCOIMAPCapabilityOperation.h
+src\objc\imap\MCOIMAPQuotaOperation.h
+src\objc\imap\MCOIMAPSearchExpression.h
+src\objc\imap\MCOIMAPMessageRenderingOperation.h
+src\objc\rfc822\MCORFC822.h
+src\objc\rfc822\MCOAttachment.h
+src\objc\rfc822\MCOMessageBuilder.h
+src\objc\rfc822\MCOMessageParser.h
+src\objc\rfc822\MCOMessagePart.h
+src\objc\rfc822\MCOMultipart.h
+src\objc\pop\MCOPOP.h
+src\objc\pop\MCOPOPSession.h
+src\objc\pop\MCOPOPOperation.h
+src\objc\pop\MCOPOPFetchHeaderOperation.h
+src\objc\pop\MCOPOPFetchMessageOperation.h
+src\objc\pop\MCOPOPFetchMessagesOperation.h
+src\objc\pop\MCOPOPMessageInfo.h
+src\objc\smtp\MCOSMTP.h
+src\objc\smtp\MCOSMTPSession.h
+src\objc\smtp\MCOSMTPSendOperation.h
+src\objc\smtp\MCOSMTPOperation.h
+src\objc\nntp\MCONNTP.h
+src\objc\nntp\MCONNTPSession.h
+src\objc\nntp\MCONNTPOperation.h
+src\objc\nntp\MCONNTPFetchHeaderOperation.h
+src\objc\nntp\MCONNTPFetchArticleOperation.h
+src\objc\nntp\MCONNTPFetchAllArticlesOperation.h
+src\objc\nntp\MCONNTPListNewsgroupsOperation.h
+src\objc\nntp\MCONNTPFetchOverviewOperation.h
+src\objc\nntp\MCONNTPFetchServerTimeOperation.h
+src\objc\nntp\MCONNTPGroupInfo.h
+src\objc\provider\MCOProvider.h
+src\objc\provider\MCONetService.h
+src\objc\provider\MCOMailProvider.h
+src\objc\provider\MCOMailProvidersManager.h
diff --git a/build-windows/gen-public-headers.sh b/build-windows/gen-public-headers.sh
new file mode 100755
index 00000000..d557f3f7
--- /dev/null
+++ b/build-windows/gen-public-headers.sh
@@ -0,0 +1,25 @@
+#!/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/^.\//src\//' | sed 's/\//\\/g'
+  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 ../src
+list_headers MailCore.h