Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Richard 祝发兴 - -IT
opencv-python
提交
d907e08f
O
opencv-python
项目概览
Richard 祝发兴 - -IT
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d907e08f
编写于
3月 05, 2017
作者:
O
Olli-Pekka Heinisuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes to appveyor build, enable contrib on Linux and MacOS
上级
cbe8d626
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
199 addition
and
23 deletion
+199
-23
.travis.yml
.travis.yml
+104
-2
appveyor.yml
appveyor.yml
+5
-1
deploy.cmd
deploy.cmd
+0
-13
travis/build-wheels-osx.sh
travis/build-wheels-osx.sh
+49
-4
travis/build-wheels.sh
travis/build-wheels.sh
+28
-3
travis/deploy.sh
travis/deploy.sh
+13
-0
未找到文件。
.travis.yml
浏览文件 @
d907e08f
...
@@ -27,73 +27,176 @@ matrix:
...
@@ -27,73 +27,176 @@ matrix:
# Exclude the default Python 3.5 build
# Exclude the default Python 3.5 build
-
python
:
3.5
-
python
:
3.5
include
:
include
:
# default builds for MacOS
-
os
:
osx
language
:
generic
osx_image
:
xcode8.2
env
:
-
MB_PYTHON_VERSION=2.7
-
ENABLE_CONTRIB=0
-
os
:
osx
language
:
generic
osx_image
:
xcode8.2
env
:
-
MB_PYTHON_VERSION=3.4
-
ENABLE_CONTRIB=0
-
os
:
osx
language
:
generic
osx_image
:
xcode8.2
env
:
-
MB_PYTHON_VERSION=3.5
-
ENABLE_CONTRIB=0
-
os
:
osx
language
:
generic
osx_image
:
xcode8.2
env
:
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=0
# Contrib builds for MacOS
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8.2
osx_image
:
xcode8.2
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
ENABLE_CONTRIB=1
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8.2
osx_image
:
xcode8.2
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
ENABLE_CONTRIB=1
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8.2
osx_image
:
xcode8.2
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
ENABLE_CONTRIB=1
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8.2
osx_image
:
xcode8.2
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=1
# default builds for Linux
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
UNICODE_WIDTH=16
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
UNICODE_WIDTH=16
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.4
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.4
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.5
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.5
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.6
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=0
-
os
:
linux
env
:
-
MB_PYTHON_VERSION=3.6
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
ENABLE_CONTRIB=0
# contrib builds for Linux
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
UNICODE_WIDTH=16
-
UNICODE_WIDTH=16
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
PLAT=i686
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
PLAT=i686
-
UNICODE_WIDTH=16
-
UNICODE_WIDTH=16
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
PLAT=i686
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
PLAT=i686
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-
ENABLE_CONTRIB=1
-
os
:
linux
-
os
:
linux
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-
PLAT=i686
-
PLAT=i686
-
ENABLE_CONTRIB=1
before_install
:
before_install
:
-
source multibuild/common_utils.sh
-
source multibuild/common_utils.sh
...
@@ -111,5 +214,4 @@ script:
...
@@ -111,5 +214,4 @@ script:
after_success
:
after_success
:
# Upload wheels to pypi
# Upload wheels to pypi
-
pip install twine
-
source travis/deploy.sh
-
if [ -n "$TRAVIS_TAG" ]; then twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*; else echo "Tag not set, deployment skipped."; fi
\ No newline at end of file
\ No newline at end of file
appveyor.yml
浏览文件 @
d907e08f
...
@@ -121,4 +121,8 @@ artifacts:
...
@@ -121,4 +121,8 @@ artifacts:
name
:
wheels
name
:
wheels
deploy_script
:
deploy_script
:
-
deploy.cmd
-
cd %APPVEYOR_BUILD_FOLDER%
-
if %ENABLE_CONTRIB% EQU 0 (echo "This is default build. Deplyoment will be done to to PyPI entry opencv-python.") else (echo "This is contrib build. Deplyoment will be done to to PyPI entry opencv-contrib-python.")
-
if "%APPVEYOR_REPO_TAG%"=="true" ("%PYTHON%/python.exe" -m twine upload -u %USER% -p %PASS% --skip-existing dist/opencv*) else (echo "Tag not set, deployment skipped.")
\ No newline at end of file
deploy.cmd
已删除
100644 → 0
浏览文件 @
cbe8d626
cd
%APPVEYOR_BUILD_FOLDER%
if
%ENABLE_CONTRIB%
EQU
1
(
echo
"This is contrib build. Deplyoment will be done to to PyPI entry opencv-contrib-python."
if
"
%APPVEYOR_REPO_TAG%
"
==
"true"
(
"
%PYTHON%
/python.exe"
-m
twine
upload
-u
%USER%
-p
%PASS%
--skip-existing
dist
/opencv
*)
else
(
echo
"Tag not set, deployment skipped."
)
)
else
(
echo
"This is default build. Deplyoment will be done to to PyPI entry opencv-python."
if
"
%APPVEYOR_REPO_TAG%
"
==
"true"
(
"
%PYTHON%
/python.exe"
-m
twine
upload
-u
%USER%
-p
%PASS%
--skip-existing
dist
/opencv
*)
else
(
echo
"Tag not set, deployment skipped."
)
)
\ No newline at end of file
travis/build-wheels-osx.sh
浏览文件 @
d907e08f
...
@@ -16,7 +16,7 @@ cd opencv
...
@@ -16,7 +16,7 @@ cd opencv
mkdir
build
mkdir
build
cd
build
cd
build
if
[[
$PYTHON_VERSION
==
2
*
]]
;
then
if
[[
$PYTHON_VERSION
==
2
*
]]
&&
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
'Config for Py2'
echo
'Config for Py2'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
-D
BUILD_opencv_python3
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
BUILD_opencv_python3
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
...
@@ -27,7 +27,7 @@ if [[ $PYTHON_VERSION == 2* ]]; then
...
@@ -27,7 +27,7 @@ if [[ $PYTHON_VERSION == 2* ]]; then
-D
BUILD_EXAMPLES
=
OFF ..
-D
BUILD_EXAMPLES
=
OFF ..
fi
fi
if
[[
$PYTHON_VERSION
==
34
]]
;
then
if
[[
$PYTHON_VERSION
==
34
]]
&&
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
'Config for Py34'
echo
'Config for Py34'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
...
@@ -38,7 +38,7 @@ if [[ $PYTHON_VERSION == 34 ]]; then
...
@@ -38,7 +38,7 @@ if [[ $PYTHON_VERSION == 34 ]]; then
-D
BUILD_EXAMPLES
=
OFF ..
-D
BUILD_EXAMPLES
=
OFF ..
fi
fi
if
[[
$PYTHON_VERSION
==
35
]]
;
then
if
[[
$PYTHON_VERSION
==
35
]]
&&
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
'Config for Py35'
echo
'Config for Py35'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
...
@@ -49,7 +49,7 @@ if [[ $PYTHON_VERSION == 35 ]]; then
...
@@ -49,7 +49,7 @@ if [[ $PYTHON_VERSION == 35 ]]; then
-D
BUILD_EXAMPLES
=
OFF ..
-D
BUILD_EXAMPLES
=
OFF ..
fi
fi
if
[[
$PYTHON_VERSION
==
36
]]
;
then
if
[[
$PYTHON_VERSION
==
36
]]
&&
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
'Config for Py36'
echo
'Config for Py36'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
...
@@ -61,6 +61,51 @@ if [[ $PYTHON_VERSION == 36 ]]; then
...
@@ -61,6 +61,51 @@ if [[ $PYTHON_VERSION == 36 ]]; then
fi
fi
if
[[
$PYTHON_VERSION
==
2
*
]]
&&
[[
$ENABLE_CONTRIB
==
1
]]
;
then
echo
'Config for Py2'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
-DOPENCV_EXTRA_MODULES_PATH
=
../opencv_contrib/modules
\
-D
BUILD_opencv_python3
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
PYTHON2_PACKAGES_PATH
=
$(
python
-c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
)
\
-D
PYTHON2_LIBRARY
=
/usr/local/Cellar/python/2.7.10/Frameworks/Python.framework/Versions/2.7/bin
\
-D
PYTHON2_INCLUDE_DIR
=
/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
\
-D
INSTALL_C_EXAMPLES
=
OFF
-D
INSTALL_PYTHON_EXAMPLES
=
OFF
\
-D
BUILD_EXAMPLES
=
OFF ..
fi
if
[[
$PYTHON_VERSION
==
34
]]
&&
[[
$ENABLE_CONTRIB
==
1
]]
;
then
echo
'Config for Py34'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
-DOPENCV_EXTRA_MODULES_PATH
=
../opencv_contrib/modules
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
PYTHON3_PACKAGES_PATH
=
$(
python
-c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
)
\
-D
PYTHON3_LIBRARY
=
/usr/local/Cellar/python3/3.4.2_1/Frameworks/Python.framework/Versions/3.4/bin
\
-D
PYTHON3_INCLUDE_DIR
=
/Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
\
-D
INSTALL_C_EXAMPLES
=
OFF
-D
INSTALL_PYTHON_EXAMPLES
=
OFF
\
-D
BUILD_EXAMPLES
=
OFF ..
fi
if
[[
$PYTHON_VERSION
==
35
]]
&&
[[
$ENABLE_CONTRIB
==
1
]]
;
then
echo
'Config for Py35'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/local
-DOPENCV_EXTRA_MODULES_PATH
=
../opencv_contrib/modules
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
PYTHON3_PACKAGES_PATH
=
$(
python
-c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
)
\
-D
PYTHON3_LIBRARY
=
/usr/local/Cellar/python3/3.5.1/Frameworks/Python.framework/Versions/3.5/bin
\
-D
PYTHON3_INCLUDE_DIR
=
/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5m
\
-D
INSTALL_C_EXAMPLES
=
OFF
-D
INSTALL_PYTHON_EXAMPLES
=
OFF
\
-D
BUILD_EXAMPLES
=
OFF ..
fi
if
[[
$PYTHON_VERSION
==
36
]]
&&
[[
$ENABLE_CONTRIB
==
1
]]
;
then
echo
'Config for Py36'
cmake
-D
CMAKE_BUILD_TYPE
=
RELEASE
-D
CMAKE_INSTALL_PREFIX
=
/usr/loca
-DOPENCV_EXTRA_MODULES_PATH
=
../opencv_contrib/modules
\
-D
BUILD_opencv_python2
=
OFF
-D
BUILD_opencv_java
=
OFF
-D
BUILD_SHARED_LIBS
=
OFF
-D
WITH_LAPACK
=
OFF
\
-D
PYTHON3_PACKAGES_PATH
=
$(
python
-c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
)
\
-D
PYTHON3_LIBRARY
=
/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/bin
\
-D
PYTHON3_INCLUDE_DIR
=
/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m
\
-D
INSTALL_C_EXAMPLES
=
OFF
-D
INSTALL_PYTHON_EXAMPLES
=
OFF
\
-D
BUILD_EXAMPLES
=
OFF ..
fi
echo
'Begin build'
echo
'Begin build'
make
-j4
make
-j4
...
...
travis/build-wheels.sh
浏览文件 @
d907e08f
#!/bin/bash
#!/bin/bash
set
+e
set
+e
echo
'Begin build-wheel...'
echo
'Begin build-wheel...'
/opt/_internal/cpython-3.5.1/bin/pip3.5
install
--upgrade
git+git://github.com/pypa/auditwheel
export
PYTHON_VERSION
=
${
PYTHON_VERSION
/./
}
export
PYTHON_VERSION
=
${
PYTHON_VERSION
/./
}
...
@@ -17,7 +16,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
...
@@ -17,7 +16,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
echo
'Begin build'
echo
'Begin build'
cd
opencv
cd
opencv
mkdir
build
mkdir
build
if
[[
$PYTHON_VERSION
==
2
*
]]
;
then
if
[[
$PYTHON_VERSION
==
2
*
]]
&&
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
'Config for Py2'
echo
'Config for Py2'
cmake28
-H
"."
-B
"build"
-DCMAKE_BUILD_TYPE
=
Release
-DBUILD_opencv_python3
=
OFF
-DBUILD_opencv_java
=
OFF
-DBUILD_SHARED_LIBS
=
OFF
\
cmake28
-H
"."
-B
"build"
-DCMAKE_BUILD_TYPE
=
Release
-DBUILD_opencv_python3
=
OFF
-DBUILD_opencv_java
=
OFF
-DBUILD_SHARED_LIBS
=
OFF
\
-DBUILD_TESTS
=
OFF
-DBUILD_PERF_TESTS
=
OFF
-DWITH_IPP
=
OFF
\
-DBUILD_TESTS
=
OFF
-DBUILD_PERF_TESTS
=
OFF
-DWITH_IPP
=
OFF
\
...
@@ -30,7 +29,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
...
@@ -30,7 +29,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
-DPYTHON2_NUMPY_VERSION
=
$(
$PYBIN
/python
-c
"import numpy; print(numpy.version.version)"
)
-DPYTHON2_NUMPY_VERSION
=
$(
$PYBIN
/python
-c
"import numpy; print(numpy.version.version)"
)
fi
fi
if
[[
$PYTHON_VERSION
==
3
*
]]
;
then
if
[[
$PYTHON_VERSION
==
3
*
]]
&&
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
'Config for Py3'
echo
'Config for Py3'
cmake28
-H
"."
-B
"build"
-DCMAKE_BUILD_TYPE
=
Release
-DBUILD_opencv_python2
=
OFF
-DBUILD_opencv_java
=
OFF
-DBUILD_SHARED_LIBS
=
OFF
\
cmake28
-H
"."
-B
"build"
-DCMAKE_BUILD_TYPE
=
Release
-DBUILD_opencv_python2
=
OFF
-DBUILD_opencv_java
=
OFF
-DBUILD_SHARED_LIBS
=
OFF
\
-DBUILD_TESTS
=
OFF
-DBUILD_PERF_TESTS
=
OFF
-DWITH_IPP
=
OFF
\
-DBUILD_TESTS
=
OFF
-DBUILD_PERF_TESTS
=
OFF
-DWITH_IPP
=
OFF
\
...
@@ -43,6 +42,32 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
...
@@ -43,6 +42,32 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
-DPYTHON3_NUMPY_VERSION
=
$(
$PYBIN
/python
-c
"import numpy; print(numpy.version.version)"
)
-DPYTHON3_NUMPY_VERSION
=
$(
$PYBIN
/python
-c
"import numpy; print(numpy.version.version)"
)
fi
fi
if
[[
$PYTHON_VERSION
==
2
*
]]
&&
[[
$ENABLE_CONTRIB
==
1
]]
;
then
echo
'Config for Py2'
cmake28
-H
"."
-B
"build"
-DOPENCV_EXTRA_MODULES_PATH
=
../opencv_contrib/modules
-DCMAKE_BUILD_TYPE
=
Release
-DBUILD_opencv_python3
=
OFF
-DBUILD_opencv_java
=
OFF
-DBUILD_SHARED_LIBS
=
OFF
\
-DBUILD_TESTS
=
OFF
-DBUILD_PERF_TESTS
=
OFF
-DWITH_IPP
=
OFF
\
-DPYTHON2INTERP_FOUND
=
ON
-DPYTHON2LIBS_FOUND
=
ON
\
-DPYTHON2_EXECUTABLE
=
$PYBIN
/python
\
-DPYTHON2_VERSION_STRING
=
$(
$PYBIN
/python
-c
"from platform import python_version; print python_version()"
)
\
-DPYTHON2_INCLUDE_PATH
=
$(
$PYBIN
/python
-c
"from distutils.sysconfig import get_python_inc; print(get_python_inc())"
)
\
-DPYTHON2_PACKAGES_PATH
=
$(
$PYBIN
/python
-c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
)
\
-DPYTHON2_NUMPY_INCLUDE_DIRS
=
$(
$PYBIN
/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()))"
)
\
-DPYTHON2_NUMPY_VERSION
=
$(
$PYBIN
/python
-c
"import numpy; print(numpy.version.version)"
)
fi
if
[[
$PYTHON_VERSION
==
3
*
]]
&&
[[
$ENABLE_CONTRIB
==
1
]]
;
then
echo
'Config for Py3'
cmake28
-H
"."
-B
"build"
-DOPENCV_EXTRA_MODULES_PATH
=
../opencv_contrib/modules
-DCMAKE_BUILD_TYPE
=
Release
-DBUILD_opencv_python2
=
OFF
-DBUILD_opencv_java
=
OFF
-DBUILD_SHARED_LIBS
=
OFF
\
-DBUILD_TESTS
=
OFF
-DBUILD_PERF_TESTS
=
OFF
-DWITH_IPP
=
OFF
\
-DPYTHON3INTERP_FOUND
=
ON
-DPYTHON3LIBS_FOUND
=
ON
\
-DPYTHON3_EXECUTABLE
=
$PYBIN
/python
\
-DPYTHON3_VERSION_STRING
=
$(
$PYBIN
/python
-c
"from platform import python_version; print python_version()"
)
\
-DPYTHON3_INCLUDE_PATH
=
$(
$PYBIN
/python
-c
"from distutils.sysconfig import get_python_inc; print(get_python_inc())"
)
\
-DPYTHON3_PACKAGES_PATH
=
$(
$PYBIN
/python
-c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
)
\
-DPYTHON3_NUMPY_INCLUDE_DIRS
=
$(
$PYBIN
/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()))"
)
\
-DPYTHON3_NUMPY_VERSION
=
$(
$PYBIN
/python
-c
"import numpy; print(numpy.version.version)"
)
fi
if
[[
$PYTHON_VERSION
==
2
*
]]
;
then
if
[[
$PYTHON_VERSION
==
2
*
]]
;
then
echo
'Build for Py2'
echo
'Build for Py2'
(
cd
build
;
make
-j5
opencv_python2
)
(
cd
build
;
make
-j5
opencv_python2
)
...
...
travis/deploy.sh
0 → 100644
浏览文件 @
d907e08f
pip
install
twine
if
[[
$ENABLE_CONTRIB
==
0
]]
;
then
echo
"This is default build. Deployment will be done to to PyPI entry opencv-python."
else
echo
"This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
fi
if
[
-n
"
$TRAVIS_TAG
"
]
;
then
twine upload
-u
${
USER
}
-p
${
PASS
}
--skip-existing
${
TRAVIS_BUILD_DIR
}
/wheelhouse/opencv
*
;
else
echo
"Tag not set, deployment skipped."
;
fi
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录