Travis CI: OS X builds

Mac OS X 10.11 with Python 2.7.12, CMake 3.6.2 and Boost 1.61.0 this is
the environment offered by Travis CI with their Xcode 7.3.1 image. The
following compilers are used:

1. Apple LLVM 7.3.0 and GFortran 4.8.5
2. GCC 4.8.5
3. Apple LLVM 7.3.0 and GFortran 4.9.3
4. GCC 4.9.3
5. Apple LLVM 7.3.0 and GFortran 5.4.0
6. GCC 5.4.0
7. Apple LLVM 7.3.0 and GFortran 6.2.0
8. GCC 6.2.0

Author: robertodr

.appveyor.yml

@@ -13,7 +13,6 @@ version: '{build}-{branch}'
 # branches to build
 branches:
   only:
-    - fix-travis
     - fix-appveyor
 
 os: Windows Server 2012 R2

.travis.yml

@@ -13,6 +13,9 @@ env:
   - CCACHE_COMPRESS=1
   - CCACHE_MAXSIZE=200M
   - CCACHE_CPP2=1
+branches:
+  except:
+    - /*(?i:appveyor)*/
 matrix:
   include:
   - os: linux
@@ -33,6 +36,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='clang++-3.5' C_COMPILER='clang-3.5' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode7.3
+    compiler: clang
+    env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
   - os: linux
     compiler: clang
     addons: &2
@@ -51,6 +58,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='clang++-3.6' C_COMPILER='clang-3.6' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode7.3
+    compiler: gcc
+    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
   - os: linux
     compiler: clang
     addons: &3
@@ -69,6 +80,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='clang++-3.7' C_COMPILER='clang-3.7' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode7.3
+    compiler: clang
+    env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran-6' BUILD_TYPE='release'
   - os: linux
     compiler: clang
     addons: &4
@@ -87,6 +102,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='clang++-3.8' C_COMPILER='clang-3.8' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode7.3
+    compiler: gcc
+    env: CXX_COMPILER='g++-6' C_COMPILER='gcc-6' Fortran_COMPILER='gfortran-6' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: &5
@@ -105,6 +124,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='g++-4.6' C_COMPILER='gcc-4.6' Fortran_COMPILER='gfortran-4.6'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode8.1
+    compiler: clang
+    env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: &6
@@ -123,6 +146,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='g++-4.7' C_COMPILER='gcc-4.7' Fortran_COMPILER='gfortran-4.7'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode8.1
+    compiler: gcc
+    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: &7
@@ -141,6 +168,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='g++-4.8' C_COMPILER='gcc-4.8' Fortran_COMPILER='gfortran-4.8'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode8.1
+    compiler: clang
+    env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran-6' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: &8
@@ -159,6 +190,10 @@ matrix:
         - python-virtualenv
     env: CXX_COMPILER='g++-4.9' C_COMPILER='gcc-4.9' Fortran_COMPILER='gfortran-4.9'
       BUILD_TYPE='release'
+  - os: osx
+    osx_image: xcode8.1
+    compiler: gcc
+    env: CXX_COMPILER='g++-6' C_COMPILER='gcc-6' Fortran_COMPILER='gfortran-6' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: &9
@@ -176,14 +211,6 @@ matrix:
         - gfortran-5
         - python-virtualenv
     env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
-  - os: osx
-    osx_image: xcode7
-    compiler: clang
-    env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran' BUILD_TYPE='release'
-  - os: osx
-    osx_image: xcode7
-    compiler: gcc
-    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: *9
@@ -192,7 +219,7 @@ matrix:
 install:
 - |
   if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-    brew install cmake boost python gcc pyenv-virtualenv
+    brew install cmake boost python gcc5 gcc6 pyenv-virtualenv
   fi
   virtualenv venv
   source venv/bin/activate
@@ -205,6 +232,7 @@ before_script:
 - ${C_COMPILER} --version
 - export FC=${Fortran_COMPILER}
 - ${Fortran_COMPILER} --version
+- python --version
 - |
   if [[ "${COVERAGE}" = true ]]; then
     python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake -DENABLE_FORTRAN_API=ON' --coverage
@@ -214,7 +242,7 @@ before_script:
 - cd build
 script:
 - VERBOSE=1 make -j 2
-- ctest -V -j 2
+- ctest --parallel 2 --output-on-failure --verbose --dashboard Experimental
 after_success:
 - |
   if [[ "${COVERAGE}" = true ]]; then

README.md

@@ -1,7 +1,6 @@
 [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.11910.png)](http://dx.doi.org/10.5281/zenodo.11910)
 [![Travis CI Build Status](https://travis-ci.org/PCMSolver/pcmsolver.svg?branch=master)](https://travis-ci.org/PCMSolver/pcmsolver)
 [![Magnum CI build status](https://magnum-ci.com/status/9207aa29405095b0b7aef0cd809ed6c2.png?branch=master)](https://magnum-ci.com/builds)
-[![AppVeyor CI Build status](https://ci.appveyor.com/api/projects/status/qolwog8ql2gefebr?svg=true)](https://ci.appveyor.com/project/robertodr/pcmsolver)
 [![Documentation Status](https://readthedocs.org/projects/pcmsolver/badge/?version=latest)](http://pcmsolver.readthedocs.org/en/latest/?badge=latest)
 [![Coverage Status](https://coveralls.io/repos/PCMSolver/pcmsolver/badge.svg?branch=release)](https://coveralls.io/r/PCMSolver/pcmsolver?branch=release)
 [![Coverity Scan Build](https://scan.coverity.com/projects/3046/badge.svg)](https://scan.coverity.com/projects/3046)
@@ -29,15 +28,15 @@ stated otherwise.
 Continuous integration builds
 -----------------------------
 
-The Magnum CI builds are run on push events to any branch, while those
-on Travis CI only when pushing to the `master` branch.
-All Travis CI builds on master use ccache to speed up execution.
+All CI builds are triggered by push events to any branch.
+Travis CI runs release builds using [ccache](https://ccache.samba.org/) to speed up compilation.
+Magnum CI runs debug builds.
 
 - Ubuntu 12.04 LTS 64-bit. GCC 4.6, Python 2.7.3, CMake 3.4.2
   This is the environment offered by [Magnum CI](https://magnum-ci.com)
 - Ubuntu 12.04 LTS 64-bit with Python 2.7.3, CMake 3.3.2 and Boost 1.55.0
   this is the environment offered by [Travis CI](https://travis-ci.org) pulling
-  in various PPA. The following compilers are used, both in release and debug:
+  in various PPA. The following compilers are used:
 
   1. GCC 4.6
   2. GCC 4.7
@@ -49,12 +48,25 @@ All Travis CI builds on master use ccache to speed up execution.
   8. Clang 3.7 and GFortran 4.6
   9. Clang 3.8 and GFortran 4.6
 
-- Mac OS X 10.9.5 with Python 2.7.10, CMake 3.2.3 and Boost 1.58.0
+- Mac OS X 10.11 with Python 2.7.12, CMake 3.6.2 and Boost 1.61.0
   this is the environment offered by [Travis CI](https://travis-ci.org)
-  The following compilers are used, both in release and debug:
+  with their Xcode 7.3.1 image.
+  The following compilers are used:
 
-  1. XCode 7.0 with Clang and GFortran 5.2
-  2. XCode 7.0 with GCC 5.2
+  1. Apple LLVM 7.3.0 and GFortran 5.4.0
+  2. GCC 5.4.0
+  3. Apple LLVM 7.3.0 and GFortran 6.2.0
+  4. GCC 6.2.0
+
+- Mac OS X 10.12 with Python 2.7.12, CMake 3.6.1 and Boost 1.61.0
+  this is the environment offered by [Travis CI](https://travis-ci.org)
+  with their Xcode 8.1 image.
+  The following compilers are used:
+
+  1. Apple LLVM 8.1.0 and GFortran 5.4.0
+  2. GCC 5.4.0
+  3. Apple LLVM 8.1.0 and GFortran 6.2.0
+  4. GCC 6.2.0
 
 The build needed for submission to [Coverity scan](https://scan.coverity.com/)
 is triggered by pushes to the `coverity_scan` branch. It is run on

api/pcmsolver.h

@@ -95,7 +95,7 @@ typedef enum {
  *  \param[in] message_length length of the passed message
  *  This function **must** be defined by the host program
  */
-void host_writer(const char * message, int message_length);
+PCMSOLVER_API void host_writer(const char * message, int message_length);
 
 /*! \brief Creates a new PCM context object
  *  \param[in] input_reading input processing strategy

cmake/custom/api.cmake

@@ -1,3 +1,17 @@
+#.rst:
+#
+# Manage compilation of API.
+# Optionally, enable compilation of Fortran 90 API bindings.
+#
+# Variables defined::
+#
+#   ENABLE_FORTRAN_API
+#
+# autocmake.yml configuration::
+#
+#   docopt: "--fbindings=<ENABLE_FORTRAN_API> Enable compilation of Fortran 90 API bindings <ON/OFF> [default: ON]."
+#   define: "'-DENABLE_FORTRAN_API={0}'.format(arguments['--fbindings'])"
+
 include_directories(${PROJECT_SOURCE_DIR}/api)
 
 install(FILES ${PROJECT_SOURCE_DIR}/api/pcmsolver.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})

cmake/custom/windows.cmake

@@ -3,6 +3,4 @@ if(CMAKE_SYSTEM_NAME MATCHES Windows)
   add_definitions(-DPCMSOLVER_BUILD_SHARED)
   # Get math constants such as M_PI
   add_definitions(-D_USE_MATH_DEFINES)
-  # Mark as undefined symbols that have to be defined by the host
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-U,host_writer")
 endif()

setup.py

@@ -38,6 +38,7 @@
   --build-boost=<FORCE_CUSTOM_BOOST>       Deactivate Boost detection and build on-the-fly <ON/OFF> [default: OFF].
   --static                                 Create only the static library [default: False].
   --eigen=<EIGEN3_ROOT>                    Root directory for Eigen3 [default: ''].
+  --fbindings=<ENABLE_FORTRAN_API>         Enable compilation of Fortran 90 API bindings <ON/OFF> [default: ON].
   --type=<TYPE>                            Set the CMake build type (debug, release, or relwithdeb) [default: release].
   --generator=<STRING>                     Set the CMake build system generator [default: Unix Makefiles].
   --show                                   Show CMake command and exit.
@@ -78,6 +79,7 @@ def gen_cmake_command(options, arguments):
     command.append('-DBOOST_COMPONENTS_REQUIRED=""')
     command.append('-DSTATIC_LIBRARY_ONLY={0}'.format(arguments['--static']))
     command.append('-DEIGEN3_ROOT="{0}"'.format(arguments['--eigen']))
+    command.append('-DENABLE_FORTRAN_API={0}'.format(arguments['--fbindings']))
     command.append('-DCMAKE_BUILD_TYPE={0}'.format(arguments['--type']))
     command.append('-G "{0}"'.format(arguments['--generator']))
     if arguments['--cmake-options'] != "''":