Clean header list

build-windows/build_headers.bat

@@ -1,4 +1,4 @@
 @mkdir include
 @mkdir include\libetpan
-@for /F "delims=" %%a in (build_headers.list) do @copy "%%a" include\libetpan
+@for /F "delims=" %%a in (build_headers.list) do @copy "..\%%a" include\libetpan
 @echo "done" >_headers_depends

build-windows/build_headers.list

@@ -1,157 +1,157 @@
-..\src\data-types\carray.h
-..\src\data-types\charconv.h
-..\src\data-types\chash.h
-..\src\data-types\clist.h
-..\src\data-types\maillock.h
-..\src\data-types\mailsem.h
-..\src\data-types\mailstream.h
-..\src\data-types\mailstream_cfstream.h
-..\src\data-types\mailstream_helper.h
-..\src\data-types\mailstream_low.h
-..\src\data-types\mailstream_socket.h
-..\src\data-types\mailstream_ssl.h
-..\src\data-types\mailstream_types.h
-..\src\data-types\mmapstring.h
-..\src\driver\implementation\data-message\data_message_driver.h
-..\src\driver\implementation\db\dbdriver.h
-..\src\driver\implementation\db\dbdriver_message.h
-..\src\driver\implementation\db\dbdriver_types.h
-..\src\driver\implementation\db\dbstorage.h
-..\src\driver\implementation\feed\feeddriver.h
-..\src\driver\implementation\feed\feeddriver_message.h
-..\src\driver\implementation\feed\feeddriver_types.h
-..\src\driver\implementation\feed\feedstorage.h
-..\src\driver\implementation\hotmail\hotmailstorage.h
-..\src\driver\implementation\imap\imapdriver.h
-..\src\driver\implementation\imap\imapdriver_cached.h
-..\src\driver\implementation\imap\imapdriver_cached_message.h
-..\src\driver\implementation\imap\imapdriver_message.h
-..\src\driver\implementation\imap\imapdriver_types.h
-..\src\driver\implementation\imap\imapstorage.h
-..\src\driver\implementation\maildir\maildirdriver.h
-..\src\driver\implementation\maildir\maildirdriver_cached.h
-..\src\driver\implementation\maildir\maildirdriver_cached_message.h
-..\src\driver\implementation\maildir\maildirdriver_message.h
-..\src\driver\implementation\maildir\maildirdriver_types.h
-..\src\driver\implementation\maildir\maildirstorage.h
-..\src\driver\implementation\mbox\mboxdriver.h
-..\src\driver\implementation\mbox\mboxdriver_cached.h
-..\src\driver\implementation\mbox\mboxdriver_cached_message.h
-..\src\driver\implementation\mbox\mboxdriver_message.h
-..\src\driver\implementation\mbox\mboxdriver_types.h
-..\src\driver\implementation\mbox\mboxstorage.h
-..\src\driver\implementation\mh\mhdriver.h
-..\src\driver\implementation\mh\mhdriver_cached.h
-..\src\driver\implementation\mh\mhdriver_cached_message.h
-..\src\driver\implementation\mh\mhdriver_message.h
-..\src\driver\implementation\mh\mhdriver_types.h
-..\src\driver\implementation\mh\mhstorage.h
-..\src\driver\implementation\mime-message\mime_message_driver.h
-..\src\driver\implementation\nntp\nntpdriver.h
-..\src\driver\implementation\nntp\nntpdriver_cached.h
-..\src\driver\implementation\nntp\nntpdriver_cached_message.h
-..\src\driver\implementation\nntp\nntpdriver_message.h
-..\src\driver\implementation\nntp\nntpdriver_types.h
-..\src\driver\implementation\nntp\nntpstorage.h
-..\src\driver\implementation\pop3\pop3driver.h
-..\src\driver\implementation\pop3\pop3driver_cached.h
-..\src\driver\implementation\pop3\pop3driver_cached_message.h
-..\src\driver\implementation\pop3\pop3driver_message.h
-..\src\driver\implementation\pop3\pop3driver_types.h
-..\src\driver\implementation\pop3\pop3storage.h
-..\src\driver\interface\maildriver.h
-..\src\driver\interface\maildriver_errors.h
-..\src\driver\interface\maildriver_types.h
-..\src\driver\interface\maildriver_types_helper.h
-..\src\driver\interface\mailfolder.h
-..\src\driver\interface\mailmessage.h
-..\src\driver\interface\mailmessage_types.h
-..\src\driver\interface\mailstorage.h
-..\src\driver\interface\mailstorage_types.h
-..\src\driver\tools\generic_cache_types.h
-..\src\driver\tools\mailthread.h
-..\src\driver\tools\mailthread_types.h
-..\src\engine\mailengine.h
-..\src\engine\mailprivacy.h
-..\src\engine\mailprivacy_gnupg.h
-..\src\engine\mailprivacy_smime.h
-..\src\engine\mailprivacy_tools.h
-..\src\engine\mailprivacy_types.h
-..\src\low-level\feed\newsfeed.h
-..\src\low-level\feed\newsfeed_item.h
-..\src\low-level\feed\newsfeed_item_enclosure.h
-..\src\low-level\feed\newsfeed_types.h
-..\src\low-level\imap\acl.h
-..\src\low-level\imap\acl_types.h
-..\src\low-level\imap\annotatemore.h
-..\src\low-level\imap\annotatemore_types.h
-..\src\low-level\imap\condstore.h
-..\src\low-level\imap\condstore_types.h
-..\src\low-level\imap\enable.h
-..\src\low-level\imap\idle.h
-..\src\low-level\imap\mailimap.h
-..\src\low-level\imap\mailimap_compress.h
-..\src\low-level\imap\mailimap_extension.h
-..\src\low-level\imap\mailimap_extension_types.h
-..\src\low-level\imap\mailimap_helper.h
-..\src\low-level\imap\mailimap_id.h
-..\src\low-level\imap\mailimap_id_types.h
-..\src\low-level\imap\mailimap_oauth2.h
-..\src\low-level\imap\mailimap_socket.h
-..\src\low-level\imap\mailimap_sort.h
-..\src\low-level\imap\mailimap_sort_types.h
-..\src\low-level\imap\mailimap_ssl.h
-..\src\low-level\imap\mailimap_types.h
-..\src\low-level\imap\mailimap_types_helper.h
-..\src\low-level\imap\namespace.h
-..\src\low-level\imap\namespace_types.h
-..\src\low-level\imap\qresync.h
-..\src\low-level\imap\qresync_types.h
-..\src\low-level\imap\quota.h
-..\src\low-level\imap\quota_types.h
-..\src\low-level\imap\uidplus.h
-..\src\low-level\imap\uidplus_types.h
-..\src\low-level\imap\xgmlabels.h
-..\src\low-level\imap\xgmmsgid.h
-..\src\low-level\imap\xgmthrid.h
-..\src\low-level\imap\xlist.h
-..\src\low-level\imf\mailimf.h
-..\src\low-level\imf\mailimf_types.h
-..\src\low-level\imf\mailimf_types_helper.h
-..\src\low-level\imf\mailimf_write_file.h
-..\src\low-level\imf\mailimf_write_generic.h
-..\src\low-level\imf\mailimf_write_mem.h
-..\src\low-level\maildir\maildir.h
-..\src\low-level\maildir\maildir_types.h
-..\src\low-level\mbox\mailmbox.h
-..\src\low-level\mbox\mailmbox_types.h
-..\src\low-level\mh\mailmh.h
-..\src\low-level\mime\mailmime.h
-..\src\low-level\mime\mailmime_content.h
-..\src\low-level\mime\mailmime_decode.h
-..\src\low-level\mime\mailmime_disposition.h
-..\src\low-level\mime\mailmime_types.h
-..\src\low-level\mime\mailmime_types_helper.h
-..\src\low-level\mime\mailmime_write_file.h
-..\src\low-level\mime\mailmime_write_generic.h
-..\src\low-level\mime\mailmime_write_mem.h
-..\src\low-level\nntp\newsnntp.h
-..\src\low-level\nntp\newsnntp_socket.h
-..\src\low-level\nntp\newsnntp_ssl.h
-..\src\low-level\nntp\newsnntp_types.h
-..\src\low-level\pop3\mailpop3.h
-..\src\low-level\pop3\mailpop3_helper.h
-..\src\low-level\pop3\mailpop3_socket.h
-..\src\low-level\pop3\mailpop3_ssl.h
-..\src\low-level\pop3\mailpop3_types.h
-..\src\low-level\smtp\mailsmtp.h
-..\src\low-level\smtp\mailsmtp_helper.h
-..\src\low-level\smtp\mailsmtp_oauth2.h
-..\src\low-level\smtp\mailsmtp_socket.h
-..\src\low-level\smtp\mailsmtp_ssl.h
-..\src\low-level\smtp\mailsmtp_types.h
-..\src\main\libetpan.h
-..\src\main\libetpan_version.h
-..\src\windows\win_etpan.h
-libetpan-config.h
-libetpan_version.h
+src\data-types\carray.h
+src\data-types\charconv.h
+src\data-types\chash.h
+src\data-types\clist.h
+src\data-types\maillock.h
+src\data-types\mailsem.h
+src\data-types\mailstream.h
+src\data-types\mailstream_cfstream.h
+src\data-types\mailstream_helper.h
+src\data-types\mailstream_low.h
+src\data-types\mailstream_socket.h
+src\data-types\mailstream_ssl.h
+src\data-types\mailstream_types.h
+src\data-types\mmapstring.h
+src\driver\implementation\data-message\data_message_driver.h
+src\driver\implementation\db\dbdriver.h
+src\driver\implementation\db\dbdriver_message.h
+src\driver\implementation\db\dbdriver_types.h
+src\driver\implementation\db\dbstorage.h
+src\driver\implementation\feed\feeddriver.h
+src\driver\implementation\feed\feeddriver_message.h
+src\driver\implementation\feed\feeddriver_types.h
+src\driver\implementation\feed\feedstorage.h
+src\driver\implementation\hotmail\hotmailstorage.h
+src\driver\implementation\imap\imapdriver.h
+src\driver\implementation\imap\imapdriver_cached.h
+src\driver\implementation\imap\imapdriver_cached_message.h
+src\driver\implementation\imap\imapdriver_message.h
+src\driver\implementation\imap\imapdriver_types.h
+src\driver\implementation\imap\imapstorage.h
+src\driver\implementation\maildir\maildirdriver.h
+src\driver\implementation\maildir\maildirdriver_cached.h
+src\driver\implementation\maildir\maildirdriver_cached_message.h
+src\driver\implementation\maildir\maildirdriver_message.h
+src\driver\implementation\maildir\maildirdriver_types.h
+src\driver\implementation\maildir\maildirstorage.h
+src\driver\implementation\mbox\mboxdriver.h
+src\driver\implementation\mbox\mboxdriver_cached.h
+src\driver\implementation\mbox\mboxdriver_cached_message.h
+src\driver\implementation\mbox\mboxdriver_message.h
+src\driver\implementation\mbox\mboxdriver_types.h
+src\driver\implementation\mbox\mboxstorage.h
+src\driver\implementation\mh\mhdriver.h
+src\driver\implementation\mh\mhdriver_cached.h
+src\driver\implementation\mh\mhdriver_cached_message.h
+src\driver\implementation\mh\mhdriver_message.h
+src\driver\implementation\mh\mhdriver_types.h
+src\driver\implementation\mh\mhstorage.h
+src\driver\implementation\mime-message\mime_message_driver.h
+src\driver\implementation\nntp\nntpdriver.h
+src\driver\implementation\nntp\nntpdriver_cached.h
+src\driver\implementation\nntp\nntpdriver_cached_message.h
+src\driver\implementation\nntp\nntpdriver_message.h
+src\driver\implementation\nntp\nntpdriver_types.h
+src\driver\implementation\nntp\nntpstorage.h
+src\driver\implementation\pop3\pop3driver.h
+src\driver\implementation\pop3\pop3driver_cached.h
+src\driver\implementation\pop3\pop3driver_cached_message.h
+src\driver\implementation\pop3\pop3driver_message.h
+src\driver\implementation\pop3\pop3driver_types.h
+src\driver\implementation\pop3\pop3storage.h
+src\driver\interface\maildriver.h
+src\driver\interface\maildriver_errors.h
+src\driver\interface\maildriver_types.h
+src\driver\interface\maildriver_types_helper.h
+src\driver\interface\mailfolder.h
+src\driver\interface\mailmessage.h
+src\driver\interface\mailmessage_types.h
+src\driver\interface\mailstorage.h
+src\driver\interface\mailstorage_types.h
+src\driver\tools\generic_cache_types.h
+src\driver\tools\mailthread.h
+src\driver\tools\mailthread_types.h
+src\engine\mailengine.h
+src\engine\mailprivacy.h
+src\engine\mailprivacy_gnupg.h
+src\engine\mailprivacy_smime.h
+src\engine\mailprivacy_tools.h
+src\engine\mailprivacy_types.h
+src\low-level\feed\newsfeed.h
+src\low-level\feed\newsfeed_item.h
+src\low-level\feed\newsfeed_item_enclosure.h
+src\low-level\feed\newsfeed_types.h
+src\low-level\imap\acl.h
+src\low-level\imap\acl_types.h
+src\low-level\imap\annotatemore.h
+src\low-level\imap\annotatemore_types.h
+src\low-level\imap\condstore.h
+src\low-level\imap\condstore_types.h
+src\low-level\imap\enable.h
+src\low-level\imap\idle.h
+src\low-level\imap\mailimap.h
+src\low-level\imap\mailimap_compress.h
+src\low-level\imap\mailimap_extension.h
+src\low-level\imap\mailimap_extension_types.h
+src\low-level\imap\mailimap_helper.h
+src\low-level\imap\mailimap_id.h
+src\low-level\imap\mailimap_id_types.h
+src\low-level\imap\mailimap_oauth2.h
+src\low-level\imap\mailimap_socket.h
+src\low-level\imap\mailimap_sort.h
+src\low-level\imap\mailimap_sort_types.h
+src\low-level\imap\mailimap_ssl.h
+src\low-level\imap\mailimap_types.h
+src\low-level\imap\mailimap_types_helper.h
+src\low-level\imap\namespace.h
+src\low-level\imap\namespace_types.h
+src\low-level\imap\qresync.h
+src\low-level\imap\qresync_types.h
+src\low-level\imap\quota.h
+src\low-level\imap\quota_types.h
+src\low-level\imap\uidplus.h
+src\low-level\imap\uidplus_types.h
+src\low-level\imap\xgmlabels.h
+src\low-level\imap\xgmmsgid.h
+src\low-level\imap\xgmthrid.h
+src\low-level\imap\xlist.h
+src\low-level\imf\mailimf.h
+src\low-level\imf\mailimf_types.h
+src\low-level\imf\mailimf_types_helper.h
+src\low-level\imf\mailimf_write_file.h
+src\low-level\imf\mailimf_write_generic.h
+src\low-level\imf\mailimf_write_mem.h
+src\low-level\maildir\maildir.h
+src\low-level\maildir\maildir_types.h
+src\low-level\mbox\mailmbox.h
+src\low-level\mbox\mailmbox_types.h
+src\low-level\mh\mailmh.h
+src\low-level\mime\mailmime.h
+src\low-level\mime\mailmime_content.h
+src\low-level\mime\mailmime_decode.h
+src\low-level\mime\mailmime_disposition.h
+src\low-level\mime\mailmime_types.h
+src\low-level\mime\mailmime_types_helper.h
+src\low-level\mime\mailmime_write_file.h
+src\low-level\mime\mailmime_write_generic.h
+src\low-level\mime\mailmime_write_mem.h
+src\low-level\nntp\newsnntp.h
+src\low-level\nntp\newsnntp_socket.h
+src\low-level\nntp\newsnntp_ssl.h
+src\low-level\nntp\newsnntp_types.h
+src\low-level\pop3\mailpop3.h
+src\low-level\pop3\mailpop3_helper.h
+src\low-level\pop3\mailpop3_socket.h
+src\low-level\pop3\mailpop3_ssl.h
+src\low-level\pop3\mailpop3_types.h
+src\low-level\smtp\mailsmtp.h
+src\low-level\smtp\mailsmtp_helper.h
+src\low-level\smtp\mailsmtp_oauth2.h
+src\low-level\smtp\mailsmtp_socket.h
+src\low-level\smtp\mailsmtp_ssl.h
+src\low-level\smtp\mailsmtp_types.h
+src\main\libetpan.h
+src\main\libetpan_version.h
+src\windows\win_etpan.h
+build-windows\libetpan-config.h
+build-windows\libetpan_version.h

build-windows/gen-public-headers.sh

@@ -14,7 +14,7 @@ list_headers()
   if test "x$path" = x ; then
     return
   fi
-  echo $path | sed 's/^.\//..\/src\//' | sed 's/\//\\/g'
+  echo $path | sed 's/^.\//src\//' | sed 's/\//\\/g'
   files="$files[$filename]"
   subfilenames="`grep '#include <libetpan/' "$path" | sed 's/^#include <libetpan\/\(.*\)>$/\1/'`"
   for include_dir in $subfilenames ; do
@@ -24,6 +24,6 @@ list_headers()
 
 cd ../src
 list_headers libetpan.h | sort
-echo ..\\src\\windows\\win_etpan.h
-echo libetpan-config.h
-echo libetpan_version.h
+echo src\\windows\\win_etpan.h
+echo build-windows\\libetpan-config.h
+echo build-windows\\libetpan_version.h