Merge branch 'macOS'

6 files changed, 30 insertions, 21 deletions

diff --git a/python/conda/bld.bat b/python/conda/astra-toolbox/bld.bat
index 15777ce..15777ce 100644
--- a/python/conda/bld.bat
+++ b/python/conda/astra-toolbox/bld.bat
diff --git a/python/conda/build.sh b/python/conda/astra-toolbox/build.sh
index 951fd88..951fd88 100644
--- a/python/conda/build.sh
+++ b/python/conda/astra-toolbox/build.sh
diff --git a/python/conda/meta.yaml b/python/conda/astra-toolbox/meta.yaml
index 942397e..942397e 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index 5807697..98220f5 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -7,17 +7,22 @@ $SRC_DIR/build/linux/autogen.sh
 # Add C++11 to compiler flags if nvcc supports it, mostly to work around a boost bug
 NVCC=$CUDA_ROOT/bin/nvcc
 echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu
-$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || /bin/true
+$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null 2>&1 && EXTRA_NVCCFLAGS="--std=c++11" || true
 rm -f $CONDA_PREFIX/test.out
 
-$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CFLAGS="-I$CONDA_PREFIX/include/boost" CXXFLAGS="-I$CONDA_PREFIX/include/boost"
+$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC -I$CONDA_PREFIX/include $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CPPFLAGS="-I$CONDA_PREFIX/include"
 
 make install-libraries
 
-LIBPATH=lib
-if [ $ARCH == 64 ]
-  then
-    LIBPATH+=64
-fi
-cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
-cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
+
+test -d $CUDA_ROOT/lib64 && LIBPATH="$CUDA_ROOT/lib64" || LIBPATH="$CUDA_ROOT/lib"
+
+case `uname` in
+  Darwin*)
+    cp -P $LIBPATH/libcudart.*.dylib $CONDA_PREFIX/lib
+    cp -P $LIBPATH/libcufft.*.dylib $CONDA_PREFIX/lib
+  *)
+    cp -P $LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
+    cp -P $LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
+    ;;
+esac
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index c05a466..68cf47a 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -16,6 +16,10 @@ build:
 requirements:
   build:
     - vs2015_runtime # [win]
+    - boost # [osx]
+    - automake # [osx]
+    - autoconf # [osx]
+    - libtool # [osx]
 
   run:
     - vs2015_runtime # [win]
diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index 8be05b8..2404609 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -2,16 +2,16 @@ FROM astra-build-env
 ARG BUILD_NUMBER=
 WORKDIR /root
 RUN git clone --depth 1 https://github.com/astra-toolbox/astra-toolbox
-RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/meta.yaml
+RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/astra-toolbox/meta.yaml
 RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra
-RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda
-RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox