Merge branch 'master' of git://github.com/cpp-netlib/cpp-netlib

Author: deanberris

.clang-format

@@ -0,0 +1,39 @@
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakTemplateDeclarations: true
+AlwaysBreakBeforeMultilineStrings: true
+BreakBeforeBinaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit:     80
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DerivePointerBinding: true
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakComment: 60
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerBindsToType: true
+SpacesBeforeTrailingComments: 2
+Cpp11BracedListStyle: true
+Standard:        Auto
+IndentWidth:     2
+TabWidth:        8
+UseTab:          false
+BreakBeforeBraces: Attach
+IndentFunctionDeclarationAfterType: true
+SpacesInParentheses: false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true

.gitignore

@@ -1,16 +1,8 @@
 *.swp
 *.pyc
-CMakeCache.txt
-CMakeFiles
-Makefile
-Testing
 *.gch
 libs/mime/test/mime-roundtrip
-*.a
 bin/
 tests/
 _build
-CPP-NETLIB.*
-CMakeScripts/
-*.cmake
 *~

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "deps/gmock"]
 	path = deps/gmock
 	url = git://github.com/cpp-netlib/gmock
+[submodule "deps/igloo"]
+	path = deps/igloo
+	url = git://github.com/joakimkarlsson/igloo.git

.travis.yml

@@ -0,0 +1,38 @@
+language:
+    - cpp
+
+compiler:
+    - clang
+    - gcc
+
+env:
+    - BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release"
+    - BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
+    - BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
+    - BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"
+
+before_install:
+    - sudo add-apt-repository ppa:apokluda/boost1.53 --yes
+    - sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes # libstdc++-4.8
+    - if [ "${CXX}" == "clang++" ]; then sudo add-apt-repository --yes ppa:h-rayflood/llvm; fi # clang++-3.2
+    - sudo apt-get update
+
+install:
+    - if [ "${CXX}" == "clang++" ]; then sudo apt-get -qq install clang-3.2; fi
+    - sudo apt-get install g++-4.8; # clang need it for libstdc++ update
+    - sudo apt-get install libboost-system1.53-dev
+    - sudo apt-get install libboost-regex1.53-dev
+    - sudo apt-get install libboost-filesystem1.53-dev
+
+before_script:
+    # update compilers
+    - if [ "${CXX}" == "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+    - if [ "${CXX}" == "clang++" ]; then export CXX="clang++-3.2" CC="clang-3.2"; fi
+
+script:
+    - mkdir _build
+    - cd _build
+    # Note: clang not support libc++
+    - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCPP-NETLIB_DISABLE_LIBCXX=YES -DCPP-NETLIB_DISABLE_FEATURE_TESTS=YES ..
+    - make
+    - make test

CMakeLists.txt

@@ -1,5 +1,6 @@
 # Copyright (c) Dean Michael Berris 2010.
 # Copyright (c) Google, Inc. 2012.
+# Copyright (c) Glyn Matthews 2013.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
@@ -14,6 +15,7 @@ option( CPP-NETLIB_BUILD_EXAMPLES "Build the examples using cpp-netlib." ON )
 option( CPP-NETLIB_ALWAYS_LOGGING "Allow cpp-netlib to log debug messages even in non-debug mode." OFF )
 option( CPP-NETLIB_DISABLE_LOGGING "Disable logging definitely, no logging code will be generated or compiled." OFF )
 option( CPP-NETLIB_DISABLE_LIBCXX "Disable using libc++ when compiling with clang." OFF )
+option( CPP-NETLIB_DISABLE_FEATURE_TESTS "Disable the feature tests (which may use a network connection)." OFF )
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 find_package( ICU )
@@ -28,8 +30,8 @@ else()
   set(BUILD_SHARED_LIBS OFF)
 endif()
 set(Boost_USE_MULTITHREADED ON)
-set(Boost_COMPONENTS system regex date_time filesystem program_options )
-find_package( Boost 1.51 REQUIRED ${Boost_COMPONENTS} )
+set(Boost_COMPONENTS system regex filesystem )
+find_package( Boost 1.53 REQUIRED ${Boost_COMPONENTS} )
 find_package( OpenSSL )
 find_package( Threads )
 set(CMAKE_VERBOSE_MAKEFILE true)
@@ -46,7 +48,8 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   INCLUDE(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   else()
     message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
   endif()
@@ -55,9 +58,11 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
     if (CPP-NETLIB_DISABLE_LIBCXX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+      #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     else()
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
+      #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
       set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -stdlib=libc++")
     endif()
   else()
@@ -72,24 +77,24 @@ endif()
 
 message(STATUS "C++ Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
-if (Boost_FOUND)
-  if (MSVC)
-    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-  endif(MSVC)
-  if (WIN32)
-    add_definitions(-D_WIN32_WINNT=0x0501)
-  endif(WIN32)
-  include_directories(${Boost_INCLUDE_DIRS})
-endif(Boost_FOUND)
+
+if (MSVC)
+  add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+endif(MSVC)
+if (WIN32)
+  add_definitions(-D_WIN32_WINNT=0x0501)
+endif(WIN32)
+include_directories(${Boost_INCLUDE_DIRS})
 
 message(STATUS "CPP-NETLIB options selected:")
-message(STATUS "  CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
-message(STATUS "  CPP-NETLIB_BUILD_SINGLE_LIB:  ${CPP-NETLIB_BUILD_SINGLE_LIB}\t(Build cpp-netlib into a single library: OFF, ON)")
-message(STATUS "  CPP-NETLIB_BUILD_TESTS:       ${CPP-NETLIB_BUILD_TESTS}\t(Build the unit tests: ON, OFF)")
-message(STATUS "  CPP-NETLIB_BUILD_EXAMPLES:    ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")
-message(STATUS "  CPP-NETLIB_ALWAYS_LOGGING:    ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")
-message(STATUS "  CPP-NETLIB_DISABLE_LOGGING:   ${CPP-NETLIB_DISABLE_LOGGING}\t(Disable logging definitely, no logging code will be generated or compiled: ON, OFF)")
-message(STATUS "  CPP-NETLIB_DISABLE_LIBCXX:    ${CPP-NETLIB_DISABLE_LIBCXX}\t(Disable using libc++ when building with clang: ON, OFF)")
+message(STATUS "  CPP-NETLIB_BUILD_SHARED_LIBS:      ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
+message(STATUS "  CPP-NETLIB_BUILD_SINGLE_LIB:       ${CPP-NETLIB_BUILD_SINGLE_LIB}\t(Build cpp-netlib into a single library: OFF, ON)")
+message(STATUS "  CPP-NETLIB_BUILD_TESTS:            ${CPP-NETLIB_BUILD_TESTS}\t(Build the unit tests: ON, OFF)")
+message(STATUS "  CPP-NETLIB_BUILD_EXAMPLES:         ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")
+message(STATUS "  CPP-NETLIB_ALWAYS_LOGGING:         ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")
+message(STATUS "  CPP-NETLIB_DISABLE_LOGGING:        ${CPP-NETLIB_DISABLE_LOGGING}\t(Disable logging definitely, no logging code will be generated or compiled: ON, OFF)")
+message(STATUS "  CPP-NETLIB_DISABLE_LIBCXX:         ${CPP-NETLIB_DISABLE_LIBCXX}\t(Disable using libc++ when building with clang: ON, OFF)")
+message(STATUS "  CPP-NETLIB_DISABLE_FEATURE_TESTS:  ${CPP-NETLIB_DISABLE_FEATURE_TESTS}\t(Disable the feature tests (which may use a network connection): ON, OFF)")
 message(STATUS "CMake build options selected:")
 
 # Takes one or more lists as parameter and prepends the prefix to every element.
@@ -124,21 +129,37 @@ if(CPP-NETLIB_BUILD_TESTS)
   set(GTEST_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gtest)
   set(GTEST_FOUND ON)
   set(GTEST_INCLUDE_DIRS ${GTEST_ROOT}/include)
-  set(GTEST_LIBRARIES gtest)
-  set(GTEST_MAIN_LIBRARIES gtest_main)
-  set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+  set(GTEST_LIBRARY gtest)
+  set(GTEST_MAIN_LIBRARY gtest_main)
+  set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
 
   set(GMOCK_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gmock)
   set(GMOCK_FOUND ON)
   set(GMOCK_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} {${GMOCK_DIR}/include)
-  set(GMOCK_LIBRARIES {$GTEST_LIBRARIES} gmock)
-  set(GMOCK_MAIN_LIBRARIES gmock_main)
-  set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
+  set(GMOCK_LIBRARY {$GTEST_LIBRARIES} gmock)
+  set(GMOCK_MAIN_LIBRARY gmock_main)
+  set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
+
+  set(IGLOO_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/igloo)
+  set(IGLOO_FOUND ON)
+  set(IGLOO_INCLUDE_DIR ${IGLOO_ROOT})
 endif()
 
+# Documentation
+find_package(Doxygen)
+if (DOXYGEN_FOUND)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+  add_custom_target(doc
+    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Generating API documentation with Doxygen" VERBATIM)
+  set(CPP-NETLIB_GENERATE_DOCS ON)
+endif(DOXYGEN_FOUND)
+
 if(CPP-NETLIB_BUILD_SINGLE_LIB)
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/config/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/error/src
     ${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src
     ${CMAKE_CURRENT_SOURCE_DIR}/http/src
     ${CMAKE_CURRENT_SOURCE_DIR}/logging/src
@@ -151,8 +172,9 @@ endif()
 add_subdirectory(uri)
 add_subdirectory(message)
 add_subdirectory(logging)
-add_subdirectory(concurrency)
+add_subdirectory(error)
 add_subdirectory(http)
+add_subdirectory(concurrency)
 #add_subdirectory(mime)
 if(CPP-NETLIB_BUILD_EXAMPLES)
   add_subdirectory(contrib/http_examples)