Merge branch 'use-conda-toolchain'

Build and test conda package with Anaconda C++ compiler.
Adhere to compiler flags environment variables.

Author: pavoljuhas

.travis.yml

@@ -44,9 +44,13 @@ before_install:
   - MYMCREPO=https://repo.continuum.io/miniconda
   - case ${TRAVIS_OS_NAME} in
     linux)
-        MYMCBUNDLE=Miniconda3-latest-Linux-x86_64.sh ;;
+        MYMCBUNDLE=Miniconda3-latest-Linux-x86_64.sh;
+        MYCXXCOMPILER=gxx_linux-64
+        ;;
     osx)
-        MYMCBUNDLE=Miniconda3-latest-MacOSX-x86_64.sh ;;
+        MYMCBUNDLE=Miniconda3-latest-MacOSX-x86_64.sh;
+        MYCXXCOMPILER=clangxx_osx-64
+        ;;
     *)
         echo "Unsupported operating system." >&2;
         exit 2 ;;
@@ -61,7 +65,7 @@ before_install:
   - $NOMC || source ~/mc/bin/activate root
   - $NOMC || conda update --yes conda
   - $NOMC || conda install --yes conda-build jinja2
-  - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION}
+  - $NOMC || conda create --name=testenv --yes $MYCXXCOMPILER
   - $NOMC || conda config --add channels diffpy
 
   - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
@@ -107,17 +111,16 @@ install:
         exit 1;
     fi
 
-  - $NOMC || export LIBRARY_PATH="${MYLIB}"
-  - $NOMC || export CPATH="${MYINCLUDE}"
-  - $NOMC || MYLINKFLAGS="-Wl,-rpath,${MYLIB}"
+  - $NOMC || MYCOMPILEFLAGS="-I${MYINCLUDE} ${CXXFLAGS} ${CPPFLAGS}"
+  - $NOMC || MYLINKFLAGS="-L${MYLIB} ${LDFLAGS} -Wl,-rpath,${MYLIB}"
 
 
 before_script:
   - cd "${TRAVIS_BUILD_DIR}/examples"
 
 
 script:
-  - $CXX -o testlib testlib.cpp -lObjCryst $MYLINKFLAGS
+  - $CXX -o testlib $MYCOMPILEFLAGS testlib.cpp -lObjCryst $MYLINKFLAGS
   - ./testlib
 
 

conda-recipe/build.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-export CPATH="$PREFIX/include:$CPATH"
 MYNCPU=$(( (CPU_COUNT > 8) ? 8 : CPU_COUNT ))
 
+# Apply sconscript.local customizations.
+cp ${RECIPE_DIR}/sconscript.local ./
+
 scons -j $MYNCPU
 scons install prefix=$PREFIX

conda-recipe/meta.yaml

@@ -13,6 +13,7 @@ build:
 
 requirements:
   build:
+    - {{ compiler('cxx') }}
     - python
     - scons
   host:

conda-recipe/sconscript.local

@@ -0,0 +1,12 @@
+# Customize scons build environment.
+
+Import('env')
+
+import os
+
+# Silence copious warnings from the boost headers.
+P = os.environ['PREFIX']
+env.Prepend(CCFLAGS=['-isystem{}/include'.format(P)])
+env.Replace(CXX=os.environ['CXX'])
+
+# vim: ft=python

src/SConscript

@@ -5,7 +5,7 @@ Import('env')
 # Build environment configuration --------------------------------------------
 
 # Apply CFLAGS, CXXFLAGS, LDFLAGS from the system environment.
-flagnames = 'CFLAGS CXXFLAGS LDFLAGS'.split()
+flagnames = 'CFLAGS CXXFLAGS CPPFLAGS LDFLAGS'.split()
 env.MergeFlags([os.environ.get(n, '') for n in flagnames])
 
 # Insert LIBRARY_PATH explicitly because some compilers