Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 621659d

Browse filesBrowse files
skvarkskvark
committed
fix bash syntax
1 parent 8ca2cf8 commit 621659d
Copy full SHA for 621659d

File tree

2 files changed

+71
-55
lines changed
Filter options

2 files changed

+71
-55
lines changed

‎travis/build-wheels-osx.sh

Copy file name to clipboardExpand all lines: travis/build-wheels-osx.sh
+36-28Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ set +e
33
echo 'Begin build-wheel OSX ...'
44

55
export PYTHON_VERSION=${MB_PYTHON_VERSION/./}
6-
echo 'MB_PYTHON_VERSION: ' $MB_PYTHON_VERSION
7-
echo 'PYTHON_VERSION: ' $PYTHON_VERSION
6+
echo 'MB_PYTHON_VERSION: ' "$MB_PYTHON_VERSION"
7+
echo 'PYTHON_VERSION: ' "$PYTHON_VERSION"
88

99
echo 'PIP and brew installs'
1010

11-
pip install $BUILD_DEPENDS
11+
pip install "$BUILD_DEPENDS"
1212

1313
cd opencv
1414

@@ -18,11 +18,11 @@ git apply --ignore-space-change --ignore-whitespace ../travis/disable_i386.patch
1818

1919
echo "Detect Python paths for OpenCV"
2020

21-
PYTHON_VERSION_STRING = $(python -c "from platform import python_version; print(python_version())")
22-
PYTHON_INCLUDE_PATH = $(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
23-
PYTHON_PACKAGES_PATH = $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
24-
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()))")
25-
PYTHON_NUMPY_VERSION = $(python -c "import numpy; print(numpy.version.version)")
21+
PYTHON_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())")
22+
PYTHON_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
23+
PYTHON_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
24+
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()))")
25+
PYTHON_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)")
2626

2727
echo "PYthon version string: $PYTHON_VERSION_STRING"
2828
echo "Python include path: $PYTHON_INCLUDE_PATH"
@@ -43,12 +43,13 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
4343
-D BUILD_EXAMPLES=OFF \
4444
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
4545
-D PYTHON2_EXECUTABLE=python \
46-
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
47-
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
48-
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
49-
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
50-
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
46+
-D PYTHON2_VERSION_STRING="$PYTHON_VERSION_STRING" \
47+
-D PYTHON2_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
48+
-D PYTHON2_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
49+
-D PYTHON2_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
50+
-D PYTHON2_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
5151
..
52+
5253
fi
5354

5455
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
@@ -59,12 +60,13 @@ if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
5960
-D BUILD_EXAMPLES=OFF \
6061
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
6162
-D PYTHON3_EXECUTABLE=python \
62-
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
63-
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
64-
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
65-
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
66-
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
63+
-D PYTHON3_VERSION_STRING="$PYTHON_VERSION_STRING" \
64+
-D PYTHON3_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
65+
-D PYTHON3_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
66+
-D PYTHON3_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
67+
-D PYTHON3_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
6768
..
69+
6870
fi
6971

7072
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
@@ -75,12 +77,13 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
7577
-D BUILD_EXAMPLES=OFF \
7678
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
7779
-D PYTHON2_EXECUTABLE=python \
78-
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
79-
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
80-
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
81-
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
82-
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
80+
-D PYTHON2_VERSION_STRING="$PYTHON_VERSION_STRING" \
81+
-D PYTHON2_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
82+
-D PYTHON2_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
83+
-D PYTHON2_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
84+
-D PYTHON2_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
8385
..
86+
8487
fi
8588

8689
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
@@ -91,24 +94,27 @@ if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
9194
-D BUILD_EXAMPLES=OFF \
9295
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
9396
-D PYTHON3_EXECUTABLE=python \
94-
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
95-
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
96-
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
97-
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
98-
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
97+
-D PYTHON3_VERSION_STRING="$PYTHON_VERSION_STRING" \
98+
-D PYTHON3_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
99+
-D PYTHON3_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
100+
-D PYTHON3_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
101+
-D PYTHON3_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
99102
..
103+
100104
fi
101105

102106
echo 'Begin build'
103107

104108
if [[ $PYTHON_VERSION == 2* ]]; then
105109
echo 'Build for Py2'
106110
make -j8 opencv_python2
111+
107112
fi
108113

109114
if [[ $PYTHON_VERSION == 3* ]]; then
110115
echo 'Build for Py3'
111116
make -j8 opencv_python3
117+
112118
fi
113119

114120
# Moving back to opencv-python
@@ -117,11 +123,13 @@ cd ../..
117123
if [[ $PYTHON_VERSION == 2* ]]; then
118124
echo 'Copying *.so for Py2'
119125
cp opencv/build/lib/cv2.so cv2/
126+
120127
fi
121128

122129
if [[ $PYTHON_VERSION == 3* ]]; then
123130
echo 'Copying *.so for Py3'
124131
cp opencv/build/lib/python3/*.so cv2/
132+
125133
fi
126134

127135
echo 'Build wheel'

‎travis/build-wheels.sh

Copy file name to clipboardExpand all lines: travis/build-wheels.sh
+35-27Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ set +e
33
echo 'Begin build-wheel...'
44

55
export PYTHON_VERSION=${PYTHON_VERSION/./}
6-
echo 'PYTHON_VERSION: ' $PYTHON_VERSION
6+
echo 'PYTHON_VERSION: ' "$PYTHON_VERSION"
77

88
ENABLE_CONTRIB=$(<contrib.enabled)
99

10-
pip install $BUILD_DEPENDS
10+
pip install "$BUILD_DEPENDS"
1111

1212
echo 'Install cmake 3.9.0'
1313

@@ -21,11 +21,11 @@ cd ..
2121

2222
echo "Detect Python paths for OpenCV"
2323

24-
PYTHON_VERSION_STRING = $(python -c "from platform import python_version; print(python_version())")
25-
PYTHON_INCLUDE_PATH = $(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
26-
PYTHON_PACKAGES_PATH = $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
27-
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()))")
28-
PYTHON_NUMPY_VERSION = $(python -c "import numpy; print(numpy.version.version)")
24+
PYTHON_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())")
25+
PYTHON_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
26+
PYTHON_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
27+
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()))")
28+
PYTHON_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)")
2929

3030
echo "PYthon version string: $PYTHON_VERSION_STRING"
3131
echo "Python include path: $PYTHON_INCLUDE_PATH"
@@ -46,11 +46,12 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
4646
-D BUILD_EXAMPLES=OFF \
4747
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
4848
-D PYTHON2_EXECUTABLE=python \
49-
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
50-
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
51-
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
52-
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
53-
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
49+
-D PYTHON2_VERSION_STRING="$PYTHON_VERSION_STRING" \
50+
-D PYTHON2_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
51+
-D PYTHON2_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
52+
-D PYTHON2_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
53+
-D PYTHON2_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
54+
5455
fi
5556

5657
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
@@ -61,11 +62,12 @@ if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
6162
-D BUILD_EXAMPLES=OFF \
6263
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
6364
-D PYTHON3_EXECUTABLE=python \
64-
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
65-
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
66-
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
67-
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
68-
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
65+
-D PYTHON3_VERSION_STRING="$PYTHON_VERSION_STRING" \
66+
-D PYTHON3_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
67+
-D PYTHON3_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
68+
-D PYTHON3_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
69+
-D PYTHON3_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
70+
6971
fi
7072

7173
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
@@ -76,11 +78,12 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
7678
-D BUILD_EXAMPLES=OFF \
7779
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
7880
-D PYTHON2_EXECUTABLE=python \
79-
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
80-
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
81-
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
82-
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
83-
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
81+
-D PYTHON2_VERSION_STRING="$PYTHON_VERSION_STRING" \
82+
-D PYTHON2_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
83+
-D PYTHON2_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
84+
-D PYTHON2_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
85+
-D PYTHON2_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
86+
8487
fi
8588

8689
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
@@ -91,21 +94,24 @@ if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
9194
-D BUILD_EXAMPLES=OFF \
9295
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
9396
-D PYTHON3_EXECUTABLE=python \
94-
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
95-
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
96-
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
97-
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
98-
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
97+
-D PYTHON3_VERSION_STRING="$PYTHON_VERSION_STRING" \
98+
-D PYTHON3_INCLUDE_PATH="$PYTHON_INCLUDE_PATH" \
99+
-D PYTHON3_PACKAGES_PATH="$PYTHON_PACKAGES_PATH" \
100+
-D PYTHON3_NUMPY_INCLUDE_DIRS="$PYTHON_NUMPY_INCLUDE_DIRS" \
101+
-D PYTHON3_NUMPY_VERSION="$PYTHON_NUMPY_VERSION" \
102+
99103
fi
100104

101105
if [[ $PYTHON_VERSION == 2* ]]; then
102106
echo 'Build for Py2'
103107
(cd build; make -j8 opencv_python2)
108+
104109
fi
105110

106111
if [[ $PYTHON_VERSION == 3* ]]; then
107112
echo 'Build for Py3'
108113
(cd build; make -j8 opencv_python3)
114+
109115
fi
110116

111117
# Moving back to opencv-python
@@ -114,11 +120,13 @@ cd ..
114120
if [[ $PYTHON_VERSION == 2* ]]; then
115121
echo 'Copying *.so for Py2'
116122
cp opencv/build/lib/cv2.so cv2/
123+
117124
fi
118125

119126
if [[ $PYTHON_VERSION == 3* ]]; then
120127
echo 'Copying *.so for Py3'
121128
cp opencv/build/lib/python3/*.so cv2/
129+
122130
fi
123131

124132
# Build wheel

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.