diff --git a/.gitignore b/.gitignore index 8b955403..2262aac2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,11 +7,6 @@ # Doxygen-generated doc/html/* -# SConstruct -.sconsign.dblite -/options.cache -/run-tests - # CMake-generated / Build files CMakeFiles/ CMakeCache.txt @@ -24,9 +19,9 @@ cmake_install.cmake /install_manifest* /libvmime.a /vmime.pc -/vmime/config.hpp -/vmime/export-static.hpp -/vmime/export-shared.hpp +/src/vmime/config.hpp +/src/vmime/export-static.hpp +/src/vmime/export-shared.hpp /COPYING.txt build/ Makefile diff --git a/CMakeLists.txt b/CMakeLists.txt index c8a885a3..e20d00d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,19 +71,20 @@ SET(VMIME_LIBRARY_NAME vmime) FILE( GLOB_RECURSE VMIME_LIBRARY_SRC_FILES - src/* + ${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/*.cpp ) FILE( GLOB_RECURSE VMIME_LIBRARY_INCLUDE_FILES - vmime/* + ${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/*.hpp ) -LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "vmime/config.hpp") +LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/config.hpp") INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} # for "contrib/" + ${CMAKE_CURRENT_SOURCE_DIR}/src # for "vmime/ ) INCLUDE(GenerateExportHeader) @@ -116,10 +117,10 @@ IF(VMIME_BUILD_SHARED_LIBRARY) COPY ${CMAKE_CURRENT_BINARY_DIR}/export-shared.hpp DESTINATION - ${PROJECT_SOURCE_DIR}/vmime + ${PROJECT_SOURCE_DIR}/src/vmime ) - LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "vmime/export-shared.hpp") + LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/export-shared.hpp") SET_TARGET_PROPERTIES( ${VMIME_LIBRARY_NAME} @@ -161,10 +162,10 @@ IF(VMIME_BUILD_STATIC_LIBRARY) COPY ${CMAKE_CURRENT_BINARY_DIR}/export-static.hpp DESTINATION - ${PROJECT_SOURCE_DIR}/vmime + ${PROJECT_SOURCE_DIR}/src/vmime ) - LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "vmime/export-static.hpp") + LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/export-static.hpp") SET_TARGET_PROPERTIES( ${VMIME_LIBRARY_NAME}-static @@ -244,8 +245,8 @@ IF(VMIME_BUILD_STATIC_LIBRARY) ENDIF() # Installation of header files -INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_INCLUDE_FILES headers) -INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_GENERATED_INCLUDE_FILES headers) +INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_INCLUDE_FILES headers src/) +INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_GENERATED_INCLUDE_FILES headers src/) #INSTALL( # FILES ${VMIME_LIBRARY_INCLUDE_FILES} @@ -1064,7 +1065,7 @@ ENDIF() # Set our configure file -CONFIGURE_FILE(cmake/config.hpp.cmake ${CMAKE_SOURCE_DIR}/vmime/config.hpp) +CONFIGURE_FILE(cmake/config.hpp.cmake ${CMAKE_SOURCE_DIR}/src/vmime/config.hpp) # PkgConfig post-configuration CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/vmime.pc.in ${CMAKE_BINARY_DIR}/vmime.pc @ONLY) diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 88a42154..00000000 --- a/SConstruct +++ /dev/null @@ -1,1124 +0,0 @@ -# -# SConstruct file for VMime -# -# Deprecated: use only for development purpose. -# Use CMake for distribution/packaging. -# -# Process this file with 'scons' to build the project. -# For more information, please visit: http://www.scons.org/ . -# -# Usage: -# -# . scons build the library -# . scons -h see available configuration options -# . scons opt=value set a configuration option -# . scons doc build documentation for the project (Doxygen) -# - -import commands -import os -import sys -import re -import string - - -############# -# Version # -############# - -# Package information -packageName = 'libvmime' -packageGenericName = 'vmime' -packageRealName = 'VMime Library' -packageDescription = 'VMime C++ Mail Library (http://www.vmime.org)' -packageMaintainer = 'vincent@vmime.org' - -packageVersion = '0.0.0' -packageAPI = '0:0:0' - -packageVersionedGenericName = packageGenericName -packageVersionedName = packageName - - -################## -# Source files # -################## - -libvmime_sources = [ - # ============================== Parser ============================== - 'address.cpp', 'address.hpp', - 'addressList.cpp', 'addressList.hpp', - 'attachment.hpp', - 'attachmentHelper.cpp', 'attachmentHelper.hpp', - 'base.cpp', 'base.hpp', - 'body.cpp', 'body.hpp', - 'bodyPart.cpp', 'bodyPart.hpp', - 'bodyPartAttachment.cpp', 'bodyPartAttachment.hpp', - 'charset.cpp', 'charset.hpp', - 'charsetConverter.cpp', 'charsetConverter.hpp', - 'charsetConverter_iconv.cpp', 'charsetConverter_iconv.hpp', - 'charsetConverter_icu.cpp', 'charsetConverter_icu.hpp', - 'charsetConverter_idna.cpp', 'charsetConverter_idna.hpp', - 'charsetConverterOptions.cpp', 'charsetConverterOptions.hpp', - 'component.cpp', 'component.hpp', - 'constants.cpp', 'constants.hpp', - 'contentDisposition.cpp', 'contentDisposition.hpp', - 'contentDispositionField.cpp', 'contentDispositionField.hpp', - 'contentHandler.cpp', 'contentHandler.hpp', - 'contentTypeField.cpp', 'contentTypeField.hpp', - 'context.hpp', 'context.cpp', - 'dateTime.cpp', 'dateTime.hpp', - 'defaultAttachment.cpp', 'defaultAttachment.hpp', - 'disposition.cpp', 'disposition.hpp', - 'emailAddress.cpp', 'emailAddress.hpp', - 'emptyContentHandler.cpp', 'emptyContentHandler.hpp', - 'encoding.cpp', 'encoding.hpp', - 'exception.cpp', 'exception.hpp', - 'fileAttachment.cpp', 'fileAttachment.hpp', - 'fileContentHandler.cpp', 'fileContentHandler.hpp', - 'generatedMessageAttachment.hpp', 'generatedMessageAttachment.cpp', - 'generationContext.hpp', 'generationContext.cpp', - 'header.cpp', 'header.hpp', - 'headerFieldFactory.cpp', 'headerFieldFactory.hpp', - 'headerField.cpp', 'headerField.hpp', - 'headerFieldValue.cpp', 'headerFieldValue.hpp', - 'htmlTextPart.cpp', 'htmlTextPart.hpp', - 'mailbox.cpp', 'mailbox.hpp', - 'mailboxField.cpp', 'mailboxField.hpp', - 'mailboxGroup.cpp', 'mailboxGroup.hpp', - 'mailboxList.cpp', 'mailboxList.hpp', - 'mediaType.cpp', 'mediaType.hpp', - 'messageAttachment.hpp', - 'messageBuilder.cpp', 'messageBuilder.hpp', - 'message.cpp', 'message.hpp', - 'messageId.cpp', 'messageId.hpp', - 'messageIdSequence.cpp', 'messageIdSequence.hpp', - 'messageParser.cpp', 'messageParser.hpp', - 'object.cpp', 'object.hpp', - 'path.cpp', 'path.hpp', - 'parameter.cpp', 'parameter.hpp', - 'parameterizedHeaderField.cpp', 'parameterizedHeaderField.hpp', - 'parsedMessageAttachment.cpp', 'parsedMessageAttachment.hpp', - 'parserHelpers.hpp', - 'parsingContext.hpp', 'parsingContext.cpp', - 'plainTextPart.cpp', 'plainTextPart.hpp', - 'platform.cpp', 'platform.hpp', - 'propertySet.cpp', 'propertySet.hpp', - 'relay.cpp', 'relay.hpp', - 'stringContentHandler.cpp', 'stringContentHandler.hpp', - 'streamContentHandler.cpp', 'streamContentHandler.hpp', - 'text.cpp', 'text.hpp', - 'textPartFactory.cpp', 'textPartFactory.hpp', - 'textPart.hpp', - 'types.hpp', - 'word.cpp', 'word.hpp', - 'wordEncoder.cpp', 'wordEncoder.hpp', - 'vmime.hpp', - # ============================== Utility ============================= - 'utility/childProcess.hpp', - 'utility/file.hpp', - 'utility/datetimeUtils.cpp', 'utility/datetimeUtils.hpp', - 'utility/path.cpp', 'utility/path.hpp', - 'utility/progressListener.cpp', 'utility/progressListener.hpp', - 'utility/random.cpp', 'utility/random.hpp', - 'utility/stream.cpp', 'utility/stream.hpp', - 'utility/streamUtils.cpp', 'utility/streamUtils.hpp', - 'utility/filteredStream.cpp', 'utility/filteredStream.hpp', - 'utility/inputStream.cpp', 'utility/inputStream.hpp', - 'utility/inputStreamAdapter.cpp', 'utility/inputStreamAdapter.hpp', - 'utility/inputStreamByteBufferAdapter.cpp', 'utility/inputStreamByteBufferAdapter.hpp', - 'utility/inputStreamPointerAdapter.cpp', 'utility/inputStreamPointerAdapter.hpp', - 'utility/inputStreamSocketAdapter.cpp', 'utility/inputStreamSocketAdapter.hpp', - 'utility/inputStreamStringAdapter.cpp', 'utility/inputStreamStringAdapter.hpp', - 'utility/inputStreamStringProxyAdapter.cpp', 'utility/inputStreamStringProxyAdapter.hpp', - 'utility/seekableInputStream.hpp', - 'utility/seekableInputStreamRegionAdapter.cpp', 'utility/seekableInputStreamRegionAdapter.hpp', - 'utility/outputStream.cpp', 'utility/outputStream.hpp', - 'utility/outputStreamAdapter.cpp', 'utility/outputStreamAdapter.hpp', - 'utility/outputStreamByteArrayAdapter.cpp', 'utility/outputStreamByteArrayAdapter.hpp', - 'utility/outputStreamSocketAdapter.cpp', 'utility/outputStreamSocketAdapter.hpp', - 'utility/outputStreamStringAdapter.cpp', 'utility/outputStreamStringAdapter.hpp', - 'utility/parserInputStreamAdapter.cpp', 'utility/parserInputStreamAdapter.hpp', - 'utility/stringProxy.cpp', 'utility/stringProxy.hpp', - 'utility/stringUtils.cpp', 'utility/stringUtils.hpp', - 'utility/url.cpp', 'utility/url.hpp', - 'utility/urlUtils.cpp', 'utility/urlUtils.hpp', - 'utility/sync/autoLock.hpp', - 'utility/sync/criticalSection.cpp', 'utility/sync/criticalSection.hpp', - # -- encoder - 'utility/encoder/encoder.cpp', 'utility/encoder/encoder.hpp', - 'utility/encoder/sevenBitEncoder.cpp', 'utility/encoder/sevenBitEncoder.hpp', - 'utility/encoder/eightBitEncoder.cpp', 'utility/encoder/eightBitEncoder.hpp', - 'utility/encoder/b64Encoder.cpp', 'utility/encoder/b64Encoder.hpp', - 'utility/encoder/binaryEncoder.cpp', 'utility/encoder/binaryEncoder.hpp', - 'utility/encoder/noopEncoder.cpp', 'utility/encoder/noopEncoder.hpp', - 'utility/encoder/encoderFactory.cpp', 'utility/encoder/encoderFactory.hpp', - 'utility/encoder/qpEncoder.cpp', 'utility/encoder/qpEncoder.hpp', - 'utility/encoder/uuEncoder.cpp', 'utility/encoder/uuEncoder.hpp', - # =============================== MDN ================================ - 'mdn/MDNHelper.cpp', 'mdn/MDNHelper.hpp', - 'mdn/MDNInfos.cpp', 'mdn/MDNInfos.hpp', - 'mdn/receivedMDNInfos.cpp', 'mdn/receivedMDNInfos.hpp', - 'mdn/sendableMDNInfos.cpp', 'mdn/sendableMDNInfos.hpp', - # =============================== Misc =============================== - 'misc/importanceHelper.cpp', 'misc/importanceHelper.hpp', - # ============================= Security ============================= - 'security/authenticator.hpp', - 'security/defaultAuthenticator.cpp', 'security/defaultAuthenticator.hpp', - # -- digest - 'security/digest/messageDigest.cpp', 'security/digest/messageDigest.hpp', - 'security/digest/messageDigestFactory.cpp', 'security/digest/messageDigestFactory.hpp', - 'security/digest/md5/md5MessageDigest.cpp', 'security/digest/md5/md5MessageDigest.hpp', - 'security/digest/sha1/sha1MessageDigest.cpp', 'security/digest/sha1/sha1MessageDigest.hpp' -] - -libvmime_security_sasl_sources = [ - 'security/sasl/SASLContext.cpp', 'security/sasl/SASLContext.hpp', - 'security/sasl/SASLSession.cpp', 'security/sasl/SASLSession.hpp', - 'security/sasl/SASLMechanism.hpp', - 'security/sasl/SASLMechanismFactory.cpp', 'security/sasl/SASLMechanismFactory.hpp', - 'security/sasl/SASLSocket.cpp', 'security/sasl/SASLSocket.hpp', - 'security/sasl/SASLAuthenticator.hpp', - 'security/sasl/defaultSASLAuthenticator.cpp', 'security/sasl/defaultSASLAuthenticator.hpp', - 'security/sasl/builtinSASLMechanism.cpp', 'security/sasl/builtinSASLMechanism.hpp' -] - -libvmime_examples_sources = [ - 'examples/README', -# 'examples/Makefile.am', # not generated -# 'examples/Makefile.in', - 'examples/example1.cpp', - 'examples/example2.cpp', - 'examples/example3.cpp', - 'examples/example4.cpp', - 'examples/example5.cpp', - 'examples/example6.cpp', - 'examples/example7.cpp' -] - -libvmime_messaging_sources = [ - 'net/builtinServices.inl', - 'net/connectionInfos.hpp', - 'net/defaultConnectionInfos.cpp', 'net/defaultConnectionInfos.hpp', - 'net/events.cpp', 'net/events.hpp', - 'net/fetchAttributes.cpp', 'net/fetchAttributes.hpp', - 'net/folder.cpp', 'net/folder.hpp', - 'net/folderStatus.hpp', - 'net/message.cpp', 'net/message.hpp', - 'net/messageSet.cpp', 'net/messageSet.hpp', - 'net/securedConnectionInfos.hpp', - 'net/service.cpp', 'net/service.hpp', - 'net/serviceFactory.cpp', 'net/serviceFactory.hpp', - 'net/serviceInfos.cpp', 'net/serviceInfos.hpp', - 'net/serviceRegistration.inl', - 'net/session.cpp', 'net/session.hpp', - 'net/socket.hpp', - 'net/store.hpp', - 'net/timeoutHandler.hpp', - 'net/transport.cpp', 'net/transport.hpp' -] - -libvmime_net_tls_sources = [ - 'net/tls/TLSSession.cpp', 'net/tls/TLSSession.hpp', - 'net/tls/TLSSocket.cpp', 'net/tls/TLSSocket.hpp', - 'net/tls/TLSProperties.cpp', 'net/tls/TLSProperties.hpp', - 'net/tls/gnutls/TLSSession_GnuTLS.cpp', 'net/tls/gnutls/TLSSession_GnuTLS.hpp', - 'net/tls/gnutls/TLSSocket_GnuTLS.cpp', 'net/tls/gnutls/TLSSocket_GnuTLS.hpp', - 'net/tls/gnutls/TLSProperties_GnuTLS.cpp', 'net/tls/gnutls/TLSProperties_GnuTLS.hpp', - 'net/tls/openssl/TLSSession_OpenSSL.cpp', 'net/tls/openssl/TLSSession_OpenSSL.hpp', - 'net/tls/openssl/TLSSocket_OpenSSL.cpp', 'net/tls/openssl/TLSSocket_OpenSSL.hpp', - 'net/tls/openssl/TLSProperties_OpenSSL.cpp', 'net/tls/openssl/TLSProperties_OpenSSL.hpp', - 'net/tls/openssl/OpenSSLInitializer.cpp', 'net/tls/openssl/OpenSSLInitializer.hpp', - 'net/tls/TLSSecuredConnectionInfos.cpp', 'net/tls/TLSSecuredConnectionInfos.hpp', - 'security/cert/certificateChain.cpp', 'security/cert/certificateChain.hpp', - 'security/cert/certificateVerifier.hpp', - 'security/cert/defaultCertificateVerifier.cpp', 'security/cert/defaultCertificateVerifier.hpp', - 'security/cert/certificate.hpp', - 'security/cert/X509Certificate.cpp', 'security/cert/X509Certificate.hpp', - 'security/cert/gnutls/X509Certificate_GnuTLS.cpp', 'security/cert/gnutls/X509Certificate_GnuTLS.hpp', - 'security/cert/openssl/X509Certificate_OpenSSL.cpp', 'security/cert/openssl/X509Certificate_OpenSSL.hpp' -] - -libvmime_messaging_proto_sources = [ - [ - 'pop3', - [ - 'net/pop3/POP3Command.cpp', 'net/pop3/POP3Command.hpp', - 'net/pop3/POP3Connection.cpp', 'net/pop3/POP3Connection.hpp', - 'net/pop3/POP3ServiceInfos.cpp', 'net/pop3/POP3ServiceInfos.hpp', - 'net/pop3/POP3Store.cpp', 'net/pop3/POP3Store.hpp', - 'net/pop3/POP3SStore.cpp', 'net/pop3/POP3SStore.hpp', - 'net/pop3/POP3Folder.cpp', 'net/pop3/POP3Folder.hpp', - 'net/pop3/POP3FolderStatus.cpp', 'net/pop3/POP3FolderStatus.hpp', - 'net/pop3/POP3Message.cpp', 'net/pop3/POP3Message.hpp', - 'net/pop3/POP3Response.cpp', 'net/pop3/POP3Response.hpp', - 'net/pop3/POP3Utils.cpp', 'net/pop3/POP3Utils.hpp' - ] - ], - [ - 'smtp', - [ - 'net/smtp/SMTPChunkingOutputStreamAdapter.cpp', 'net/smtp/SMTPChunkingOutputStreamAdapter.hpp', - 'net/smtp/SMTPCommand.cpp', 'net/smtp/SMTPCommand.hpp', - 'net/smtp/SMTPCommandSet.cpp', 'net/smtp/SMTPCommandSet.hpp', - 'net/smtp/SMTPConnection.cpp', 'net/smtp/SMTPConnection.hpp', - 'net/smtp/SMTPExceptions.cpp', 'net/smtp/SMTPExceptions.hpp', - 'net/smtp/SMTPResponse.cpp', 'net/smtp/SMTPResponse.hpp', - 'net/smtp/SMTPServiceInfos.cpp', 'net/smtp/SMTPServiceInfos.hpp', - 'net/smtp/SMTPTransport.cpp', 'net/smtp/SMTPTransport.hpp', - 'net/smtp/SMTPSTransport.cpp', 'net/smtp/SMTPSTransport.hpp' - ] - ], - [ - 'imap', - [ - 'net/imap/IMAPServiceInfos.cpp', 'net/imap/IMAPServiceInfos.hpp', - 'net/imap/IMAPConnection.cpp', 'net/imap/IMAPConnection.hpp', - 'net/imap/IMAPStore.cpp', 'net/imap/IMAPStore.hpp', - 'net/imap/IMAPSStore.cpp', 'net/imap/IMAPSStore.hpp', - 'net/imap/IMAPFolder.cpp', 'net/imap/IMAPFolder.hpp', - 'net/imap/IMAPFolderStatus.cpp', 'net/imap/IMAPFolderStatus.hpp', - 'net/imap/IMAPMessage.cpp', 'net/imap/IMAPMessage.hpp', - 'net/imap/IMAPMessagePart.cpp', 'net/imap/IMAPMessagePart.hpp', - 'net/imap/IMAPMessagePartContentHandler.cpp', 'net/imap/IMAPMessagePartContentHandler.hpp', - 'net/imap/IMAPMessageStructure.cpp', 'net/imap/IMAPMessageStructure.hpp', - 'net/imap/IMAPTag.cpp', 'net/imap/IMAPTag.hpp', - 'net/imap/IMAPUtils.cpp', 'net/imap/IMAPUtils.hpp', - 'net/imap/IMAPParser.hpp', - ] - ], - [ - 'maildir', - [ - 'net/maildir/maildirServiceInfos.cpp', 'net/maildir/maildirServiceInfos.hpp', - 'net/maildir/maildirStore.cpp', 'net/maildir/maildirStore.hpp', - 'net/maildir/maildirFolder.cpp', 'net/maildir/maildirFolder.hpp', - 'net/maildir/maildirFolderStatus.cpp', 'net/maildir/maildirFolderStatus.hpp', - 'net/maildir/maildirMessage.cpp', 'net/maildir/maildirMessage.hpp', - 'net/maildir/maildirMessagePart.cpp', 'net/maildir/maildirMessagePart.hpp', - 'net/maildir/maildirMessageStructure.cpp', 'net/maildir/maildirMessageStructure.hpp', - 'net/maildir/maildirUtils.cpp', 'net/maildir/maildirUtils.hpp', - 'net/maildir/maildirFormat.cpp', 'net/maildir/maildirFormat.hpp', - 'net/maildir/format/kmailMaildirFormat.cpp', 'net/maildir/format/kmailMaildirFormat.hpp', - 'net/maildir/format/courierMaildirFormat.cpp', 'net/maildir/format/courierMaildirFormat.hpp' - ] - ], - [ - 'sendmail', - [ - 'net/sendmail/sendmailServiceInfos.cpp', 'net/sendmail/sendmailServiceInfos.hpp', - 'net/sendmail/sendmailTransport.cpp', 'net/sendmail/sendmailTransport.hpp' - ] - ] -] - -libvmime_platforms_sources = { - 'posix': - [ - 'platforms/posix/posixChildProcess.cpp', 'platforms/posix/posixChildProcess.hpp', - 'platforms/posix/posixCriticalSection.cpp', 'platforms/posix/posixCriticalSection.hpp', - 'platforms/posix/posixFile.cpp', 'platforms/posix/posixFile.hpp', - 'platforms/posix/posixHandler.cpp', 'platforms/posix/posixHandler.hpp', - 'platforms/posix/posixSocket.cpp', 'platforms/posix/posixSocket.hpp' - ], - 'windows': - [ - 'platforms/windows/windowsCriticalSection.cpp', 'platforms/windows/windowsCriticalSection.hpp', - 'platforms/windows/windowsFile.cpp', 'platforms/windows/windowsFile.hpp', - 'platforms/windows/windowsHandler.cpp', 'platforms/windows/windowsHandler.hpp', - 'platforms/windows/windowsSocket.cpp', 'platforms/windows/windowsSocket.hpp' - ] -} - -libvmime_extra = [ - 'AUTHORS', - 'ChangeLog', - 'COPYING', - 'HACKING', - 'INSTALL', - 'NEWS', - 'README', - 'README.msvc', - 'README.refcounting', - 'SConstruct', - 'vmime.doxygen' -] - -libvmime_tests = [ -# 'tests/Makefile.am', # not generated -# 'tests/Makefile.in', - - # parser -# 'tests/parser/Makefile.am', # not generated -# 'tests/parser/Makefile.in', - - # charset -# 'tests/charset/Makefile.am', # not generated -# 'tests/charset/Makefile.in', - 'tests/charset/main.cpp', - 'tests/charset/run-test.sh', - 'tests/charset/test-suites/gnu.in.utf-8', - 'tests/charset/test-suites/gnu.out.iso-8859-1', -] - -libvmimetest_common = [ - 'tests/testUtils.hpp', - 'tests/net/smtp/SMTPTransportTestUtils.hpp', - 'tests/utility/encoder/encoderTestUtils.hpp' -] - -libvmimetest_sources = [ - 'tests/testRunner.cpp', - 'tests/testUtils.cpp', - # ============================== Parser ============================== - 'tests/parser/attachmentHelperTest.cpp', - 'tests/parser/bodyPartTest.cpp', - 'tests/parser/bodyTest.cpp', - 'tests/parser/charsetTest.cpp', - 'tests/parser/charsetFilteredOutputStreamTest.cpp', - 'tests/parser/datetimeTest.cpp', - 'tests/parser/dispositionTest.cpp', - 'tests/parser/emailAddressTest.cpp', - 'tests/parser/emptyContentHandlerTest.cpp', - 'tests/parser/fileContentHandlerTest.cpp', - 'tests/parser/headerTest.cpp', - 'tests/parser/headerFieldTest.cpp', - 'tests/parser/htmlTextPartTest.cpp', - 'tests/parser/mailboxGroupTest.cpp', - 'tests/parser/mailboxListTest.cpp', - 'tests/parser/mailboxTest.cpp', - 'tests/parser/mediaTypeTest.cpp', - 'tests/parser/messageIdTest.cpp', - 'tests/parser/messageIdSequenceTest.cpp', - 'tests/parser/messageTest.cpp', - 'tests/parser/pathTest.cpp', - 'tests/parser/parameterTest.cpp', - 'tests/parser/streamContentHandlerTest.cpp', - 'tests/parser/stringContentHandlerTest.cpp', - 'tests/parser/textTest.cpp', - 'tests/parser/wordEncoderTest.cpp', - # ============================== Utility ============================= - 'tests/utility/datetimeUtilsTest.cpp', - 'tests/utility/filteredStreamTest.cpp', - 'tests/utility/stringProxyTest.cpp', - 'tests/utility/stringUtilsTest.cpp', - 'tests/utility/pathTest.cpp', - 'tests/utility/urlTest.cpp', - 'tests/utility/encoder/qpEncoderTest.cpp', - 'tests/utility/encoder/b64EncoderTest.cpp', - 'tests/utility/outputStreamStringAdapterTest.cpp', - 'tests/utility/outputStreamSocketAdapterTest.cpp', - 'tests/utility/outputStreamByteArrayAdapterTest.cpp', - 'tests/utility/seekableInputStreamRegionAdapterTest.cpp', - # =============================== Misc =============================== - 'tests/misc/importanceHelperTest.cpp', - # ============================= Security ============================= - 'tests/security/digest/md5Test.cpp', - 'tests/security/digest/sha1Test.cpp', - # =============================== Net ================================ - 'tests/net/messageSetTest.cpp', - 'tests/net/pop3/POP3CommandTest.cpp', - 'tests/net/pop3/POP3ResponseTest.cpp', - 'tests/net/pop3/POP3StoreTest.cpp', - 'tests/net/pop3/POP3UtilsTest.cpp', - 'tests/net/imap/IMAPTagTest.cpp', - 'tests/net/imap/IMAPParserTest.cpp', - 'tests/net/smtp/SMTPTransportTest.cpp', - 'tests/net/smtp/SMTPCommandTest.cpp', - 'tests/net/smtp/SMTPCommandSetTest.cpp', - 'tests/net/smtp/SMTPResponseTest.cpp', - 'tests/net/maildir/maildirStoreTest.cpp' -] - -libvmime_autotools = [ - 'm4/acx_pthread.m4', - 'm4/iconv.m4', - 'm4/lib-ld.m4', - 'm4/lib-link.m4', - 'm4/lib-prefix.m4', - 'm4/libgnutls.m4', - 'autotools/install-sh', -# 'autotools/mkinstalldirs', - 'autotools/missing', - 'autotools/config.guess', - 'autotools/config.sub', - 'autotools/ltmain.sh', -# 'autotools/depcomp', - 'bootstrap', # not generated - 'configure', - 'configure.in', - 'config.h.in', - 'Makefile.am', - 'Makefile.in', - 'src/Makefile.am', - 'src/Makefile.in', - 'vmime/Makefile.am', - 'vmime/Makefile.in' -] - -libvmime_all_sources = [] + libvmime_sources + libvmime_messaging_sources + libvmime_security_sasl_sources + libvmime_net_tls_sources - -for i in range(len(libvmime_all_sources)): - f = libvmime_all_sources[i] - if f[-4:] == '.hpp': - libvmime_all_sources[i] = 'vmime/' + f - else: - libvmime_all_sources[i] = 'src/' + f - -for p in libvmime_messaging_proto_sources: - for f in p[1]: - if f[-4:] == '.hpp': - libvmime_all_sources.append('vmime/' + f) - else: - libvmime_all_sources.append('src/' + f) - -for p in libvmime_platforms_sources: - for f in libvmime_platforms_sources[p]: - if f[-4:] == '.hpp': - libvmime_all_sources.append('vmime/' + f) - else: - libvmime_all_sources.append('src/' + f) - -libvmime_dist_files = libvmime_all_sources + libvmime_extra + libvmime_examples_sources - -libvmime_dist_files += libvmime_tests -libvmime_dist_files += libvmimetest_sources -libvmime_dist_files += libvmimetest_common -libvmime_dist_files += libvmime_autotools - - -################# -# Set options # -################# - -EnsureSConsVersion(0, 98, 1) - -SetOption('implicit_cache', 1) - -try: - Decider('MD5-timestamp') -except: - SourceSignatures('MD5') - TargetSignatures('build') - - -############# -# Options # -############# - -# Try to guess some default values -defaultSendmailPath = WhereIs("sendmail") - -if defaultSendmailPath == None: - defaultSendmailPath = '' - - -# Command line options -opts = Variables('options.cache') - -opts.AddVariables( - ( - 'prefix', - 'Installation prefix directory', - '/usr' - ), - EnumVariable( - 'debug', - 'Debug version (useful for developers only)', - 'yes', - allowed_values = ('yes', 'no'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'with_messaging', - 'Messaging support (connection to mail store/transport servers)', - 'yes', - allowed_values = ('yes', 'no'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'with_filesystem', - 'Enable file-system support (this is needed for "maildir" messaging support)', - 'yes', - allowed_values = ('yes', 'no'), - map = { }, - ignorecase = 1 - ), - ( - 'with_messaging_protocols', - 'Specifies which protocols to build into the library.\n' - + 'This option has no effect if "with_messaging" is not activated.\n' - + 'Separate protocols with spaces; string must be quoted with ".\n' - + 'Currently available protocols: pop3, smtp, imap, maildir, sendmail.', - '"pop3 smtp imap maildir sendmail"' - ), - ( - 'with_platforms', - 'Specifies which default platform handlers to build.\n' - + 'This provides support for each platform selected.\n' - + 'If no platform handler is available for your platform, you will have\n' - + 'to write your own...\n' - + 'Separate platforms with spaces; string must be quoted with ".\n' - + 'Currently available platform handlers: posix.', - '"posix"' - ), - EnumVariable( - 'with_sasl', - 'Enable SASL support (requires GNU SASL library)', - 'yes', - allowed_values = ('yes', 'no'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'with_tls', - 'Enable TLS support (requires GNU TLS library)', - 'yes', - allowed_values = ('yes', 'no'), - map = { }, - ignorecase = 1 - ), - ( - 'sendmail_path', - 'Specifies the path to sendmail.', - defaultSendmailPath - ), - EnumVariable( - 'byte_order', - 'Byte order (Big Endian or Little Endian)', - sys.byteorder, - allowed_values = ('big', 'little'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'pf_8bit_type', - 'The C-language 8-bit type for your platform', - 'char', - allowed_values = ('char', 'short', 'int', 'long'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'pf_16bit_type', - 'The C-language 16-bit type for your platform', - 'short', - allowed_values = ('char', 'short', 'int', 'long'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'pf_32bit_type', - 'The C-language 32-bit type for your platform', - 'int', - allowed_values = ('char', 'short', 'int', 'long'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'pf_64bit_type', - 'The C-language 64-bit type for your platform', - 'long', - allowed_values = ('char', 'short', 'int', 'long', 'long long'), - map = { }, - ignorecase = 1 - ), - EnumVariable( - 'build_tests', - 'Build unit tests (run with "scons run-tests")', - 'no', - allowed_values = ('yes', 'no'), - map = { }, - ignorecase = 1 - ) -) - - - -############################### -# Configuration Environment # -############################### - -try: - env = Environment(variables = opts) -except TypeError: - env = Environment(options = opts) - -env.Append(ENV = os.environ) -env.Append(ENV = {'PATH' : os.environ['PATH']}) - -env.Append(CPPPATH = [ '.' ]) - -env.Append(CPPDEFINES = ['_REENTRANT=1']) - -env.Append(CPPDEFINES = ['VMIME_STATIC']) - -env.Append(CXXFLAGS = ['-W']) -env.Append(CXXFLAGS = ['-Wall']) -env.Append(CXXFLAGS = ['-ansi']) -env.Append(CXXFLAGS = ['-pedantic']) -env.Append(CXXFLAGS = ['-Wpointer-arith']) -env.Append(CXXFLAGS = ['-Wold-style-cast']) -env.Append(CXXFLAGS = ['-Wconversion']) -env.Append(CXXFLAGS = ['-Wcast-align']) -env.Append(CXXFLAGS = ['-Wno-long-long']) # OpenSSL -#env.Append(CXXFLAGS = ['-Wshadow']) - -env.Append(TARFLAGS = ['-c']) -env.Append(TARFLAGS = ['--bzip2']) - -if env['debug'] == 'yes': - env.Append(CXXFLAGS = ['-g']) - env.Append(CXXFLAGS = ['-O0']) -else: - env.Append(CXXFLAGS = ['-O2']) - #-fomit-frame-pointer -fmove-all-movables -fstrict-aliasing - -#env.Append(LIBS = ['additional-lib-here']) - -if env['with_sasl'] == 'yes': - libgsasl_pc = string.strip(os.popen("pkg-config --list-all | grep '^libgsasl[ ]' | cut -f 1 -d ' '").read()) - - if len(libgsasl_pc) == 0: - print "ERROR: GNU SASL development package is not installed\n" - Exit(1) - - env.ParseConfig('pkg-config --cflags --libs ' + libgsasl_pc) - -if env['with_tls'] == 'yes': - # GnuTLS - libgnutls_pc = string.strip(os.popen("pkg-config --list-all | grep '^libgnutls[ ]' | cut -f 1 -d ' '").read()) - - if len(libgnutls_pc) == 0: - libgnutls_pc = string.strip(os.popen("pkg-config --list-all | grep '^gnutls[ ]' | cut -f 1 -d ' '").read()) - - if len(libgnutls_pc) == 0: - print "ERROR: GNU TLS development package is not installed\n" - Exit(1) - - env.ParseConfig('pkg-config --cflags --libs ' + libgnutls_pc) - - # OpenSSL - libopenssl_pc = string.strip(os.popen("pkg-config --list-all | grep '^openssl[ ]' | cut -f 1 -d ' '").read()) - - if len(libopenssl_pc) == 0: - print "ERROR: OpenSSL development package is not installed\n" - Exit(1) - - env.ParseConfig('pkg-config --cflags --libs ' + libopenssl_pc) - -env.Append(CXXFLAGS = ['-pthread']) - -# Charset conversion library - -# -- iconv -if sys.platform == "mac" or sys.platform == "darwin": - env.Append(LIBS = ['iconv', 'gcrypt']) - -# -- ICU -env.Append(LIBS = ['icuuc', 'icudata', 'icui18n']) - -# Generate help text for command line options -Help(opts.GenerateHelpText(env)) - -# Cache current options -opts.Save('options.cache', env) - -# Documentation generation system -doxygenBuilder = Builder(action = 'doxygen $SOURCE') -env.Append(BUILDERS = { 'DoxygenDoc' : doxygenBuilder }) - - - -########################## -# Some initializations # -########################## - -# Messaging protocols -messaging_protocols = [ ] - -for proto in re.split('\W+', string.replace(env['with_messaging_protocols'], '"', '')): - proto = string.strip(proto) - if len(proto) >= 1: - messaging_protocols.append(proto) - -# Platforms -platforms = [ ] - -for platform in re.split('\W+', string.replace(env['with_platforms'], '"', '')): - platform = string.strip(platform) - if len(platform) >= 1: - platforms.append(platform) - - - -######################## -# Some sanity checks # -######################## - -def IsProtocolSupported(protoList, proto): - for supportedProto in protoList: - if string.upper(supportedProto) == string.upper(proto): - return 1 - return 0 - - -# File-system support must be activated when 'maildir' protocol is selected -if env['with_messaging'] == 'yes': - if IsProtocolSupported(messaging_protocols, 'maildir'): - if env['with_filesystem'] != 'yes': - print "ERROR: 'maildir' protocol requires file-system support!\n" - Exit(1) - -# Sendmail transport is only available on POSIX platforms -if os.name != 'posix': - if IsProtocolSupported(messaging_protocols, 'sendmail'): - print "WARNING: ignoring 'sendmail' support (only available on POSIX platforms)\n" - - newProtoList = [ ] - - for p in messaging_protocols: - if string.upper(p) != "SENDMAIL": - newProtoList.append(p) - - messaging_protocols = newProtoList - -# Check sendmail path -if IsProtocolSupported(messaging_protocols, 'sendmail'): - if env['sendmail_path'] == '': - print "ERROR: no path specified for 'sendmail'" - Exit(1) - - -########################### -# Configuration summary # -########################### - -print "" -print "+=================+" -print "| CONFIGURATION |" -print "+=================+" -print "" -print "Installation prefix : " + env['prefix'] -print "Debugging mode : " + env['debug'] -print "Messaging support : " + env['with_messaging'] -if env['with_messaging'] == 'yes': - print " * protocols : " + env['with_messaging_protocols'] -print "File-system support : " + env['with_filesystem'] -print "Platform handlers : " + env['with_platforms'] -print "SASL support : " + env['with_sasl'] -print "TLS/SSL support : " + env['with_tls'] - -if IsProtocolSupported(messaging_protocols, 'sendmail'): - print "Sendmail path : " + env['sendmail_path'] - -print "" - - -################################ -# Generate export-static.hpp # -################################ - -export_hpp = open('vmime/export-static.hpp', 'w') - -export_hpp.write(""" -#define VMIME_EXPORT -#define VMIME_NO_EXPORT - -#ifndef VMIME_DEPRECATED -# define VMIME_DEPRECATED __attribute__ ((__deprecated__)) -# define VMIME_DEPRECATED_EXPORT VMIME_EXPORT __attribute__ ((__deprecated__)) -# define VMIME_DEPRECATED_NO_EXPORT VMIME_NO_EXPORT __attribute__ ((__deprecated__)) -#endif -""") - -export_hpp.close() - - -######################### -# Generate config.hpp # -######################### - -config_hpp = open('vmime/config.hpp', 'w') - -config_hpp.write(""" -// -// This file was automatically generated by configuration script. -// - -#ifndef VMIME_CONFIG_HPP_INCLUDED -#define VMIME_CONFIG_HPP_INCLUDED - - -#include "vmime/export.hpp" - - -""") - -config_hpp.write('// Name of package\n') -config_hpp.write('#define VMIME_PACKAGE "' + packageName + '"\n') -config_hpp.write('\n') -config_hpp.write('// Version number of package\n') -config_hpp.write('#define VMIME_VERSION "' + packageVersion + '"\n') -config_hpp.write('#define VMIME_API "' + packageAPI + '"\n') -config_hpp.write('\n') -config_hpp.write('// Target OS and architecture\n') - -if os.name == 'posix': - config_hpp.write('#define VMIME_TARGET_ARCH "' + commands.getoutput('uname -m') + '"\n') - config_hpp.write('#define VMIME_TARGET_OS "' + commands.getoutput('uname -s') + '"\n') -else: - config_hpp.write('#define VMIME_TARGET_ARCH "" // Unknown\n') - config_hpp.write('#define VMIME_TARGET_OS "' + sys.platform + '/' + os.name + '"\n') - -config_hpp.write('\n') -config_hpp.write('// Set to 1 if debugging should be activated\n') - -if env['debug'] == 'yes': - config_hpp.write('#define VMIME_DEBUG 1\n') -else: - config_hpp.write('#define VMIME_DEBUG 0\n') - -config_hpp.write('\n') -config_hpp.write('// Byte order (set one or the other, but not both!)\n') - -if env['byte_order'] == 'big': - config_hpp.write('#define VMIME_BYTE_ORDER_BIG_ENDIAN 1\n') - config_hpp.write('#define VMIME_BYTE_ORDER_LITTLE_ENDIAN 0\n') -else: - config_hpp.write('#define VMIME_BYTE_ORDER_BIG_ENDIAN 0\n') - config_hpp.write('#define VMIME_BYTE_ORDER_LITTLE_ENDIAN 1\n') - -config_hpp.write('\n') -config_hpp.write('// Generic types\n') -config_hpp.write('// -- 8-bit\n') -config_hpp.write('typedef signed ' + env['pf_8bit_type'] + ' vmime_int8;\n') -config_hpp.write('typedef unsigned ' + env['pf_8bit_type'] + ' vmime_uint8;\n') -config_hpp.write('// -- 16-bit\n') -config_hpp.write('typedef signed ' + env['pf_16bit_type'] + ' vmime_int16;\n') -config_hpp.write('typedef unsigned ' + env['pf_16bit_type'] + ' vmime_uint16;\n') -config_hpp.write('// -- 32-bit\n') -config_hpp.write('typedef signed ' + env['pf_32bit_type'] + ' vmime_int32;\n') -config_hpp.write('typedef unsigned ' + env['pf_32bit_type'] + ' vmime_uint32;\n') -config_hpp.write('// -- 64-bit\n') -config_hpp.write('typedef signed ' + env['pf_64bit_type'] + ' vmime_int64;\n') -config_hpp.write('typedef unsigned ' + env['pf_64bit_type'] + ' vmime_uint64;\n') -config_hpp.write('\n') -config_hpp.write('#define VMIME_HAVE_SIZE_T 1\n') -config_hpp.write('\n') - -config_hpp.write('// Charset conversion support\n') -config_hpp.write('#define VMIME_CHARSETCONV_LIB_IS_ICONV 1\n') -config_hpp.write('#define VMIME_CHARSETCONV_LIB_IS_ICU 0\n') -config_hpp.write('\n') - -config_hpp.write('// Options\n') - -config_hpp.write('// -- File-system support\n') -if env['with_filesystem'] == 'yes': - config_hpp.write('#define VMIME_HAVE_FILESYSTEM_FEATURES 1\n') -else: - config_hpp.write('#define VMIME_HAVE_FILESYSTEM_FEATURES 0\n') - -config_hpp.write('// -- SASL support\n') -if env['with_sasl'] == 'yes': - config_hpp.write('#define VMIME_HAVE_SASL_SUPPORT 1\n') -else: - config_hpp.write('#define VMIME_HAVE_SASL_SUPPORT 0\n') - -config_hpp.write('// -- TLS/SSL support\n') -if env['with_tls'] == 'yes': - config_hpp.write('#define VMIME_HAVE_TLS_SUPPORT 1\n') - config_hpp.write('#define VMIME_TLS_SUPPORT_LIB_IS_GNUTLS 1\n') - config_hpp.write('#define VMIME_TLS_SUPPORT_LIB_IS_OPENSSL 0\n') - config_hpp.write('#define VMIME_HAVE_GNUTLS_PRIORITY_FUNCS 1\n') -else: - config_hpp.write('#define VMIME_HAVE_TLS_SUPPORT 0\n') - -config_hpp.write('// -- Messaging support\n') -if env['with_messaging'] == 'yes': - config_hpp.write('#define VMIME_HAVE_MESSAGING_FEATURES 1\n') - - config_hpp.write('// -- Messaging protocols\n') - - for proto in messaging_protocols: - config_hpp.write('#define VMIME_HAVE_MESSAGING_PROTO_' + string.upper(proto) + ' 1\n') - - for p in libvmime_messaging_proto_sources: - proto = p[0] - if not proto in messaging_protocols: - config_hpp.write('#define VMIME_HAVE_MESSAGING_PROTO_' + string.upper(proto) + ' 0\n') -else: - config_hpp.write('#define VMIME_HAVE_MESSAGING_FEATURES 0\n') - -config_hpp.write('// -- Platform-specific code\n') -for platform in platforms: - config_hpp.write('#define VMIME_PLATFORM_IS_' + string.upper(platform) + ' 1\n') - -for platform in libvmime_platforms_sources: - if not platform in platforms: - config_hpp.write('#define VMIME_PLATFORM_IS_' + string.upper(platform) + ' 0\n') - -config_hpp.write(""" -#define VMIME_HAVE_GETADDRINFO 1 -#define VMIME_HAVE_GETNAMEINFO 1 -#define VMIME_HAVE_PTHREAD 1 -#define VMIME_HAVE_GETTID 0 -#define VMIME_HAVE_SYSCALL 1 -#define VMIME_HAVE_SYSCALL_GETTID 1 -#define VMIME_HAVE_LOCALTIME_R 1 -#define VMIME_HAVE_LOCALTIME_S 0 -#define VMIME_HAVE_GMTIME_R 1 -#define VMIME_HAVE_GMTIME_S 0 -""") - -config_hpp.write('\n') -config_hpp.write('// Miscellaneous flags\n') - -if IsProtocolSupported(messaging_protocols, 'sendmail'): - config_hpp.write('#define VMIME_SENDMAIL_PATH "' + env['sendmail_path'] + '"\n') - -config_hpp.write(""" - -#endif // VMIME_CONFIG_HPP_INCLUDED -""") - -config_hpp.close() - - -################# -# Build rules # -################# - -# Build directory -if env['debug'] == 'yes': - BuildDir("#build/debug", 'src', duplicate = 0) - buildDirectory = 'build/debug/' -else: - BuildDir("#build/release", 'src', duplicate = 0) - buildDirectory = 'build/release/' - -# Create effective source files list - -# -- main library -libvmime_sel_sources = [] + libvmime_sources - -# -- messaging module -if env['with_messaging'] == 'yes': - # -- Add common files for messaging support - for file in libvmime_messaging_sources: - libvmime_sel_sources.append(file) - - # -- Add protocol specific source files - for proto in messaging_protocols: - for protosrc in libvmime_messaging_proto_sources: - if protosrc[0] == proto: - for file in protosrc[1]: - libvmime_sel_sources.append(file) - -# -- SASL support -if env['with_sasl'] == 'yes': - for file in libvmime_security_sasl_sources: - libvmime_sel_sources.append(file) - -# -- TLS support -if env['with_tls'] == 'yes': - for file in libvmime_net_tls_sources: - libvmime_sel_sources.append(file) - -# -- platform handlers -for platform in platforms: - files = libvmime_platforms_sources[platform] - - for file in files: - libvmime_sel_sources.append(file) - -# Split source files list into two lists: .CPP and .HPP -libvmime_sources_CPP = [ ] -libvmime_sources_HPP = [ ] - -libvmime_install_includes = [ ] - -for file in libvmime_sel_sources: - slash = string.rfind(file, '/') - dir = '' - - if slash != -1: - dir = file[0:slash] + '/' - - if file[-4:] == '.hpp': - libvmime_sources_HPP.append(buildDirectory + file) - libvmime_install_includes.append([dir, 'vmime/' + file, file]) - else: - if file[-4:] == '.cpp': - libvmime_sources_CPP.append(buildDirectory + file) - -# HACK: SCons does not allow '.' in target name, so we have to -# detect the suffix for library name and add it ourself -#libFoo = env.StaticLibrary(target = 'FOO', source = []) -#libNameSuffix = ''; -# -#if str(libFoo[0]).rfind('.') != -1: -# libNameSuffix = str(libFoo[0])[str(libFoo[0]).rfind('.'):] - -# Static library build -if env['debug'] == 'yes': - libVmime = env.StaticLibrary( - target = packageVersionedGenericName + '-debug', - source = libvmime_sources_CPP - ) -else: - libVmime = env.StaticLibrary( - target = packageVersionedGenericName, - source = libvmime_sources_CPP - ) - -Default(libVmime) - -# Tests -if env['build_tests'] == 'yes': - if env['debug'] == 'yes': - env = env.Clone() - env.Append(LIBS = ['cppunit', 'dl', packageVersionedGenericName + '-debug', 'pthread']) - env.Append(LIBPATH=['.']) - - if sys.platform == "mac" or sys.platform == "darwin": - env.Append(LIBS = ['iconv', 'gcrypt']) - - Default( - env.Program( - target = 'run-tests', - source = libvmimetest_sources - ) - ) - else: - print 'Debug mode must be enabled to build tests!' - Exit(1) - - -################### -# Documentation # -################### - -doxygenDocPath = '(doxygen-generated-files)' - -env.DoxygenDoc(doxygenDocPath, 'vmime.doxygen') -env.Alias('doc', doxygenDocPath) - - -################ -# Unit tests # -################ - -def runTests(target, source, env): - os.system("./run-tests") - return None - - -runTestsBuilder = Builder(action = runTests) -env.Append(BUILDERS = { 'RunTests' : runTestsBuilder }) - -env.Alias('run-tests', env.RunTests('foo', 'SConstruct')) - diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index 0abf5155..4782f67a 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -1,11 +1,11 @@ # Installing headers and preserving the directory structure # Found here: http://www.semipol.de/archives/251 -MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST COMPONENT_NAME) +MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST COMPONENT_NAME REMOVE_PREFIX) FOREACH(HEADER ${${HEADER_LIST}}) STRING(REGEX MATCH "(.*)[/\\]" DIR ${HEADER}) - STRING(REPLACE "${CMAKE_SOURCE_DIR}/" "" DIR ${DIR}) + STRING(REPLACE "${CMAKE_SOURCE_DIR}/${REMOVE_PREFIX}" "" DIR ${DIR}) INSTALL(FILES ${HEADER} DESTINATION include/${DIR} COMPONENT ${COMPONENT_NAME}) ENDFOREACH(HEADER) diff --git a/examples/README b/examples/README deleted file mode 100644 index 4f58b1fd..00000000 --- a/examples/README +++ /dev/null @@ -1,12 +0,0 @@ -========================================= -Instructions for compiling VMime examples -========================================= - -1) Configure, compile and install vmime library - -2) Compile the sample programs with: - $ g++ -o exampleX exampleX.cpp `pkg-config libvmime` - -3) For a more complete documentation, please visit: - http://www.vmime.org/documentation/ - diff --git a/src/address.cpp b/src/vmime/address.cpp similarity index 100% rename from src/address.cpp rename to src/vmime/address.cpp diff --git a/vmime/address.hpp b/src/vmime/address.hpp similarity index 100% rename from vmime/address.hpp rename to src/vmime/address.hpp diff --git a/src/addressList.cpp b/src/vmime/addressList.cpp similarity index 100% rename from src/addressList.cpp rename to src/vmime/addressList.cpp diff --git a/vmime/addressList.hpp b/src/vmime/addressList.hpp similarity index 100% rename from vmime/addressList.hpp rename to src/vmime/addressList.hpp diff --git a/vmime/attachment.hpp b/src/vmime/attachment.hpp similarity index 100% rename from vmime/attachment.hpp rename to src/vmime/attachment.hpp diff --git a/src/attachmentHelper.cpp b/src/vmime/attachmentHelper.cpp similarity index 100% rename from src/attachmentHelper.cpp rename to src/vmime/attachmentHelper.cpp diff --git a/vmime/attachmentHelper.hpp b/src/vmime/attachmentHelper.hpp similarity index 100% rename from vmime/attachmentHelper.hpp rename to src/vmime/attachmentHelper.hpp diff --git a/src/base.cpp b/src/vmime/base.cpp similarity index 100% rename from src/base.cpp rename to src/vmime/base.cpp diff --git a/vmime/base.hpp b/src/vmime/base.hpp similarity index 100% rename from vmime/base.hpp rename to src/vmime/base.hpp diff --git a/src/body.cpp b/src/vmime/body.cpp similarity index 100% rename from src/body.cpp rename to src/vmime/body.cpp diff --git a/vmime/body.hpp b/src/vmime/body.hpp similarity index 100% rename from vmime/body.hpp rename to src/vmime/body.hpp diff --git a/src/bodyPart.cpp b/src/vmime/bodyPart.cpp similarity index 100% rename from src/bodyPart.cpp rename to src/vmime/bodyPart.cpp diff --git a/vmime/bodyPart.hpp b/src/vmime/bodyPart.hpp similarity index 100% rename from vmime/bodyPart.hpp rename to src/vmime/bodyPart.hpp diff --git a/src/bodyPartAttachment.cpp b/src/vmime/bodyPartAttachment.cpp similarity index 100% rename from src/bodyPartAttachment.cpp rename to src/vmime/bodyPartAttachment.cpp diff --git a/vmime/bodyPartAttachment.hpp b/src/vmime/bodyPartAttachment.hpp similarity index 100% rename from vmime/bodyPartAttachment.hpp rename to src/vmime/bodyPartAttachment.hpp diff --git a/src/charset.cpp b/src/vmime/charset.cpp similarity index 100% rename from src/charset.cpp rename to src/vmime/charset.cpp diff --git a/vmime/charset.hpp b/src/vmime/charset.hpp similarity index 100% rename from vmime/charset.hpp rename to src/vmime/charset.hpp diff --git a/src/charsetConverter.cpp b/src/vmime/charsetConverter.cpp similarity index 100% rename from src/charsetConverter.cpp rename to src/vmime/charsetConverter.cpp diff --git a/vmime/charsetConverter.hpp b/src/vmime/charsetConverter.hpp similarity index 100% rename from vmime/charsetConverter.hpp rename to src/vmime/charsetConverter.hpp diff --git a/src/charsetConverterOptions.cpp b/src/vmime/charsetConverterOptions.cpp similarity index 100% rename from src/charsetConverterOptions.cpp rename to src/vmime/charsetConverterOptions.cpp diff --git a/vmime/charsetConverterOptions.hpp b/src/vmime/charsetConverterOptions.hpp similarity index 100% rename from vmime/charsetConverterOptions.hpp rename to src/vmime/charsetConverterOptions.hpp diff --git a/src/charsetConverter_iconv.cpp b/src/vmime/charsetConverter_iconv.cpp similarity index 100% rename from src/charsetConverter_iconv.cpp rename to src/vmime/charsetConverter_iconv.cpp diff --git a/vmime/charsetConverter_iconv.hpp b/src/vmime/charsetConverter_iconv.hpp similarity index 100% rename from vmime/charsetConverter_iconv.hpp rename to src/vmime/charsetConverter_iconv.hpp diff --git a/src/charsetConverter_icu.cpp b/src/vmime/charsetConverter_icu.cpp similarity index 100% rename from src/charsetConverter_icu.cpp rename to src/vmime/charsetConverter_icu.cpp diff --git a/vmime/charsetConverter_icu.hpp b/src/vmime/charsetConverter_icu.hpp similarity index 100% rename from vmime/charsetConverter_icu.hpp rename to src/vmime/charsetConverter_icu.hpp diff --git a/src/charsetConverter_idna.cpp b/src/vmime/charsetConverter_idna.cpp similarity index 100% rename from src/charsetConverter_idna.cpp rename to src/vmime/charsetConverter_idna.cpp diff --git a/vmime/charsetConverter_idna.hpp b/src/vmime/charsetConverter_idna.hpp similarity index 100% rename from vmime/charsetConverter_idna.hpp rename to src/vmime/charsetConverter_idna.hpp diff --git a/src/component.cpp b/src/vmime/component.cpp similarity index 100% rename from src/component.cpp rename to src/vmime/component.cpp diff --git a/vmime/component.hpp b/src/vmime/component.hpp similarity index 100% rename from vmime/component.hpp rename to src/vmime/component.hpp diff --git a/src/constants.cpp b/src/vmime/constants.cpp similarity index 100% rename from src/constants.cpp rename to src/vmime/constants.cpp diff --git a/vmime/constants.hpp b/src/vmime/constants.hpp similarity index 100% rename from vmime/constants.hpp rename to src/vmime/constants.hpp diff --git a/src/contentDisposition.cpp b/src/vmime/contentDisposition.cpp similarity index 100% rename from src/contentDisposition.cpp rename to src/vmime/contentDisposition.cpp diff --git a/vmime/contentDisposition.hpp b/src/vmime/contentDisposition.hpp similarity index 100% rename from vmime/contentDisposition.hpp rename to src/vmime/contentDisposition.hpp diff --git a/src/contentDispositionField.cpp b/src/vmime/contentDispositionField.cpp similarity index 100% rename from src/contentDispositionField.cpp rename to src/vmime/contentDispositionField.cpp diff --git a/vmime/contentDispositionField.hpp b/src/vmime/contentDispositionField.hpp similarity index 100% rename from vmime/contentDispositionField.hpp rename to src/vmime/contentDispositionField.hpp diff --git a/src/contentHandler.cpp b/src/vmime/contentHandler.cpp similarity index 100% rename from src/contentHandler.cpp rename to src/vmime/contentHandler.cpp diff --git a/vmime/contentHandler.hpp b/src/vmime/contentHandler.hpp similarity index 100% rename from vmime/contentHandler.hpp rename to src/vmime/contentHandler.hpp diff --git a/src/contentTypeField.cpp b/src/vmime/contentTypeField.cpp similarity index 100% rename from src/contentTypeField.cpp rename to src/vmime/contentTypeField.cpp diff --git a/vmime/contentTypeField.hpp b/src/vmime/contentTypeField.hpp similarity index 100% rename from vmime/contentTypeField.hpp rename to src/vmime/contentTypeField.hpp diff --git a/src/context.cpp b/src/vmime/context.cpp similarity index 100% rename from src/context.cpp rename to src/vmime/context.cpp diff --git a/vmime/context.hpp b/src/vmime/context.hpp similarity index 100% rename from vmime/context.hpp rename to src/vmime/context.hpp diff --git a/src/dateTime.cpp b/src/vmime/dateTime.cpp similarity index 100% rename from src/dateTime.cpp rename to src/vmime/dateTime.cpp diff --git a/vmime/dateTime.hpp b/src/vmime/dateTime.hpp similarity index 100% rename from vmime/dateTime.hpp rename to src/vmime/dateTime.hpp diff --git a/src/defaultAttachment.cpp b/src/vmime/defaultAttachment.cpp similarity index 100% rename from src/defaultAttachment.cpp rename to src/vmime/defaultAttachment.cpp diff --git a/vmime/defaultAttachment.hpp b/src/vmime/defaultAttachment.hpp similarity index 100% rename from vmime/defaultAttachment.hpp rename to src/vmime/defaultAttachment.hpp diff --git a/src/disposition.cpp b/src/vmime/disposition.cpp similarity index 100% rename from src/disposition.cpp rename to src/vmime/disposition.cpp diff --git a/vmime/disposition.hpp b/src/vmime/disposition.hpp similarity index 100% rename from vmime/disposition.hpp rename to src/vmime/disposition.hpp diff --git a/src/emailAddress.cpp b/src/vmime/emailAddress.cpp similarity index 100% rename from src/emailAddress.cpp rename to src/vmime/emailAddress.cpp diff --git a/vmime/emailAddress.hpp b/src/vmime/emailAddress.hpp similarity index 100% rename from vmime/emailAddress.hpp rename to src/vmime/emailAddress.hpp diff --git a/src/emptyContentHandler.cpp b/src/vmime/emptyContentHandler.cpp similarity index 100% rename from src/emptyContentHandler.cpp rename to src/vmime/emptyContentHandler.cpp diff --git a/vmime/emptyContentHandler.hpp b/src/vmime/emptyContentHandler.hpp similarity index 100% rename from vmime/emptyContentHandler.hpp rename to src/vmime/emptyContentHandler.hpp diff --git a/src/encoding.cpp b/src/vmime/encoding.cpp similarity index 100% rename from src/encoding.cpp rename to src/vmime/encoding.cpp diff --git a/vmime/encoding.hpp b/src/vmime/encoding.hpp similarity index 100% rename from vmime/encoding.hpp rename to src/vmime/encoding.hpp diff --git a/src/exception.cpp b/src/vmime/exception.cpp similarity index 100% rename from src/exception.cpp rename to src/vmime/exception.cpp diff --git a/vmime/exception.hpp b/src/vmime/exception.hpp similarity index 100% rename from vmime/exception.hpp rename to src/vmime/exception.hpp diff --git a/vmime/export.hpp b/src/vmime/export.hpp similarity index 100% rename from vmime/export.hpp rename to src/vmime/export.hpp diff --git a/src/fileAttachment.cpp b/src/vmime/fileAttachment.cpp similarity index 100% rename from src/fileAttachment.cpp rename to src/vmime/fileAttachment.cpp diff --git a/vmime/fileAttachment.hpp b/src/vmime/fileAttachment.hpp similarity index 100% rename from vmime/fileAttachment.hpp rename to src/vmime/fileAttachment.hpp diff --git a/src/fileContentHandler.cpp b/src/vmime/fileContentHandler.cpp similarity index 100% rename from src/fileContentHandler.cpp rename to src/vmime/fileContentHandler.cpp diff --git a/vmime/fileContentHandler.hpp b/src/vmime/fileContentHandler.hpp similarity index 100% rename from vmime/fileContentHandler.hpp rename to src/vmime/fileContentHandler.hpp diff --git a/src/generatedMessageAttachment.cpp b/src/vmime/generatedMessageAttachment.cpp similarity index 100% rename from src/generatedMessageAttachment.cpp rename to src/vmime/generatedMessageAttachment.cpp diff --git a/vmime/generatedMessageAttachment.hpp b/src/vmime/generatedMessageAttachment.hpp similarity index 100% rename from vmime/generatedMessageAttachment.hpp rename to src/vmime/generatedMessageAttachment.hpp diff --git a/src/generationContext.cpp b/src/vmime/generationContext.cpp similarity index 100% rename from src/generationContext.cpp rename to src/vmime/generationContext.cpp diff --git a/vmime/generationContext.hpp b/src/vmime/generationContext.hpp similarity index 100% rename from vmime/generationContext.hpp rename to src/vmime/generationContext.hpp diff --git a/src/header.cpp b/src/vmime/header.cpp similarity index 100% rename from src/header.cpp rename to src/vmime/header.cpp diff --git a/vmime/header.hpp b/src/vmime/header.hpp similarity index 100% rename from vmime/header.hpp rename to src/vmime/header.hpp diff --git a/src/headerField.cpp b/src/vmime/headerField.cpp similarity index 100% rename from src/headerField.cpp rename to src/vmime/headerField.cpp diff --git a/vmime/headerField.hpp b/src/vmime/headerField.hpp similarity index 100% rename from vmime/headerField.hpp rename to src/vmime/headerField.hpp diff --git a/src/headerFieldFactory.cpp b/src/vmime/headerFieldFactory.cpp similarity index 100% rename from src/headerFieldFactory.cpp rename to src/vmime/headerFieldFactory.cpp diff --git a/vmime/headerFieldFactory.hpp b/src/vmime/headerFieldFactory.hpp similarity index 100% rename from vmime/headerFieldFactory.hpp rename to src/vmime/headerFieldFactory.hpp diff --git a/src/headerFieldValue.cpp b/src/vmime/headerFieldValue.cpp similarity index 100% rename from src/headerFieldValue.cpp rename to src/vmime/headerFieldValue.cpp diff --git a/vmime/headerFieldValue.hpp b/src/vmime/headerFieldValue.hpp similarity index 100% rename from vmime/headerFieldValue.hpp rename to src/vmime/headerFieldValue.hpp diff --git a/src/htmlTextPart.cpp b/src/vmime/htmlTextPart.cpp similarity index 100% rename from src/htmlTextPart.cpp rename to src/vmime/htmlTextPart.cpp diff --git a/vmime/htmlTextPart.hpp b/src/vmime/htmlTextPart.hpp similarity index 100% rename from vmime/htmlTextPart.hpp rename to src/vmime/htmlTextPart.hpp diff --git a/src/mailbox.cpp b/src/vmime/mailbox.cpp similarity index 100% rename from src/mailbox.cpp rename to src/vmime/mailbox.cpp diff --git a/vmime/mailbox.hpp b/src/vmime/mailbox.hpp similarity index 100% rename from vmime/mailbox.hpp rename to src/vmime/mailbox.hpp diff --git a/src/mailboxField.cpp b/src/vmime/mailboxField.cpp similarity index 100% rename from src/mailboxField.cpp rename to src/vmime/mailboxField.cpp diff --git a/vmime/mailboxField.hpp b/src/vmime/mailboxField.hpp similarity index 100% rename from vmime/mailboxField.hpp rename to src/vmime/mailboxField.hpp diff --git a/src/mailboxGroup.cpp b/src/vmime/mailboxGroup.cpp similarity index 100% rename from src/mailboxGroup.cpp rename to src/vmime/mailboxGroup.cpp diff --git a/vmime/mailboxGroup.hpp b/src/vmime/mailboxGroup.hpp similarity index 100% rename from vmime/mailboxGroup.hpp rename to src/vmime/mailboxGroup.hpp diff --git a/src/mailboxList.cpp b/src/vmime/mailboxList.cpp similarity index 100% rename from src/mailboxList.cpp rename to src/vmime/mailboxList.cpp diff --git a/vmime/mailboxList.hpp b/src/vmime/mailboxList.hpp similarity index 100% rename from vmime/mailboxList.hpp rename to src/vmime/mailboxList.hpp diff --git a/src/mdn/MDNHelper.cpp b/src/vmime/mdn/MDNHelper.cpp similarity index 100% rename from src/mdn/MDNHelper.cpp rename to src/vmime/mdn/MDNHelper.cpp diff --git a/vmime/mdn/MDNHelper.hpp b/src/vmime/mdn/MDNHelper.hpp similarity index 100% rename from vmime/mdn/MDNHelper.hpp rename to src/vmime/mdn/MDNHelper.hpp diff --git a/src/mdn/MDNInfos.cpp b/src/vmime/mdn/MDNInfos.cpp similarity index 100% rename from src/mdn/MDNInfos.cpp rename to src/vmime/mdn/MDNInfos.cpp diff --git a/vmime/mdn/MDNInfos.hpp b/src/vmime/mdn/MDNInfos.hpp similarity index 100% rename from vmime/mdn/MDNInfos.hpp rename to src/vmime/mdn/MDNInfos.hpp diff --git a/src/mdn/receivedMDNInfos.cpp b/src/vmime/mdn/receivedMDNInfos.cpp similarity index 100% rename from src/mdn/receivedMDNInfos.cpp rename to src/vmime/mdn/receivedMDNInfos.cpp diff --git a/vmime/mdn/receivedMDNInfos.hpp b/src/vmime/mdn/receivedMDNInfos.hpp similarity index 100% rename from vmime/mdn/receivedMDNInfos.hpp rename to src/vmime/mdn/receivedMDNInfos.hpp diff --git a/src/mdn/sendableMDNInfos.cpp b/src/vmime/mdn/sendableMDNInfos.cpp similarity index 100% rename from src/mdn/sendableMDNInfos.cpp rename to src/vmime/mdn/sendableMDNInfos.cpp diff --git a/vmime/mdn/sendableMDNInfos.hpp b/src/vmime/mdn/sendableMDNInfos.hpp similarity index 100% rename from vmime/mdn/sendableMDNInfos.hpp rename to src/vmime/mdn/sendableMDNInfos.hpp diff --git a/src/mediaType.cpp b/src/vmime/mediaType.cpp similarity index 100% rename from src/mediaType.cpp rename to src/vmime/mediaType.cpp diff --git a/vmime/mediaType.hpp b/src/vmime/mediaType.hpp similarity index 100% rename from vmime/mediaType.hpp rename to src/vmime/mediaType.hpp diff --git a/src/message.cpp b/src/vmime/message.cpp similarity index 100% rename from src/message.cpp rename to src/vmime/message.cpp diff --git a/vmime/message.hpp b/src/vmime/message.hpp similarity index 100% rename from vmime/message.hpp rename to src/vmime/message.hpp diff --git a/vmime/messageAttachment.hpp b/src/vmime/messageAttachment.hpp similarity index 100% rename from vmime/messageAttachment.hpp rename to src/vmime/messageAttachment.hpp diff --git a/src/messageBuilder.cpp b/src/vmime/messageBuilder.cpp similarity index 100% rename from src/messageBuilder.cpp rename to src/vmime/messageBuilder.cpp diff --git a/vmime/messageBuilder.hpp b/src/vmime/messageBuilder.hpp similarity index 100% rename from vmime/messageBuilder.hpp rename to src/vmime/messageBuilder.hpp diff --git a/src/messageId.cpp b/src/vmime/messageId.cpp similarity index 100% rename from src/messageId.cpp rename to src/vmime/messageId.cpp diff --git a/vmime/messageId.hpp b/src/vmime/messageId.hpp similarity index 100% rename from vmime/messageId.hpp rename to src/vmime/messageId.hpp diff --git a/src/messageIdSequence.cpp b/src/vmime/messageIdSequence.cpp similarity index 100% rename from src/messageIdSequence.cpp rename to src/vmime/messageIdSequence.cpp diff --git a/vmime/messageIdSequence.hpp b/src/vmime/messageIdSequence.hpp similarity index 100% rename from vmime/messageIdSequence.hpp rename to src/vmime/messageIdSequence.hpp diff --git a/src/messageParser.cpp b/src/vmime/messageParser.cpp similarity index 100% rename from src/messageParser.cpp rename to src/vmime/messageParser.cpp diff --git a/vmime/messageParser.hpp b/src/vmime/messageParser.hpp similarity index 100% rename from vmime/messageParser.hpp rename to src/vmime/messageParser.hpp diff --git a/src/misc/importanceHelper.cpp b/src/vmime/misc/importanceHelper.cpp similarity index 100% rename from src/misc/importanceHelper.cpp rename to src/vmime/misc/importanceHelper.cpp diff --git a/vmime/misc/importanceHelper.hpp b/src/vmime/misc/importanceHelper.hpp similarity index 100% rename from vmime/misc/importanceHelper.hpp rename to src/vmime/misc/importanceHelper.hpp diff --git a/src/net/builtinServices.inl b/src/vmime/net/builtinServices.inl similarity index 98% rename from src/net/builtinServices.inl rename to src/vmime/net/builtinServices.inl index 9225ff30..fa2f3fe3 100644 --- a/src/net/builtinServices.inl +++ b/src/vmime/net/builtinServices.inl @@ -23,7 +23,7 @@ // Include registration helpers -#include "src/net/serviceRegistration.inl" +#include "vmime/net/serviceRegistration.inl" #ifndef VMIME_BUILDING_DOC diff --git a/vmime/net/connectionInfos.hpp b/src/vmime/net/connectionInfos.hpp similarity index 100% rename from vmime/net/connectionInfos.hpp rename to src/vmime/net/connectionInfos.hpp diff --git a/src/net/defaultConnectionInfos.cpp b/src/vmime/net/defaultConnectionInfos.cpp similarity index 100% rename from src/net/defaultConnectionInfos.cpp rename to src/vmime/net/defaultConnectionInfos.cpp diff --git a/vmime/net/defaultConnectionInfos.hpp b/src/vmime/net/defaultConnectionInfos.hpp similarity index 100% rename from vmime/net/defaultConnectionInfos.hpp rename to src/vmime/net/defaultConnectionInfos.hpp diff --git a/src/net/events.cpp b/src/vmime/net/events.cpp similarity index 100% rename from src/net/events.cpp rename to src/vmime/net/events.cpp diff --git a/vmime/net/events.hpp b/src/vmime/net/events.hpp similarity index 100% rename from vmime/net/events.hpp rename to src/vmime/net/events.hpp diff --git a/src/net/fetchAttributes.cpp b/src/vmime/net/fetchAttributes.cpp similarity index 100% rename from src/net/fetchAttributes.cpp rename to src/vmime/net/fetchAttributes.cpp diff --git a/vmime/net/fetchAttributes.hpp b/src/vmime/net/fetchAttributes.hpp similarity index 100% rename from vmime/net/fetchAttributes.hpp rename to src/vmime/net/fetchAttributes.hpp diff --git a/src/net/folder.cpp b/src/vmime/net/folder.cpp similarity index 100% rename from src/net/folder.cpp rename to src/vmime/net/folder.cpp diff --git a/vmime/net/folder.hpp b/src/vmime/net/folder.hpp similarity index 100% rename from vmime/net/folder.hpp rename to src/vmime/net/folder.hpp diff --git a/vmime/net/folderStatus.hpp b/src/vmime/net/folderStatus.hpp similarity index 100% rename from vmime/net/folderStatus.hpp rename to src/vmime/net/folderStatus.hpp diff --git a/src/net/imap/IMAPConnection.cpp b/src/vmime/net/imap/IMAPConnection.cpp similarity index 100% rename from src/net/imap/IMAPConnection.cpp rename to src/vmime/net/imap/IMAPConnection.cpp diff --git a/vmime/net/imap/IMAPConnection.hpp b/src/vmime/net/imap/IMAPConnection.hpp similarity index 100% rename from vmime/net/imap/IMAPConnection.hpp rename to src/vmime/net/imap/IMAPConnection.hpp diff --git a/src/net/imap/IMAPFolder.cpp b/src/vmime/net/imap/IMAPFolder.cpp similarity index 100% rename from src/net/imap/IMAPFolder.cpp rename to src/vmime/net/imap/IMAPFolder.cpp diff --git a/vmime/net/imap/IMAPFolder.hpp b/src/vmime/net/imap/IMAPFolder.hpp similarity index 100% rename from vmime/net/imap/IMAPFolder.hpp rename to src/vmime/net/imap/IMAPFolder.hpp diff --git a/src/net/imap/IMAPFolderStatus.cpp b/src/vmime/net/imap/IMAPFolderStatus.cpp similarity index 100% rename from src/net/imap/IMAPFolderStatus.cpp rename to src/vmime/net/imap/IMAPFolderStatus.cpp diff --git a/vmime/net/imap/IMAPFolderStatus.hpp b/src/vmime/net/imap/IMAPFolderStatus.hpp similarity index 100% rename from vmime/net/imap/IMAPFolderStatus.hpp rename to src/vmime/net/imap/IMAPFolderStatus.hpp diff --git a/src/net/imap/IMAPMessage.cpp b/src/vmime/net/imap/IMAPMessage.cpp similarity index 100% rename from src/net/imap/IMAPMessage.cpp rename to src/vmime/net/imap/IMAPMessage.cpp diff --git a/vmime/net/imap/IMAPMessage.hpp b/src/vmime/net/imap/IMAPMessage.hpp similarity index 100% rename from vmime/net/imap/IMAPMessage.hpp rename to src/vmime/net/imap/IMAPMessage.hpp diff --git a/src/net/imap/IMAPMessagePart.cpp b/src/vmime/net/imap/IMAPMessagePart.cpp similarity index 100% rename from src/net/imap/IMAPMessagePart.cpp rename to src/vmime/net/imap/IMAPMessagePart.cpp diff --git a/vmime/net/imap/IMAPMessagePart.hpp b/src/vmime/net/imap/IMAPMessagePart.hpp similarity index 100% rename from vmime/net/imap/IMAPMessagePart.hpp rename to src/vmime/net/imap/IMAPMessagePart.hpp diff --git a/src/net/imap/IMAPMessagePartContentHandler.cpp b/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp similarity index 100% rename from src/net/imap/IMAPMessagePartContentHandler.cpp rename to src/vmime/net/imap/IMAPMessagePartContentHandler.cpp diff --git a/vmime/net/imap/IMAPMessagePartContentHandler.hpp b/src/vmime/net/imap/IMAPMessagePartContentHandler.hpp similarity index 100% rename from vmime/net/imap/IMAPMessagePartContentHandler.hpp rename to src/vmime/net/imap/IMAPMessagePartContentHandler.hpp diff --git a/src/net/imap/IMAPMessageStructure.cpp b/src/vmime/net/imap/IMAPMessageStructure.cpp similarity index 100% rename from src/net/imap/IMAPMessageStructure.cpp rename to src/vmime/net/imap/IMAPMessageStructure.cpp diff --git a/vmime/net/imap/IMAPMessageStructure.hpp b/src/vmime/net/imap/IMAPMessageStructure.hpp similarity index 100% rename from vmime/net/imap/IMAPMessageStructure.hpp rename to src/vmime/net/imap/IMAPMessageStructure.hpp diff --git a/vmime/net/imap/IMAPParser.hpp b/src/vmime/net/imap/IMAPParser.hpp similarity index 100% rename from vmime/net/imap/IMAPParser.hpp rename to src/vmime/net/imap/IMAPParser.hpp diff --git a/src/net/imap/IMAPSStore.cpp b/src/vmime/net/imap/IMAPSStore.cpp similarity index 100% rename from src/net/imap/IMAPSStore.cpp rename to src/vmime/net/imap/IMAPSStore.cpp diff --git a/vmime/net/imap/IMAPSStore.hpp b/src/vmime/net/imap/IMAPSStore.hpp similarity index 100% rename from vmime/net/imap/IMAPSStore.hpp rename to src/vmime/net/imap/IMAPSStore.hpp diff --git a/src/net/imap/IMAPServiceInfos.cpp b/src/vmime/net/imap/IMAPServiceInfos.cpp similarity index 100% rename from src/net/imap/IMAPServiceInfos.cpp rename to src/vmime/net/imap/IMAPServiceInfos.cpp diff --git a/vmime/net/imap/IMAPServiceInfos.hpp b/src/vmime/net/imap/IMAPServiceInfos.hpp similarity index 100% rename from vmime/net/imap/IMAPServiceInfos.hpp rename to src/vmime/net/imap/IMAPServiceInfos.hpp diff --git a/src/net/imap/IMAPStore.cpp b/src/vmime/net/imap/IMAPStore.cpp similarity index 100% rename from src/net/imap/IMAPStore.cpp rename to src/vmime/net/imap/IMAPStore.cpp diff --git a/vmime/net/imap/IMAPStore.hpp b/src/vmime/net/imap/IMAPStore.hpp similarity index 100% rename from vmime/net/imap/IMAPStore.hpp rename to src/vmime/net/imap/IMAPStore.hpp diff --git a/src/net/imap/IMAPTag.cpp b/src/vmime/net/imap/IMAPTag.cpp similarity index 100% rename from src/net/imap/IMAPTag.cpp rename to src/vmime/net/imap/IMAPTag.cpp diff --git a/vmime/net/imap/IMAPTag.hpp b/src/vmime/net/imap/IMAPTag.hpp similarity index 100% rename from vmime/net/imap/IMAPTag.hpp rename to src/vmime/net/imap/IMAPTag.hpp diff --git a/src/net/imap/IMAPUtils.cpp b/src/vmime/net/imap/IMAPUtils.cpp similarity index 100% rename from src/net/imap/IMAPUtils.cpp rename to src/vmime/net/imap/IMAPUtils.cpp diff --git a/vmime/net/imap/IMAPUtils.hpp b/src/vmime/net/imap/IMAPUtils.hpp similarity index 100% rename from vmime/net/imap/IMAPUtils.hpp rename to src/vmime/net/imap/IMAPUtils.hpp diff --git a/vmime/net/imap/imap.hpp b/src/vmime/net/imap/imap.hpp similarity index 100% rename from vmime/net/imap/imap.hpp rename to src/vmime/net/imap/imap.hpp diff --git a/src/net/maildir/format/courierMaildirFormat.cpp b/src/vmime/net/maildir/format/courierMaildirFormat.cpp similarity index 100% rename from src/net/maildir/format/courierMaildirFormat.cpp rename to src/vmime/net/maildir/format/courierMaildirFormat.cpp diff --git a/vmime/net/maildir/format/courierMaildirFormat.hpp b/src/vmime/net/maildir/format/courierMaildirFormat.hpp similarity index 100% rename from vmime/net/maildir/format/courierMaildirFormat.hpp rename to src/vmime/net/maildir/format/courierMaildirFormat.hpp diff --git a/src/net/maildir/format/kmailMaildirFormat.cpp b/src/vmime/net/maildir/format/kmailMaildirFormat.cpp similarity index 100% rename from src/net/maildir/format/kmailMaildirFormat.cpp rename to src/vmime/net/maildir/format/kmailMaildirFormat.cpp diff --git a/vmime/net/maildir/format/kmailMaildirFormat.hpp b/src/vmime/net/maildir/format/kmailMaildirFormat.hpp similarity index 100% rename from vmime/net/maildir/format/kmailMaildirFormat.hpp rename to src/vmime/net/maildir/format/kmailMaildirFormat.hpp diff --git a/vmime/net/maildir/maildir.hpp b/src/vmime/net/maildir/maildir.hpp similarity index 100% rename from vmime/net/maildir/maildir.hpp rename to src/vmime/net/maildir/maildir.hpp diff --git a/src/net/maildir/maildirFolder.cpp b/src/vmime/net/maildir/maildirFolder.cpp similarity index 100% rename from src/net/maildir/maildirFolder.cpp rename to src/vmime/net/maildir/maildirFolder.cpp diff --git a/vmime/net/maildir/maildirFolder.hpp b/src/vmime/net/maildir/maildirFolder.hpp similarity index 100% rename from vmime/net/maildir/maildirFolder.hpp rename to src/vmime/net/maildir/maildirFolder.hpp diff --git a/src/net/maildir/maildirFolderStatus.cpp b/src/vmime/net/maildir/maildirFolderStatus.cpp similarity index 100% rename from src/net/maildir/maildirFolderStatus.cpp rename to src/vmime/net/maildir/maildirFolderStatus.cpp diff --git a/vmime/net/maildir/maildirFolderStatus.hpp b/src/vmime/net/maildir/maildirFolderStatus.hpp similarity index 100% rename from vmime/net/maildir/maildirFolderStatus.hpp rename to src/vmime/net/maildir/maildirFolderStatus.hpp diff --git a/src/net/maildir/maildirFormat.cpp b/src/vmime/net/maildir/maildirFormat.cpp similarity index 100% rename from src/net/maildir/maildirFormat.cpp rename to src/vmime/net/maildir/maildirFormat.cpp diff --git a/vmime/net/maildir/maildirFormat.hpp b/src/vmime/net/maildir/maildirFormat.hpp similarity index 100% rename from vmime/net/maildir/maildirFormat.hpp rename to src/vmime/net/maildir/maildirFormat.hpp diff --git a/src/net/maildir/maildirMessage.cpp b/src/vmime/net/maildir/maildirMessage.cpp similarity index 100% rename from src/net/maildir/maildirMessage.cpp rename to src/vmime/net/maildir/maildirMessage.cpp diff --git a/vmime/net/maildir/maildirMessage.hpp b/src/vmime/net/maildir/maildirMessage.hpp similarity index 100% rename from vmime/net/maildir/maildirMessage.hpp rename to src/vmime/net/maildir/maildirMessage.hpp diff --git a/src/net/maildir/maildirMessagePart.cpp b/src/vmime/net/maildir/maildirMessagePart.cpp similarity index 100% rename from src/net/maildir/maildirMessagePart.cpp rename to src/vmime/net/maildir/maildirMessagePart.cpp diff --git a/vmime/net/maildir/maildirMessagePart.hpp b/src/vmime/net/maildir/maildirMessagePart.hpp similarity index 100% rename from vmime/net/maildir/maildirMessagePart.hpp rename to src/vmime/net/maildir/maildirMessagePart.hpp diff --git a/src/net/maildir/maildirMessageStructure.cpp b/src/vmime/net/maildir/maildirMessageStructure.cpp similarity index 100% rename from src/net/maildir/maildirMessageStructure.cpp rename to src/vmime/net/maildir/maildirMessageStructure.cpp diff --git a/vmime/net/maildir/maildirMessageStructure.hpp b/src/vmime/net/maildir/maildirMessageStructure.hpp similarity index 100% rename from vmime/net/maildir/maildirMessageStructure.hpp rename to src/vmime/net/maildir/maildirMessageStructure.hpp diff --git a/src/net/maildir/maildirServiceInfos.cpp b/src/vmime/net/maildir/maildirServiceInfos.cpp similarity index 100% rename from src/net/maildir/maildirServiceInfos.cpp rename to src/vmime/net/maildir/maildirServiceInfos.cpp diff --git a/vmime/net/maildir/maildirServiceInfos.hpp b/src/vmime/net/maildir/maildirServiceInfos.hpp similarity index 100% rename from vmime/net/maildir/maildirServiceInfos.hpp rename to src/vmime/net/maildir/maildirServiceInfos.hpp diff --git a/src/net/maildir/maildirStore.cpp b/src/vmime/net/maildir/maildirStore.cpp similarity index 100% rename from src/net/maildir/maildirStore.cpp rename to src/vmime/net/maildir/maildirStore.cpp diff --git a/vmime/net/maildir/maildirStore.hpp b/src/vmime/net/maildir/maildirStore.hpp similarity index 100% rename from vmime/net/maildir/maildirStore.hpp rename to src/vmime/net/maildir/maildirStore.hpp diff --git a/src/net/maildir/maildirUtils.cpp b/src/vmime/net/maildir/maildirUtils.cpp similarity index 100% rename from src/net/maildir/maildirUtils.cpp rename to src/vmime/net/maildir/maildirUtils.cpp diff --git a/vmime/net/maildir/maildirUtils.hpp b/src/vmime/net/maildir/maildirUtils.hpp similarity index 100% rename from vmime/net/maildir/maildirUtils.hpp rename to src/vmime/net/maildir/maildirUtils.hpp diff --git a/src/net/message.cpp b/src/vmime/net/message.cpp similarity index 100% rename from src/net/message.cpp rename to src/vmime/net/message.cpp diff --git a/vmime/net/message.hpp b/src/vmime/net/message.hpp similarity index 100% rename from vmime/net/message.hpp rename to src/vmime/net/message.hpp diff --git a/src/net/messageSet.cpp b/src/vmime/net/messageSet.cpp similarity index 100% rename from src/net/messageSet.cpp rename to src/vmime/net/messageSet.cpp diff --git a/vmime/net/messageSet.hpp b/src/vmime/net/messageSet.hpp similarity index 100% rename from vmime/net/messageSet.hpp rename to src/vmime/net/messageSet.hpp diff --git a/src/net/pop3/POP3Command.cpp b/src/vmime/net/pop3/POP3Command.cpp similarity index 100% rename from src/net/pop3/POP3Command.cpp rename to src/vmime/net/pop3/POP3Command.cpp diff --git a/vmime/net/pop3/POP3Command.hpp b/src/vmime/net/pop3/POP3Command.hpp similarity index 100% rename from vmime/net/pop3/POP3Command.hpp rename to src/vmime/net/pop3/POP3Command.hpp diff --git a/src/net/pop3/POP3Connection.cpp b/src/vmime/net/pop3/POP3Connection.cpp similarity index 100% rename from src/net/pop3/POP3Connection.cpp rename to src/vmime/net/pop3/POP3Connection.cpp diff --git a/vmime/net/pop3/POP3Connection.hpp b/src/vmime/net/pop3/POP3Connection.hpp similarity index 100% rename from vmime/net/pop3/POP3Connection.hpp rename to src/vmime/net/pop3/POP3Connection.hpp diff --git a/src/net/pop3/POP3Folder.cpp b/src/vmime/net/pop3/POP3Folder.cpp similarity index 100% rename from src/net/pop3/POP3Folder.cpp rename to src/vmime/net/pop3/POP3Folder.cpp diff --git a/vmime/net/pop3/POP3Folder.hpp b/src/vmime/net/pop3/POP3Folder.hpp similarity index 100% rename from vmime/net/pop3/POP3Folder.hpp rename to src/vmime/net/pop3/POP3Folder.hpp diff --git a/src/net/pop3/POP3FolderStatus.cpp b/src/vmime/net/pop3/POP3FolderStatus.cpp similarity index 100% rename from src/net/pop3/POP3FolderStatus.cpp rename to src/vmime/net/pop3/POP3FolderStatus.cpp diff --git a/vmime/net/pop3/POP3FolderStatus.hpp b/src/vmime/net/pop3/POP3FolderStatus.hpp similarity index 100% rename from vmime/net/pop3/POP3FolderStatus.hpp rename to src/vmime/net/pop3/POP3FolderStatus.hpp diff --git a/src/net/pop3/POP3Message.cpp b/src/vmime/net/pop3/POP3Message.cpp similarity index 100% rename from src/net/pop3/POP3Message.cpp rename to src/vmime/net/pop3/POP3Message.cpp diff --git a/vmime/net/pop3/POP3Message.hpp b/src/vmime/net/pop3/POP3Message.hpp similarity index 100% rename from vmime/net/pop3/POP3Message.hpp rename to src/vmime/net/pop3/POP3Message.hpp diff --git a/src/net/pop3/POP3Response.cpp b/src/vmime/net/pop3/POP3Response.cpp similarity index 100% rename from src/net/pop3/POP3Response.cpp rename to src/vmime/net/pop3/POP3Response.cpp diff --git a/vmime/net/pop3/POP3Response.hpp b/src/vmime/net/pop3/POP3Response.hpp similarity index 100% rename from vmime/net/pop3/POP3Response.hpp rename to src/vmime/net/pop3/POP3Response.hpp diff --git a/src/net/pop3/POP3SStore.cpp b/src/vmime/net/pop3/POP3SStore.cpp similarity index 100% rename from src/net/pop3/POP3SStore.cpp rename to src/vmime/net/pop3/POP3SStore.cpp diff --git a/vmime/net/pop3/POP3SStore.hpp b/src/vmime/net/pop3/POP3SStore.hpp similarity index 100% rename from vmime/net/pop3/POP3SStore.hpp rename to src/vmime/net/pop3/POP3SStore.hpp diff --git a/src/net/pop3/POP3ServiceInfos.cpp b/src/vmime/net/pop3/POP3ServiceInfos.cpp similarity index 100% rename from src/net/pop3/POP3ServiceInfos.cpp rename to src/vmime/net/pop3/POP3ServiceInfos.cpp diff --git a/vmime/net/pop3/POP3ServiceInfos.hpp b/src/vmime/net/pop3/POP3ServiceInfos.hpp similarity index 100% rename from vmime/net/pop3/POP3ServiceInfos.hpp rename to src/vmime/net/pop3/POP3ServiceInfos.hpp diff --git a/src/net/pop3/POP3Store.cpp b/src/vmime/net/pop3/POP3Store.cpp similarity index 100% rename from src/net/pop3/POP3Store.cpp rename to src/vmime/net/pop3/POP3Store.cpp diff --git a/vmime/net/pop3/POP3Store.hpp b/src/vmime/net/pop3/POP3Store.hpp similarity index 100% rename from vmime/net/pop3/POP3Store.hpp rename to src/vmime/net/pop3/POP3Store.hpp diff --git a/src/net/pop3/POP3Utils.cpp b/src/vmime/net/pop3/POP3Utils.cpp similarity index 100% rename from src/net/pop3/POP3Utils.cpp rename to src/vmime/net/pop3/POP3Utils.cpp diff --git a/vmime/net/pop3/POP3Utils.hpp b/src/vmime/net/pop3/POP3Utils.hpp similarity index 100% rename from vmime/net/pop3/POP3Utils.hpp rename to src/vmime/net/pop3/POP3Utils.hpp diff --git a/vmime/net/pop3/pop3.hpp b/src/vmime/net/pop3/pop3.hpp similarity index 100% rename from vmime/net/pop3/pop3.hpp rename to src/vmime/net/pop3/pop3.hpp diff --git a/vmime/net/securedConnectionInfos.hpp b/src/vmime/net/securedConnectionInfos.hpp similarity index 100% rename from vmime/net/securedConnectionInfos.hpp rename to src/vmime/net/securedConnectionInfos.hpp diff --git a/vmime/net/sendmail/sendmail.hpp b/src/vmime/net/sendmail/sendmail.hpp similarity index 100% rename from vmime/net/sendmail/sendmail.hpp rename to src/vmime/net/sendmail/sendmail.hpp diff --git a/src/net/sendmail/sendmailServiceInfos.cpp b/src/vmime/net/sendmail/sendmailServiceInfos.cpp similarity index 100% rename from src/net/sendmail/sendmailServiceInfos.cpp rename to src/vmime/net/sendmail/sendmailServiceInfos.cpp diff --git a/vmime/net/sendmail/sendmailServiceInfos.hpp b/src/vmime/net/sendmail/sendmailServiceInfos.hpp similarity index 100% rename from vmime/net/sendmail/sendmailServiceInfos.hpp rename to src/vmime/net/sendmail/sendmailServiceInfos.hpp diff --git a/src/net/sendmail/sendmailTransport.cpp b/src/vmime/net/sendmail/sendmailTransport.cpp similarity index 100% rename from src/net/sendmail/sendmailTransport.cpp rename to src/vmime/net/sendmail/sendmailTransport.cpp diff --git a/vmime/net/sendmail/sendmailTransport.hpp b/src/vmime/net/sendmail/sendmailTransport.hpp similarity index 100% rename from vmime/net/sendmail/sendmailTransport.hpp rename to src/vmime/net/sendmail/sendmailTransport.hpp diff --git a/src/net/service.cpp b/src/vmime/net/service.cpp similarity index 100% rename from src/net/service.cpp rename to src/vmime/net/service.cpp diff --git a/vmime/net/service.hpp b/src/vmime/net/service.hpp similarity index 100% rename from vmime/net/service.hpp rename to src/vmime/net/service.hpp diff --git a/src/net/serviceFactory.cpp b/src/vmime/net/serviceFactory.cpp similarity index 98% rename from src/net/serviceFactory.cpp rename to src/vmime/net/serviceFactory.cpp index 98aee646..bbc9944a 100644 --- a/src/net/serviceFactory.cpp +++ b/src/vmime/net/serviceFactory.cpp @@ -32,7 +32,7 @@ #include "vmime/exception.hpp" -#include "src/net/builtinServices.inl" +#include "vmime/net/builtinServices.inl" namespace vmime { diff --git a/vmime/net/serviceFactory.hpp b/src/vmime/net/serviceFactory.hpp similarity index 100% rename from vmime/net/serviceFactory.hpp rename to src/vmime/net/serviceFactory.hpp diff --git a/src/net/serviceInfos.cpp b/src/vmime/net/serviceInfos.cpp similarity index 100% rename from src/net/serviceInfos.cpp rename to src/vmime/net/serviceInfos.cpp diff --git a/vmime/net/serviceInfos.hpp b/src/vmime/net/serviceInfos.hpp similarity index 100% rename from vmime/net/serviceInfos.hpp rename to src/vmime/net/serviceInfos.hpp diff --git a/src/net/serviceRegistration.inl b/src/vmime/net/serviceRegistration.inl similarity index 100% rename from src/net/serviceRegistration.inl rename to src/vmime/net/serviceRegistration.inl diff --git a/src/net/session.cpp b/src/vmime/net/session.cpp similarity index 100% rename from src/net/session.cpp rename to src/vmime/net/session.cpp diff --git a/vmime/net/session.hpp b/src/vmime/net/session.hpp similarity index 100% rename from vmime/net/session.hpp rename to src/vmime/net/session.hpp diff --git a/src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp b/src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.cpp similarity index 100% rename from src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp rename to src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.cpp diff --git a/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp b/src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp similarity index 100% rename from vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp rename to src/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp diff --git a/src/net/smtp/SMTPCommand.cpp b/src/vmime/net/smtp/SMTPCommand.cpp similarity index 100% rename from src/net/smtp/SMTPCommand.cpp rename to src/vmime/net/smtp/SMTPCommand.cpp diff --git a/vmime/net/smtp/SMTPCommand.hpp b/src/vmime/net/smtp/SMTPCommand.hpp similarity index 100% rename from vmime/net/smtp/SMTPCommand.hpp rename to src/vmime/net/smtp/SMTPCommand.hpp diff --git a/src/net/smtp/SMTPCommandSet.cpp b/src/vmime/net/smtp/SMTPCommandSet.cpp similarity index 100% rename from src/net/smtp/SMTPCommandSet.cpp rename to src/vmime/net/smtp/SMTPCommandSet.cpp diff --git a/vmime/net/smtp/SMTPCommandSet.hpp b/src/vmime/net/smtp/SMTPCommandSet.hpp similarity index 100% rename from vmime/net/smtp/SMTPCommandSet.hpp rename to src/vmime/net/smtp/SMTPCommandSet.hpp diff --git a/src/net/smtp/SMTPConnection.cpp b/src/vmime/net/smtp/SMTPConnection.cpp similarity index 100% rename from src/net/smtp/SMTPConnection.cpp rename to src/vmime/net/smtp/SMTPConnection.cpp diff --git a/vmime/net/smtp/SMTPConnection.hpp b/src/vmime/net/smtp/SMTPConnection.hpp similarity index 100% rename from vmime/net/smtp/SMTPConnection.hpp rename to src/vmime/net/smtp/SMTPConnection.hpp diff --git a/src/net/smtp/SMTPExceptions.cpp b/src/vmime/net/smtp/SMTPExceptions.cpp similarity index 100% rename from src/net/smtp/SMTPExceptions.cpp rename to src/vmime/net/smtp/SMTPExceptions.cpp diff --git a/vmime/net/smtp/SMTPExceptions.hpp b/src/vmime/net/smtp/SMTPExceptions.hpp similarity index 100% rename from vmime/net/smtp/SMTPExceptions.hpp rename to src/vmime/net/smtp/SMTPExceptions.hpp diff --git a/src/net/smtp/SMTPResponse.cpp b/src/vmime/net/smtp/SMTPResponse.cpp similarity index 100% rename from src/net/smtp/SMTPResponse.cpp rename to src/vmime/net/smtp/SMTPResponse.cpp diff --git a/vmime/net/smtp/SMTPResponse.hpp b/src/vmime/net/smtp/SMTPResponse.hpp similarity index 100% rename from vmime/net/smtp/SMTPResponse.hpp rename to src/vmime/net/smtp/SMTPResponse.hpp diff --git a/src/net/smtp/SMTPSTransport.cpp b/src/vmime/net/smtp/SMTPSTransport.cpp similarity index 100% rename from src/net/smtp/SMTPSTransport.cpp rename to src/vmime/net/smtp/SMTPSTransport.cpp diff --git a/vmime/net/smtp/SMTPSTransport.hpp b/src/vmime/net/smtp/SMTPSTransport.hpp similarity index 100% rename from vmime/net/smtp/SMTPSTransport.hpp rename to src/vmime/net/smtp/SMTPSTransport.hpp diff --git a/src/net/smtp/SMTPServiceInfos.cpp b/src/vmime/net/smtp/SMTPServiceInfos.cpp similarity index 100% rename from src/net/smtp/SMTPServiceInfos.cpp rename to src/vmime/net/smtp/SMTPServiceInfos.cpp diff --git a/vmime/net/smtp/SMTPServiceInfos.hpp b/src/vmime/net/smtp/SMTPServiceInfos.hpp similarity index 100% rename from vmime/net/smtp/SMTPServiceInfos.hpp rename to src/vmime/net/smtp/SMTPServiceInfos.hpp diff --git a/src/net/smtp/SMTPTransport.cpp b/src/vmime/net/smtp/SMTPTransport.cpp similarity index 100% rename from src/net/smtp/SMTPTransport.cpp rename to src/vmime/net/smtp/SMTPTransport.cpp diff --git a/vmime/net/smtp/SMTPTransport.hpp b/src/vmime/net/smtp/SMTPTransport.hpp similarity index 100% rename from vmime/net/smtp/SMTPTransport.hpp rename to src/vmime/net/smtp/SMTPTransport.hpp diff --git a/vmime/net/smtp/smtp.hpp b/src/vmime/net/smtp/smtp.hpp similarity index 100% rename from vmime/net/smtp/smtp.hpp rename to src/vmime/net/smtp/smtp.hpp diff --git a/vmime/net/socket.hpp b/src/vmime/net/socket.hpp similarity index 100% rename from vmime/net/socket.hpp rename to src/vmime/net/socket.hpp diff --git a/vmime/net/store.hpp b/src/vmime/net/store.hpp similarity index 100% rename from vmime/net/store.hpp rename to src/vmime/net/store.hpp diff --git a/vmime/net/timeoutHandler.hpp b/src/vmime/net/timeoutHandler.hpp similarity index 100% rename from vmime/net/timeoutHandler.hpp rename to src/vmime/net/timeoutHandler.hpp diff --git a/src/net/tls/TLSProperties.cpp b/src/vmime/net/tls/TLSProperties.cpp similarity index 100% rename from src/net/tls/TLSProperties.cpp rename to src/vmime/net/tls/TLSProperties.cpp diff --git a/vmime/net/tls/TLSProperties.hpp b/src/vmime/net/tls/TLSProperties.hpp similarity index 100% rename from vmime/net/tls/TLSProperties.hpp rename to src/vmime/net/tls/TLSProperties.hpp diff --git a/src/net/tls/TLSSecuredConnectionInfos.cpp b/src/vmime/net/tls/TLSSecuredConnectionInfos.cpp similarity index 100% rename from src/net/tls/TLSSecuredConnectionInfos.cpp rename to src/vmime/net/tls/TLSSecuredConnectionInfos.cpp diff --git a/vmime/net/tls/TLSSecuredConnectionInfos.hpp b/src/vmime/net/tls/TLSSecuredConnectionInfos.hpp similarity index 100% rename from vmime/net/tls/TLSSecuredConnectionInfos.hpp rename to src/vmime/net/tls/TLSSecuredConnectionInfos.hpp diff --git a/src/net/tls/TLSSession.cpp b/src/vmime/net/tls/TLSSession.cpp similarity index 100% rename from src/net/tls/TLSSession.cpp rename to src/vmime/net/tls/TLSSession.cpp diff --git a/vmime/net/tls/TLSSession.hpp b/src/vmime/net/tls/TLSSession.hpp similarity index 100% rename from vmime/net/tls/TLSSession.hpp rename to src/vmime/net/tls/TLSSession.hpp diff --git a/src/net/tls/TLSSocket.cpp b/src/vmime/net/tls/TLSSocket.cpp similarity index 100% rename from src/net/tls/TLSSocket.cpp rename to src/vmime/net/tls/TLSSocket.cpp diff --git a/vmime/net/tls/TLSSocket.hpp b/src/vmime/net/tls/TLSSocket.hpp similarity index 100% rename from vmime/net/tls/TLSSocket.hpp rename to src/vmime/net/tls/TLSSocket.hpp diff --git a/src/net/tls/gnutls/TLSProperties_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.cpp similarity index 100% rename from src/net/tls/gnutls/TLSProperties_GnuTLS.cpp rename to src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.cpp diff --git a/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp b/src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp similarity index 100% rename from vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp rename to src/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp diff --git a/src/net/tls/gnutls/TLSSession_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSSession_GnuTLS.cpp similarity index 100% rename from src/net/tls/gnutls/TLSSession_GnuTLS.cpp rename to src/vmime/net/tls/gnutls/TLSSession_GnuTLS.cpp diff --git a/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp b/src/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp similarity index 100% rename from vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp rename to src/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp diff --git a/src/net/tls/gnutls/TLSSocket_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp similarity index 100% rename from src/net/tls/gnutls/TLSSocket_GnuTLS.cpp rename to src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp diff --git a/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp similarity index 100% rename from vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp rename to src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp diff --git a/src/net/tls/openssl/OpenSSLInitializer.cpp b/src/vmime/net/tls/openssl/OpenSSLInitializer.cpp similarity index 100% rename from src/net/tls/openssl/OpenSSLInitializer.cpp rename to src/vmime/net/tls/openssl/OpenSSLInitializer.cpp diff --git a/vmime/net/tls/openssl/OpenSSLInitializer.hpp b/src/vmime/net/tls/openssl/OpenSSLInitializer.hpp similarity index 100% rename from vmime/net/tls/openssl/OpenSSLInitializer.hpp rename to src/vmime/net/tls/openssl/OpenSSLInitializer.hpp diff --git a/src/net/tls/openssl/TLSProperties_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSProperties_OpenSSL.cpp similarity index 100% rename from src/net/tls/openssl/TLSProperties_OpenSSL.cpp rename to src/vmime/net/tls/openssl/TLSProperties_OpenSSL.cpp diff --git a/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp similarity index 100% rename from vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp rename to src/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp diff --git a/src/net/tls/openssl/TLSSession_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSSession_OpenSSL.cpp similarity index 100% rename from src/net/tls/openssl/TLSSession_OpenSSL.cpp rename to src/vmime/net/tls/openssl/TLSSession_OpenSSL.cpp diff --git a/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp similarity index 100% rename from vmime/net/tls/openssl/TLSSession_OpenSSL.hpp rename to src/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp diff --git a/src/net/tls/openssl/TLSSocket_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp similarity index 100% rename from src/net/tls/openssl/TLSSocket_OpenSSL.cpp rename to src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp diff --git a/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp similarity index 100% rename from vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp rename to src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp diff --git a/src/net/transport.cpp b/src/vmime/net/transport.cpp similarity index 100% rename from src/net/transport.cpp rename to src/vmime/net/transport.cpp diff --git a/vmime/net/transport.hpp b/src/vmime/net/transport.hpp similarity index 100% rename from vmime/net/transport.hpp rename to src/vmime/net/transport.hpp diff --git a/src/object.cpp b/src/vmime/object.cpp similarity index 100% rename from src/object.cpp rename to src/vmime/object.cpp diff --git a/vmime/object.hpp b/src/vmime/object.hpp similarity index 100% rename from vmime/object.hpp rename to src/vmime/object.hpp diff --git a/src/parameter.cpp b/src/vmime/parameter.cpp similarity index 100% rename from src/parameter.cpp rename to src/vmime/parameter.cpp diff --git a/vmime/parameter.hpp b/src/vmime/parameter.hpp similarity index 100% rename from vmime/parameter.hpp rename to src/vmime/parameter.hpp diff --git a/src/parameterizedHeaderField.cpp b/src/vmime/parameterizedHeaderField.cpp similarity index 100% rename from src/parameterizedHeaderField.cpp rename to src/vmime/parameterizedHeaderField.cpp diff --git a/vmime/parameterizedHeaderField.hpp b/src/vmime/parameterizedHeaderField.hpp similarity index 100% rename from vmime/parameterizedHeaderField.hpp rename to src/vmime/parameterizedHeaderField.hpp diff --git a/src/parsedMessageAttachment.cpp b/src/vmime/parsedMessageAttachment.cpp similarity index 100% rename from src/parsedMessageAttachment.cpp rename to src/vmime/parsedMessageAttachment.cpp diff --git a/vmime/parsedMessageAttachment.hpp b/src/vmime/parsedMessageAttachment.hpp similarity index 100% rename from vmime/parsedMessageAttachment.hpp rename to src/vmime/parsedMessageAttachment.hpp diff --git a/vmime/parserHelpers.hpp b/src/vmime/parserHelpers.hpp similarity index 100% rename from vmime/parserHelpers.hpp rename to src/vmime/parserHelpers.hpp diff --git a/src/parsingContext.cpp b/src/vmime/parsingContext.cpp similarity index 100% rename from src/parsingContext.cpp rename to src/vmime/parsingContext.cpp diff --git a/vmime/parsingContext.hpp b/src/vmime/parsingContext.hpp similarity index 100% rename from vmime/parsingContext.hpp rename to src/vmime/parsingContext.hpp diff --git a/src/path.cpp b/src/vmime/path.cpp similarity index 100% rename from src/path.cpp rename to src/vmime/path.cpp diff --git a/vmime/path.hpp b/src/vmime/path.hpp similarity index 100% rename from vmime/path.hpp rename to src/vmime/path.hpp diff --git a/src/plainTextPart.cpp b/src/vmime/plainTextPart.cpp similarity index 100% rename from src/plainTextPart.cpp rename to src/vmime/plainTextPart.cpp diff --git a/vmime/plainTextPart.hpp b/src/vmime/plainTextPart.hpp similarity index 100% rename from vmime/plainTextPart.hpp rename to src/vmime/plainTextPart.hpp diff --git a/src/platform.cpp b/src/vmime/platform.cpp similarity index 100% rename from src/platform.cpp rename to src/vmime/platform.cpp diff --git a/vmime/platform.hpp b/src/vmime/platform.hpp similarity index 100% rename from vmime/platform.hpp rename to src/vmime/platform.hpp diff --git a/src/platforms/posix/posixChildProcess.cpp b/src/vmime/platforms/posix/posixChildProcess.cpp similarity index 100% rename from src/platforms/posix/posixChildProcess.cpp rename to src/vmime/platforms/posix/posixChildProcess.cpp diff --git a/vmime/platforms/posix/posixChildProcess.hpp b/src/vmime/platforms/posix/posixChildProcess.hpp similarity index 100% rename from vmime/platforms/posix/posixChildProcess.hpp rename to src/vmime/platforms/posix/posixChildProcess.hpp diff --git a/src/platforms/posix/posixCriticalSection.cpp b/src/vmime/platforms/posix/posixCriticalSection.cpp similarity index 100% rename from src/platforms/posix/posixCriticalSection.cpp rename to src/vmime/platforms/posix/posixCriticalSection.cpp diff --git a/vmime/platforms/posix/posixCriticalSection.hpp b/src/vmime/platforms/posix/posixCriticalSection.hpp similarity index 100% rename from vmime/platforms/posix/posixCriticalSection.hpp rename to src/vmime/platforms/posix/posixCriticalSection.hpp diff --git a/src/platforms/posix/posixFile.cpp b/src/vmime/platforms/posix/posixFile.cpp similarity index 100% rename from src/platforms/posix/posixFile.cpp rename to src/vmime/platforms/posix/posixFile.cpp diff --git a/vmime/platforms/posix/posixFile.hpp b/src/vmime/platforms/posix/posixFile.hpp similarity index 100% rename from vmime/platforms/posix/posixFile.hpp rename to src/vmime/platforms/posix/posixFile.hpp diff --git a/src/platforms/posix/posixHandler.cpp b/src/vmime/platforms/posix/posixHandler.cpp similarity index 100% rename from src/platforms/posix/posixHandler.cpp rename to src/vmime/platforms/posix/posixHandler.cpp diff --git a/vmime/platforms/posix/posixHandler.hpp b/src/vmime/platforms/posix/posixHandler.hpp similarity index 100% rename from vmime/platforms/posix/posixHandler.hpp rename to src/vmime/platforms/posix/posixHandler.hpp diff --git a/src/platforms/posix/posixSocket.cpp b/src/vmime/platforms/posix/posixSocket.cpp similarity index 100% rename from src/platforms/posix/posixSocket.cpp rename to src/vmime/platforms/posix/posixSocket.cpp diff --git a/vmime/platforms/posix/posixSocket.hpp b/src/vmime/platforms/posix/posixSocket.hpp similarity index 100% rename from vmime/platforms/posix/posixSocket.hpp rename to src/vmime/platforms/posix/posixSocket.hpp diff --git a/src/platforms/windows/windowsCriticalSection.cpp b/src/vmime/platforms/windows/windowsCriticalSection.cpp similarity index 100% rename from src/platforms/windows/windowsCriticalSection.cpp rename to src/vmime/platforms/windows/windowsCriticalSection.cpp diff --git a/vmime/platforms/windows/windowsCriticalSection.hpp b/src/vmime/platforms/windows/windowsCriticalSection.hpp similarity index 100% rename from vmime/platforms/windows/windowsCriticalSection.hpp rename to src/vmime/platforms/windows/windowsCriticalSection.hpp diff --git a/src/platforms/windows/windowsFile.cpp b/src/vmime/platforms/windows/windowsFile.cpp similarity index 100% rename from src/platforms/windows/windowsFile.cpp rename to src/vmime/platforms/windows/windowsFile.cpp diff --git a/vmime/platforms/windows/windowsFile.hpp b/src/vmime/platforms/windows/windowsFile.hpp similarity index 100% rename from vmime/platforms/windows/windowsFile.hpp rename to src/vmime/platforms/windows/windowsFile.hpp diff --git a/src/platforms/windows/windowsHandler.cpp b/src/vmime/platforms/windows/windowsHandler.cpp similarity index 100% rename from src/platforms/windows/windowsHandler.cpp rename to src/vmime/platforms/windows/windowsHandler.cpp diff --git a/vmime/platforms/windows/windowsHandler.hpp b/src/vmime/platforms/windows/windowsHandler.hpp similarity index 100% rename from vmime/platforms/windows/windowsHandler.hpp rename to src/vmime/platforms/windows/windowsHandler.hpp diff --git a/src/platforms/windows/windowsSocket.cpp b/src/vmime/platforms/windows/windowsSocket.cpp similarity index 100% rename from src/platforms/windows/windowsSocket.cpp rename to src/vmime/platforms/windows/windowsSocket.cpp diff --git a/vmime/platforms/windows/windowsSocket.hpp b/src/vmime/platforms/windows/windowsSocket.hpp similarity index 100% rename from vmime/platforms/windows/windowsSocket.hpp rename to src/vmime/platforms/windows/windowsSocket.hpp diff --git a/src/propertySet.cpp b/src/vmime/propertySet.cpp similarity index 100% rename from src/propertySet.cpp rename to src/vmime/propertySet.cpp diff --git a/vmime/propertySet.hpp b/src/vmime/propertySet.hpp similarity index 100% rename from vmime/propertySet.hpp rename to src/vmime/propertySet.hpp diff --git a/src/relay.cpp b/src/vmime/relay.cpp similarity index 100% rename from src/relay.cpp rename to src/vmime/relay.cpp diff --git a/vmime/relay.hpp b/src/vmime/relay.hpp similarity index 100% rename from vmime/relay.hpp rename to src/vmime/relay.hpp diff --git a/vmime/security/authenticator.hpp b/src/vmime/security/authenticator.hpp similarity index 100% rename from vmime/security/authenticator.hpp rename to src/vmime/security/authenticator.hpp diff --git a/src/security/cert/X509Certificate.cpp b/src/vmime/security/cert/X509Certificate.cpp similarity index 100% rename from src/security/cert/X509Certificate.cpp rename to src/vmime/security/cert/X509Certificate.cpp diff --git a/vmime/security/cert/X509Certificate.hpp b/src/vmime/security/cert/X509Certificate.hpp similarity index 100% rename from vmime/security/cert/X509Certificate.hpp rename to src/vmime/security/cert/X509Certificate.hpp diff --git a/vmime/security/cert/certificate.hpp b/src/vmime/security/cert/certificate.hpp similarity index 100% rename from vmime/security/cert/certificate.hpp rename to src/vmime/security/cert/certificate.hpp diff --git a/src/security/cert/certificateChain.cpp b/src/vmime/security/cert/certificateChain.cpp similarity index 100% rename from src/security/cert/certificateChain.cpp rename to src/vmime/security/cert/certificateChain.cpp diff --git a/vmime/security/cert/certificateChain.hpp b/src/vmime/security/cert/certificateChain.hpp similarity index 100% rename from vmime/security/cert/certificateChain.hpp rename to src/vmime/security/cert/certificateChain.hpp diff --git a/vmime/security/cert/certificateVerifier.hpp b/src/vmime/security/cert/certificateVerifier.hpp similarity index 100% rename from vmime/security/cert/certificateVerifier.hpp rename to src/vmime/security/cert/certificateVerifier.hpp diff --git a/src/security/cert/defaultCertificateVerifier.cpp b/src/vmime/security/cert/defaultCertificateVerifier.cpp similarity index 100% rename from src/security/cert/defaultCertificateVerifier.cpp rename to src/vmime/security/cert/defaultCertificateVerifier.cpp diff --git a/vmime/security/cert/defaultCertificateVerifier.hpp b/src/vmime/security/cert/defaultCertificateVerifier.hpp similarity index 100% rename from vmime/security/cert/defaultCertificateVerifier.hpp rename to src/vmime/security/cert/defaultCertificateVerifier.hpp diff --git a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp b/src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.cpp similarity index 100% rename from src/security/cert/gnutls/X509Certificate_GnuTLS.cpp rename to src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.cpp diff --git a/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp b/src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp similarity index 100% rename from vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp rename to src/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp diff --git a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp b/src/vmime/security/cert/openssl/X509Certificate_OpenSSL.cpp similarity index 100% rename from src/security/cert/openssl/X509Certificate_OpenSSL.cpp rename to src/vmime/security/cert/openssl/X509Certificate_OpenSSL.cpp diff --git a/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp b/src/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp similarity index 100% rename from vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp rename to src/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp diff --git a/src/security/defaultAuthenticator.cpp b/src/vmime/security/defaultAuthenticator.cpp similarity index 100% rename from src/security/defaultAuthenticator.cpp rename to src/vmime/security/defaultAuthenticator.cpp diff --git a/vmime/security/defaultAuthenticator.hpp b/src/vmime/security/defaultAuthenticator.hpp similarity index 100% rename from vmime/security/defaultAuthenticator.hpp rename to src/vmime/security/defaultAuthenticator.hpp diff --git a/src/security/digest/md5/md5MessageDigest.cpp b/src/vmime/security/digest/md5/md5MessageDigest.cpp similarity index 100% rename from src/security/digest/md5/md5MessageDigest.cpp rename to src/vmime/security/digest/md5/md5MessageDigest.cpp diff --git a/vmime/security/digest/md5/md5MessageDigest.hpp b/src/vmime/security/digest/md5/md5MessageDigest.hpp similarity index 100% rename from vmime/security/digest/md5/md5MessageDigest.hpp rename to src/vmime/security/digest/md5/md5MessageDigest.hpp diff --git a/src/security/digest/messageDigest.cpp b/src/vmime/security/digest/messageDigest.cpp similarity index 100% rename from src/security/digest/messageDigest.cpp rename to src/vmime/security/digest/messageDigest.cpp diff --git a/vmime/security/digest/messageDigest.hpp b/src/vmime/security/digest/messageDigest.hpp similarity index 100% rename from vmime/security/digest/messageDigest.hpp rename to src/vmime/security/digest/messageDigest.hpp diff --git a/src/security/digest/messageDigestFactory.cpp b/src/vmime/security/digest/messageDigestFactory.cpp similarity index 100% rename from src/security/digest/messageDigestFactory.cpp rename to src/vmime/security/digest/messageDigestFactory.cpp diff --git a/vmime/security/digest/messageDigestFactory.hpp b/src/vmime/security/digest/messageDigestFactory.hpp similarity index 100% rename from vmime/security/digest/messageDigestFactory.hpp rename to src/vmime/security/digest/messageDigestFactory.hpp diff --git a/src/security/digest/sha1/sha1MessageDigest.cpp b/src/vmime/security/digest/sha1/sha1MessageDigest.cpp similarity index 100% rename from src/security/digest/sha1/sha1MessageDigest.cpp rename to src/vmime/security/digest/sha1/sha1MessageDigest.cpp diff --git a/vmime/security/digest/sha1/sha1MessageDigest.hpp b/src/vmime/security/digest/sha1/sha1MessageDigest.hpp similarity index 100% rename from vmime/security/digest/sha1/sha1MessageDigest.hpp rename to src/vmime/security/digest/sha1/sha1MessageDigest.hpp diff --git a/vmime/security/sasl/SASLAuthenticator.hpp b/src/vmime/security/sasl/SASLAuthenticator.hpp similarity index 100% rename from vmime/security/sasl/SASLAuthenticator.hpp rename to src/vmime/security/sasl/SASLAuthenticator.hpp diff --git a/src/security/sasl/SASLContext.cpp b/src/vmime/security/sasl/SASLContext.cpp similarity index 100% rename from src/security/sasl/SASLContext.cpp rename to src/vmime/security/sasl/SASLContext.cpp diff --git a/vmime/security/sasl/SASLContext.hpp b/src/vmime/security/sasl/SASLContext.hpp similarity index 100% rename from vmime/security/sasl/SASLContext.hpp rename to src/vmime/security/sasl/SASLContext.hpp diff --git a/vmime/security/sasl/SASLMechanism.hpp b/src/vmime/security/sasl/SASLMechanism.hpp similarity index 100% rename from vmime/security/sasl/SASLMechanism.hpp rename to src/vmime/security/sasl/SASLMechanism.hpp diff --git a/src/security/sasl/SASLMechanismFactory.cpp b/src/vmime/security/sasl/SASLMechanismFactory.cpp similarity index 100% rename from src/security/sasl/SASLMechanismFactory.cpp rename to src/vmime/security/sasl/SASLMechanismFactory.cpp diff --git a/vmime/security/sasl/SASLMechanismFactory.hpp b/src/vmime/security/sasl/SASLMechanismFactory.hpp similarity index 100% rename from vmime/security/sasl/SASLMechanismFactory.hpp rename to src/vmime/security/sasl/SASLMechanismFactory.hpp diff --git a/src/security/sasl/SASLSession.cpp b/src/vmime/security/sasl/SASLSession.cpp similarity index 100% rename from src/security/sasl/SASLSession.cpp rename to src/vmime/security/sasl/SASLSession.cpp diff --git a/vmime/security/sasl/SASLSession.hpp b/src/vmime/security/sasl/SASLSession.hpp similarity index 100% rename from vmime/security/sasl/SASLSession.hpp rename to src/vmime/security/sasl/SASLSession.hpp diff --git a/src/security/sasl/SASLSocket.cpp b/src/vmime/security/sasl/SASLSocket.cpp similarity index 100% rename from src/security/sasl/SASLSocket.cpp rename to src/vmime/security/sasl/SASLSocket.cpp diff --git a/vmime/security/sasl/SASLSocket.hpp b/src/vmime/security/sasl/SASLSocket.hpp similarity index 100% rename from vmime/security/sasl/SASLSocket.hpp rename to src/vmime/security/sasl/SASLSocket.hpp diff --git a/src/security/sasl/builtinSASLMechanism.cpp b/src/vmime/security/sasl/builtinSASLMechanism.cpp similarity index 100% rename from src/security/sasl/builtinSASLMechanism.cpp rename to src/vmime/security/sasl/builtinSASLMechanism.cpp diff --git a/vmime/security/sasl/builtinSASLMechanism.hpp b/src/vmime/security/sasl/builtinSASLMechanism.hpp similarity index 100% rename from vmime/security/sasl/builtinSASLMechanism.hpp rename to src/vmime/security/sasl/builtinSASLMechanism.hpp diff --git a/src/security/sasl/defaultSASLAuthenticator.cpp b/src/vmime/security/sasl/defaultSASLAuthenticator.cpp similarity index 100% rename from src/security/sasl/defaultSASLAuthenticator.cpp rename to src/vmime/security/sasl/defaultSASLAuthenticator.cpp diff --git a/vmime/security/sasl/defaultSASLAuthenticator.hpp b/src/vmime/security/sasl/defaultSASLAuthenticator.hpp similarity index 100% rename from vmime/security/sasl/defaultSASLAuthenticator.hpp rename to src/vmime/security/sasl/defaultSASLAuthenticator.hpp diff --git a/src/streamContentHandler.cpp b/src/vmime/streamContentHandler.cpp similarity index 100% rename from src/streamContentHandler.cpp rename to src/vmime/streamContentHandler.cpp diff --git a/vmime/streamContentHandler.hpp b/src/vmime/streamContentHandler.hpp similarity index 100% rename from vmime/streamContentHandler.hpp rename to src/vmime/streamContentHandler.hpp diff --git a/src/stringContentHandler.cpp b/src/vmime/stringContentHandler.cpp similarity index 100% rename from src/stringContentHandler.cpp rename to src/vmime/stringContentHandler.cpp diff --git a/vmime/stringContentHandler.hpp b/src/vmime/stringContentHandler.hpp similarity index 100% rename from vmime/stringContentHandler.hpp rename to src/vmime/stringContentHandler.hpp diff --git a/src/text.cpp b/src/vmime/text.cpp similarity index 100% rename from src/text.cpp rename to src/vmime/text.cpp diff --git a/vmime/text.hpp b/src/vmime/text.hpp similarity index 100% rename from vmime/text.hpp rename to src/vmime/text.hpp diff --git a/vmime/textPart.hpp b/src/vmime/textPart.hpp similarity index 100% rename from vmime/textPart.hpp rename to src/vmime/textPart.hpp diff --git a/src/textPartFactory.cpp b/src/vmime/textPartFactory.cpp similarity index 100% rename from src/textPartFactory.cpp rename to src/vmime/textPartFactory.cpp diff --git a/vmime/textPartFactory.hpp b/src/vmime/textPartFactory.hpp similarity index 100% rename from vmime/textPartFactory.hpp rename to src/vmime/textPartFactory.hpp diff --git a/vmime/types.hpp b/src/vmime/types.hpp similarity index 100% rename from vmime/types.hpp rename to src/vmime/types.hpp diff --git a/vmime/utility/childProcess.hpp b/src/vmime/utility/childProcess.hpp similarity index 100% rename from vmime/utility/childProcess.hpp rename to src/vmime/utility/childProcess.hpp diff --git a/src/utility/datetimeUtils.cpp b/src/vmime/utility/datetimeUtils.cpp similarity index 100% rename from src/utility/datetimeUtils.cpp rename to src/vmime/utility/datetimeUtils.cpp diff --git a/vmime/utility/datetimeUtils.hpp b/src/vmime/utility/datetimeUtils.hpp similarity index 100% rename from vmime/utility/datetimeUtils.hpp rename to src/vmime/utility/datetimeUtils.hpp diff --git a/src/utility/encoder/b64Encoder.cpp b/src/vmime/utility/encoder/b64Encoder.cpp similarity index 100% rename from src/utility/encoder/b64Encoder.cpp rename to src/vmime/utility/encoder/b64Encoder.cpp diff --git a/vmime/utility/encoder/b64Encoder.hpp b/src/vmime/utility/encoder/b64Encoder.hpp similarity index 100% rename from vmime/utility/encoder/b64Encoder.hpp rename to src/vmime/utility/encoder/b64Encoder.hpp diff --git a/src/utility/encoder/binaryEncoder.cpp b/src/vmime/utility/encoder/binaryEncoder.cpp similarity index 100% rename from src/utility/encoder/binaryEncoder.cpp rename to src/vmime/utility/encoder/binaryEncoder.cpp diff --git a/vmime/utility/encoder/binaryEncoder.hpp b/src/vmime/utility/encoder/binaryEncoder.hpp similarity index 100% rename from vmime/utility/encoder/binaryEncoder.hpp rename to src/vmime/utility/encoder/binaryEncoder.hpp diff --git a/src/utility/encoder/eightBitEncoder.cpp b/src/vmime/utility/encoder/eightBitEncoder.cpp similarity index 100% rename from src/utility/encoder/eightBitEncoder.cpp rename to src/vmime/utility/encoder/eightBitEncoder.cpp diff --git a/vmime/utility/encoder/eightBitEncoder.hpp b/src/vmime/utility/encoder/eightBitEncoder.hpp similarity index 100% rename from vmime/utility/encoder/eightBitEncoder.hpp rename to src/vmime/utility/encoder/eightBitEncoder.hpp diff --git a/src/utility/encoder/encoder.cpp b/src/vmime/utility/encoder/encoder.cpp similarity index 100% rename from src/utility/encoder/encoder.cpp rename to src/vmime/utility/encoder/encoder.cpp diff --git a/vmime/utility/encoder/encoder.hpp b/src/vmime/utility/encoder/encoder.hpp similarity index 100% rename from vmime/utility/encoder/encoder.hpp rename to src/vmime/utility/encoder/encoder.hpp diff --git a/src/utility/encoder/encoderFactory.cpp b/src/vmime/utility/encoder/encoderFactory.cpp similarity index 100% rename from src/utility/encoder/encoderFactory.cpp rename to src/vmime/utility/encoder/encoderFactory.cpp diff --git a/vmime/utility/encoder/encoderFactory.hpp b/src/vmime/utility/encoder/encoderFactory.hpp similarity index 100% rename from vmime/utility/encoder/encoderFactory.hpp rename to src/vmime/utility/encoder/encoderFactory.hpp diff --git a/src/utility/encoder/noopEncoder.cpp b/src/vmime/utility/encoder/noopEncoder.cpp similarity index 100% rename from src/utility/encoder/noopEncoder.cpp rename to src/vmime/utility/encoder/noopEncoder.cpp diff --git a/vmime/utility/encoder/noopEncoder.hpp b/src/vmime/utility/encoder/noopEncoder.hpp similarity index 100% rename from vmime/utility/encoder/noopEncoder.hpp rename to src/vmime/utility/encoder/noopEncoder.hpp diff --git a/src/utility/encoder/qpEncoder.cpp b/src/vmime/utility/encoder/qpEncoder.cpp similarity index 100% rename from src/utility/encoder/qpEncoder.cpp rename to src/vmime/utility/encoder/qpEncoder.cpp diff --git a/vmime/utility/encoder/qpEncoder.hpp b/src/vmime/utility/encoder/qpEncoder.hpp similarity index 100% rename from vmime/utility/encoder/qpEncoder.hpp rename to src/vmime/utility/encoder/qpEncoder.hpp diff --git a/src/utility/encoder/sevenBitEncoder.cpp b/src/vmime/utility/encoder/sevenBitEncoder.cpp similarity index 100% rename from src/utility/encoder/sevenBitEncoder.cpp rename to src/vmime/utility/encoder/sevenBitEncoder.cpp diff --git a/vmime/utility/encoder/sevenBitEncoder.hpp b/src/vmime/utility/encoder/sevenBitEncoder.hpp similarity index 100% rename from vmime/utility/encoder/sevenBitEncoder.hpp rename to src/vmime/utility/encoder/sevenBitEncoder.hpp diff --git a/src/utility/encoder/uuEncoder.cpp b/src/vmime/utility/encoder/uuEncoder.cpp similarity index 100% rename from src/utility/encoder/uuEncoder.cpp rename to src/vmime/utility/encoder/uuEncoder.cpp diff --git a/vmime/utility/encoder/uuEncoder.hpp b/src/vmime/utility/encoder/uuEncoder.hpp similarity index 100% rename from vmime/utility/encoder/uuEncoder.hpp rename to src/vmime/utility/encoder/uuEncoder.hpp diff --git a/vmime/utility/file.hpp b/src/vmime/utility/file.hpp similarity index 100% rename from vmime/utility/file.hpp rename to src/vmime/utility/file.hpp diff --git a/src/utility/filteredStream.cpp b/src/vmime/utility/filteredStream.cpp similarity index 100% rename from src/utility/filteredStream.cpp rename to src/vmime/utility/filteredStream.cpp diff --git a/vmime/utility/filteredStream.hpp b/src/vmime/utility/filteredStream.hpp similarity index 100% rename from vmime/utility/filteredStream.hpp rename to src/vmime/utility/filteredStream.hpp diff --git a/src/utility/inputStream.cpp b/src/vmime/utility/inputStream.cpp similarity index 100% rename from src/utility/inputStream.cpp rename to src/vmime/utility/inputStream.cpp diff --git a/vmime/utility/inputStream.hpp b/src/vmime/utility/inputStream.hpp similarity index 100% rename from vmime/utility/inputStream.hpp rename to src/vmime/utility/inputStream.hpp diff --git a/src/utility/inputStreamAdapter.cpp b/src/vmime/utility/inputStreamAdapter.cpp similarity index 100% rename from src/utility/inputStreamAdapter.cpp rename to src/vmime/utility/inputStreamAdapter.cpp diff --git a/vmime/utility/inputStreamAdapter.hpp b/src/vmime/utility/inputStreamAdapter.hpp similarity index 100% rename from vmime/utility/inputStreamAdapter.hpp rename to src/vmime/utility/inputStreamAdapter.hpp diff --git a/src/utility/inputStreamByteBufferAdapter.cpp b/src/vmime/utility/inputStreamByteBufferAdapter.cpp similarity index 100% rename from src/utility/inputStreamByteBufferAdapter.cpp rename to src/vmime/utility/inputStreamByteBufferAdapter.cpp diff --git a/vmime/utility/inputStreamByteBufferAdapter.hpp b/src/vmime/utility/inputStreamByteBufferAdapter.hpp similarity index 100% rename from vmime/utility/inputStreamByteBufferAdapter.hpp rename to src/vmime/utility/inputStreamByteBufferAdapter.hpp diff --git a/src/utility/inputStreamPointerAdapter.cpp b/src/vmime/utility/inputStreamPointerAdapter.cpp similarity index 100% rename from src/utility/inputStreamPointerAdapter.cpp rename to src/vmime/utility/inputStreamPointerAdapter.cpp diff --git a/vmime/utility/inputStreamPointerAdapter.hpp b/src/vmime/utility/inputStreamPointerAdapter.hpp similarity index 100% rename from vmime/utility/inputStreamPointerAdapter.hpp rename to src/vmime/utility/inputStreamPointerAdapter.hpp diff --git a/src/utility/inputStreamSocketAdapter.cpp b/src/vmime/utility/inputStreamSocketAdapter.cpp similarity index 100% rename from src/utility/inputStreamSocketAdapter.cpp rename to src/vmime/utility/inputStreamSocketAdapter.cpp diff --git a/vmime/utility/inputStreamSocketAdapter.hpp b/src/vmime/utility/inputStreamSocketAdapter.hpp similarity index 100% rename from vmime/utility/inputStreamSocketAdapter.hpp rename to src/vmime/utility/inputStreamSocketAdapter.hpp diff --git a/src/utility/inputStreamStringAdapter.cpp b/src/vmime/utility/inputStreamStringAdapter.cpp similarity index 100% rename from src/utility/inputStreamStringAdapter.cpp rename to src/vmime/utility/inputStreamStringAdapter.cpp diff --git a/vmime/utility/inputStreamStringAdapter.hpp b/src/vmime/utility/inputStreamStringAdapter.hpp similarity index 100% rename from vmime/utility/inputStreamStringAdapter.hpp rename to src/vmime/utility/inputStreamStringAdapter.hpp diff --git a/src/utility/inputStreamStringProxyAdapter.cpp b/src/vmime/utility/inputStreamStringProxyAdapter.cpp similarity index 100% rename from src/utility/inputStreamStringProxyAdapter.cpp rename to src/vmime/utility/inputStreamStringProxyAdapter.cpp diff --git a/vmime/utility/inputStreamStringProxyAdapter.hpp b/src/vmime/utility/inputStreamStringProxyAdapter.hpp similarity index 100% rename from vmime/utility/inputStreamStringProxyAdapter.hpp rename to src/vmime/utility/inputStreamStringProxyAdapter.hpp diff --git a/src/utility/outputStream.cpp b/src/vmime/utility/outputStream.cpp similarity index 100% rename from src/utility/outputStream.cpp rename to src/vmime/utility/outputStream.cpp diff --git a/vmime/utility/outputStream.hpp b/src/vmime/utility/outputStream.hpp similarity index 100% rename from vmime/utility/outputStream.hpp rename to src/vmime/utility/outputStream.hpp diff --git a/src/utility/outputStreamAdapter.cpp b/src/vmime/utility/outputStreamAdapter.cpp similarity index 100% rename from src/utility/outputStreamAdapter.cpp rename to src/vmime/utility/outputStreamAdapter.cpp diff --git a/vmime/utility/outputStreamAdapter.hpp b/src/vmime/utility/outputStreamAdapter.hpp similarity index 100% rename from vmime/utility/outputStreamAdapter.hpp rename to src/vmime/utility/outputStreamAdapter.hpp diff --git a/src/utility/outputStreamByteArrayAdapter.cpp b/src/vmime/utility/outputStreamByteArrayAdapter.cpp similarity index 100% rename from src/utility/outputStreamByteArrayAdapter.cpp rename to src/vmime/utility/outputStreamByteArrayAdapter.cpp diff --git a/vmime/utility/outputStreamByteArrayAdapter.hpp b/src/vmime/utility/outputStreamByteArrayAdapter.hpp similarity index 100% rename from vmime/utility/outputStreamByteArrayAdapter.hpp rename to src/vmime/utility/outputStreamByteArrayAdapter.hpp diff --git a/src/utility/outputStreamSocketAdapter.cpp b/src/vmime/utility/outputStreamSocketAdapter.cpp similarity index 100% rename from src/utility/outputStreamSocketAdapter.cpp rename to src/vmime/utility/outputStreamSocketAdapter.cpp diff --git a/vmime/utility/outputStreamSocketAdapter.hpp b/src/vmime/utility/outputStreamSocketAdapter.hpp similarity index 100% rename from vmime/utility/outputStreamSocketAdapter.hpp rename to src/vmime/utility/outputStreamSocketAdapter.hpp diff --git a/src/utility/outputStreamStringAdapter.cpp b/src/vmime/utility/outputStreamStringAdapter.cpp similarity index 100% rename from src/utility/outputStreamStringAdapter.cpp rename to src/vmime/utility/outputStreamStringAdapter.cpp diff --git a/vmime/utility/outputStreamStringAdapter.hpp b/src/vmime/utility/outputStreamStringAdapter.hpp similarity index 100% rename from vmime/utility/outputStreamStringAdapter.hpp rename to src/vmime/utility/outputStreamStringAdapter.hpp diff --git a/src/utility/parserInputStreamAdapter.cpp b/src/vmime/utility/parserInputStreamAdapter.cpp similarity index 100% rename from src/utility/parserInputStreamAdapter.cpp rename to src/vmime/utility/parserInputStreamAdapter.cpp diff --git a/vmime/utility/parserInputStreamAdapter.hpp b/src/vmime/utility/parserInputStreamAdapter.hpp similarity index 100% rename from vmime/utility/parserInputStreamAdapter.hpp rename to src/vmime/utility/parserInputStreamAdapter.hpp diff --git a/src/utility/path.cpp b/src/vmime/utility/path.cpp similarity index 100% rename from src/utility/path.cpp rename to src/vmime/utility/path.cpp diff --git a/vmime/utility/path.hpp b/src/vmime/utility/path.hpp similarity index 100% rename from vmime/utility/path.hpp rename to src/vmime/utility/path.hpp diff --git a/src/utility/progressListener.cpp b/src/vmime/utility/progressListener.cpp similarity index 100% rename from src/utility/progressListener.cpp rename to src/vmime/utility/progressListener.cpp diff --git a/vmime/utility/progressListener.hpp b/src/vmime/utility/progressListener.hpp similarity index 100% rename from vmime/utility/progressListener.hpp rename to src/vmime/utility/progressListener.hpp diff --git a/src/utility/random.cpp b/src/vmime/utility/random.cpp similarity index 100% rename from src/utility/random.cpp rename to src/vmime/utility/random.cpp diff --git a/vmime/utility/random.hpp b/src/vmime/utility/random.hpp similarity index 100% rename from vmime/utility/random.hpp rename to src/vmime/utility/random.hpp diff --git a/vmime/utility/seekableInputStream.hpp b/src/vmime/utility/seekableInputStream.hpp similarity index 100% rename from vmime/utility/seekableInputStream.hpp rename to src/vmime/utility/seekableInputStream.hpp diff --git a/src/utility/seekableInputStreamRegionAdapter.cpp b/src/vmime/utility/seekableInputStreamRegionAdapter.cpp similarity index 100% rename from src/utility/seekableInputStreamRegionAdapter.cpp rename to src/vmime/utility/seekableInputStreamRegionAdapter.cpp diff --git a/vmime/utility/seekableInputStreamRegionAdapter.hpp b/src/vmime/utility/seekableInputStreamRegionAdapter.hpp similarity index 100% rename from vmime/utility/seekableInputStreamRegionAdapter.hpp rename to src/vmime/utility/seekableInputStreamRegionAdapter.hpp diff --git a/src/utility/stream.cpp b/src/vmime/utility/stream.cpp similarity index 100% rename from src/utility/stream.cpp rename to src/vmime/utility/stream.cpp diff --git a/vmime/utility/stream.hpp b/src/vmime/utility/stream.hpp similarity index 100% rename from vmime/utility/stream.hpp rename to src/vmime/utility/stream.hpp diff --git a/src/utility/streamUtils.cpp b/src/vmime/utility/streamUtils.cpp similarity index 100% rename from src/utility/streamUtils.cpp rename to src/vmime/utility/streamUtils.cpp diff --git a/vmime/utility/streamUtils.hpp b/src/vmime/utility/streamUtils.hpp similarity index 100% rename from vmime/utility/streamUtils.hpp rename to src/vmime/utility/streamUtils.hpp diff --git a/src/utility/stringProxy.cpp b/src/vmime/utility/stringProxy.cpp similarity index 100% rename from src/utility/stringProxy.cpp rename to src/vmime/utility/stringProxy.cpp diff --git a/vmime/utility/stringProxy.hpp b/src/vmime/utility/stringProxy.hpp similarity index 100% rename from vmime/utility/stringProxy.hpp rename to src/vmime/utility/stringProxy.hpp diff --git a/src/utility/stringUtils.cpp b/src/vmime/utility/stringUtils.cpp similarity index 100% rename from src/utility/stringUtils.cpp rename to src/vmime/utility/stringUtils.cpp diff --git a/vmime/utility/stringUtils.hpp b/src/vmime/utility/stringUtils.hpp similarity index 100% rename from vmime/utility/stringUtils.hpp rename to src/vmime/utility/stringUtils.hpp diff --git a/vmime/utility/sync/autoLock.hpp b/src/vmime/utility/sync/autoLock.hpp similarity index 100% rename from vmime/utility/sync/autoLock.hpp rename to src/vmime/utility/sync/autoLock.hpp diff --git a/src/utility/sync/criticalSection.cpp b/src/vmime/utility/sync/criticalSection.cpp similarity index 100% rename from src/utility/sync/criticalSection.cpp rename to src/vmime/utility/sync/criticalSection.cpp diff --git a/vmime/utility/sync/criticalSection.hpp b/src/vmime/utility/sync/criticalSection.hpp similarity index 100% rename from vmime/utility/sync/criticalSection.hpp rename to src/vmime/utility/sync/criticalSection.hpp diff --git a/src/utility/url.cpp b/src/vmime/utility/url.cpp similarity index 100% rename from src/utility/url.cpp rename to src/vmime/utility/url.cpp diff --git a/vmime/utility/url.hpp b/src/vmime/utility/url.hpp similarity index 100% rename from vmime/utility/url.hpp rename to src/vmime/utility/url.hpp diff --git a/src/utility/urlUtils.cpp b/src/vmime/utility/urlUtils.cpp similarity index 100% rename from src/utility/urlUtils.cpp rename to src/vmime/utility/urlUtils.cpp diff --git a/vmime/utility/urlUtils.hpp b/src/vmime/utility/urlUtils.hpp similarity index 100% rename from vmime/utility/urlUtils.hpp rename to src/vmime/utility/urlUtils.hpp diff --git a/vmime/vmime.hpp b/src/vmime/vmime.hpp similarity index 100% rename from vmime/vmime.hpp rename to src/vmime/vmime.hpp diff --git a/src/word.cpp b/src/vmime/word.cpp similarity index 100% rename from src/word.cpp rename to src/vmime/word.cpp diff --git a/vmime/word.hpp b/src/vmime/word.hpp similarity index 100% rename from vmime/word.hpp rename to src/vmime/word.hpp diff --git a/src/wordEncoder.cpp b/src/vmime/wordEncoder.cpp similarity index 100% rename from src/wordEncoder.cpp rename to src/vmime/wordEncoder.cpp diff --git a/vmime/wordEncoder.hpp b/src/vmime/wordEncoder.hpp similarity index 100% rename from vmime/wordEncoder.hpp rename to src/vmime/wordEncoder.hpp diff --git a/test-outsourced-build.sh b/test-outsourced-build.sh index 11d6732c..1700a30b 100755 --- a/test-outsourced-build.sh +++ b/test-outsourced-build.sh @@ -2,10 +2,10 @@ rm -rf _build _install mkdir _build _install cd _build -rm -f ../CMakeCache.txt ../vmime/config.hpp ../vmime/export-static.hpp ../vmime/export-shared.hpp +rm -f ../CMakeCache.txt ../src/vmime/config.hpp ../src/vmime/export-static.hpp ../src/vmime/export-shared.hpp #cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DVMIME_BUILD_SHARED_LIBRARY=NO #cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DVMIME_BUILD_TESTS=YES -cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DVMIME_BUILD_TESTS=YES -DVMIME_BUILD_SAMPLES=YES -DVMIME_TLS_SUPPORT_LIB_IS_OPENSSL=ON -DVMIME_TLS_SUPPORT_LIB_IS_GNUTLS=OFF -DCMAKE_BUILD_TYPE=Release +cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DVMIME_BUILD_TESTS=YES -DVMIME_BUILD_SAMPLES=YES -DVMIME_TLS_SUPPORT_LIB_IS_OPENSSL=ON -DVMIME_TLS_SUPPORT_LIB_IS_GNUTLS=OFF -DCMAKE_BUILD_TYPE=Debug cmake .. -L make make install