diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index 734697fdc35b59884f548727eabdbc87b88110bd..d206ad2a71d900ea416e8e293dc1772153bc58a2 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -3,12 +3,12 @@ set +e echo 'Begin build-wheel OSX ...' export PYTHON_VERSION=${MB_PYTHON_VERSION/./} -echo 'MB_PYTHON_VERSION: ' $MB_PYTHON_VERSION -echo 'PYTHON_VERSION: ' $PYTHON_VERSION +echo 'MB_PYTHON_VERSION: ' "$MB_PYTHON_VERSION" +echo 'PYTHON_VERSION: ' "$PYTHON_VERSION" echo 'PIP and brew installs' -pip install $BUILD_DEPENDS +pip install "$BUILD_DEPENDS" cd opencv @@ -18,11 +18,11 @@ git apply --ignore-space-change --ignore-whitespace ../travis/disable_i386.patch echo "Detect Python paths for OpenCV" -PYTHON_VERSION_STRING = $(python -c "from platform import python_version; print(python_version())") -PYTHON_INCLUDE_PATH = $(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") -PYTHON_PACKAGES_PATH = $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -PYTHON_NUMPY_INCLUDE_DIRS = $(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))") -PYTHON_NUMPY_VERSION = $(python -c "import numpy; print(numpy.version.version)") +PYTHON_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())") +PYTHON_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") +PYTHON_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") +PYTHON_NUMPY_INCLUDE_DIRS=$(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))") +PYTHON_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)") echo "PYthon version string: $PYTHON_VERSION_STRING" echo "Python include path: $PYTHON_INCLUDE_PATH" @@ -43,12 +43,13 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then -D BUILD_EXAMPLES=OFF \ -D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \ -D PYTHON2_EXECUTABLE=python \ - -D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \ - -D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \ - -D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \ - -D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \ - -D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \ + -D PYTHON2_VERSION_STRING="$PYTHON_VERSION_STRING" \ + -D PYTHON2_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \ + -D PYTHON2_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \ + -D PYTHON2_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \ + -D PYTHON2_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \ .. + fi if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then @@ -59,12 +60,13 @@ if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then -D BUILD_EXAMPLES=OFF \ -D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \ -D PYTHON3_EXECUTABLE=python \ - -D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \ - -D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \ - -D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \ - -D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \ - -D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \ + -D PYTHON3_VERSION_STRING="$PYTHON_VERSION_STRING" \ + -D PYTHON3_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \ + -D PYTHON3_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \ + -D PYTHON3_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \ + -D PYTHON3_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \ .. + fi if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then @@ -75,12 +77,13 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then -D BUILD_EXAMPLES=OFF \ -D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \ -D PYTHON2_EXECUTABLE=python \ - -D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \ - -D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \ - -D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \ - -D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \ - -D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \ + -D PYTHON2_VERSION_STRING="$PYTHON_VERSION_STRING" \ + -D PYTHON2_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \ + -D PYTHON2_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \ + -D PYTHON2_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \ + -D PYTHON2_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \ .. + fi if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then @@ -91,12 +94,13 @@ if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then -D BUILD_EXAMPLES=OFF \ -D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \ -D PYTHON3_EXECUTABLE=python \ - -D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \ - -D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \ - -D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \ - -D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \ - -D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \ + -D PYTHON3_VERSION_STRING="$PYTHON_VERSION_STRING" \ + -D PYTHON3_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \ + -D PYTHON3_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \ + -D PYTHON3_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \ + -D PYTHON3_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \ .. + fi echo 'Begin build' @@ -104,11 +108,13 @@ echo 'Begin build' if [[ $PYTHON_VERSION == 2* ]]; then echo 'Build for Py2' make -j8 opencv_python2 + fi if [[ $PYTHON_VERSION == 3* ]]; then echo 'Build for Py3' make -j8 opencv_python3 + fi # Moving back to opencv-python @@ -117,11 +123,13 @@ cd ../.. if [[ $PYTHON_VERSION == 2* ]]; then echo 'Copying *.so for Py2' cp opencv/build/lib/cv2.so cv2/ + fi if [[ $PYTHON_VERSION == 3* ]]; then echo 'Copying *.so for Py3' cp opencv/build/lib/python3/*.so cv2/ + fi echo 'Build wheel' diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 3930712b71e043450c1b46a792f867d5ed12b364..ae5e9c2bfcb6fdcad606887f3d95e8350702084e 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -3,11 +3,11 @@ set +e echo 'Begin build-wheel...' export PYTHON_VERSION=${PYTHON_VERSION/./} -echo 'PYTHON_VERSION: ' $PYTHON_VERSION +echo 'PYTHON_VERSION: ' "$PYTHON_VERSION" ENABLE_CONTRIB=$(