8000 Build working for linux and OSX by c-martinez · Pull Request #10 · opencv/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Build working for linux and OSX #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 3, 2016
Merged

Build working for linux and OSX #10

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72e6976
Build on Travis CI using manylinux
c-martinez Jun 29, 2016
2bfbdd6
Fix appveyor (maybe)
c-martinez Jul 3, 2016
55fee0f
Update following suggestions from opencv #6774
c-martinez Jul 7, 2016
d45d413
Testing...
c-martinez Jul 19, 2016
867190d
Testing...
c-martinez Jul 19, 2016
cf4fea1
Testing OSX build
c-martinez Jul 19, 2016
2d8b64b
Merge remote-tracking branch 'upstream/master'
c-martinez Aug 22, 2016
531d318
Merge branch 'master' into osx
c-martinez Aug 22, 2016
73e2f1b
Testing OSX build
c-martinez Aug 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix appveyor (maybe)
  • Loading branch information
@c-martinez
c-martinez committed Jul 3, 2016
commit 2bfbdd690fecd3849bcd0b4823bfe3fcd22f1fba
80 changes: 36 additions & 44 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,73 @@
install:
- cmd: >-

git clone -q --branch=master https://github.com/Itseez/opencv.git "%APPVEYOR_BUILD_FOLDER%\opencv
git clone -q --branch=master https://github.com/c-martinez/opencv.git "%APPVEYOR_BUILD_FOLDER%\opencv

C:\Python35\python.exe find_version.py > tmp
C:\Python35\python.exe find_version.py

set /p opencv_version= < tmp

del tmp

echo %opencv_version%

appveyor UpdateBuild -Version "%opencv_version%-%APPVEYOR_BUILD_NUMBER%"

C:\Python27\python.exe -m pip install --upgrade pip

C:\Python27\python.exe -m pip install -r requirements.txt

C:\Python35\python.exe -m pip install --upgrade pip

C:\Python35\python.exe -m pip install -r requirements.txt

C:\Python27-x64\python.exe -m pip install --upgrade pip

C:\Python27-x64\python.exe -m pip install -r requirements.txt

C:\Python35-x64\python.exe -m pip install --upgrade pip

C:\Python35-x64\python.exe -m pip install -r requirements.txt

build_script:
- cmd: >-

if not exist "%APPVEYOR_BUILD_FOLDER%\opencv\build" mkdir "%APPVEYOR_BUILD_FOLDER%\opencv\build"

if not exist "%APPVEYOR_BUILD_FOLDER%\opencv\build64" mkdir "%APPVEYOR_BUILD_FOLDER%\opencv\build64"

cd opencv

cmake -G "Visual Studio 14" -H"." -B"build" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE=C:/Python35/python.exe -DPYTHON3_LIBRARY=C:/Python35/libs/python35.lib -DPYTHON3_INCLUDE_DIR=C:/Python35/include -Wno-dev

cd build

cmake --build . --config Release

cd ..

cmake -G "Visual Studio 14 Win64" -H"." -B"build64" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE=C:/Python35-x64/python.exe -DPYTHON3_LIBRARY=C:/Python35-x64/libs/python35.lib -DPYTHON3_INCLUDE_DIR=C:/Python35-x64/include -Wno-dev

cd build64

cmake --build . --config Release

cd ..\..

xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build\lib\RELEASE\*.pyd" cv2
C:\Python27\python.exe setup.py bdist_wheel --opencv-version %APPVEYOR_BUILD_VERSION%

C:\Python27\python.exe setup.py bdist_wheel

del cv2\*.pyd

xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build64\lib\RELEASE\*.pyd" cv2
C:\Python27-x64\python.exe setup.py bdist_wheel --opencv-version %APPVEYOR_BUILD_VERSION%

C:\Python27-x64\python.exe setup.py bdist_wheel

del cv2\*.pyd

xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build\lib\python3\Release\*.pyd" cv2
C:\Python35\python.exe setup.py bdist_wheel --opencv-version %APPVEYOR_BUILD_VERSION%

C:\Python35\python.exe setup.py bdist_wheel

del cv2\*.pyd

xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build64\lib\python3\Release\*.pyd" cv2
C:\Python35-x64\python.exe setup.py bdist_wheel --opencv-version %APPVEYOR_BUILD_VERSION%

C:\Python35-x64\python.exe setup.py bdist_wheel

del cv2\*.pyd

before_test:
Expand All @@ -84,24 +76,24 @@ before_test:
cd ..

C:\Python27\python.exe -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python

C:\Python27-x64\python.exe -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python

C:\Python35\python.exe -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python

C:\Python35-x64\python.exe -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python

test_script:
- cmd: >-

cd %APPVEYOR_BUILD_FOLDER%\tests

C:\Python27\python.exe -m unittest test

C:\Python27-x64\python.exe -m unittest test

C:\Python35\python.exe -m unittest test

C:\Python35-x64\python.exe -m unittest test

artifacts:
Expand Down
0