fix appveyor deploy, pass ENABLE_CONTRIB flag to Linux build via file

skvark · skvark · commit 0b1317b27a68 · 2017-03-05T17:43:33.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -199,6 +199,7 @@ matrix:
         - ENABLE_CONTRIB=1
 
 before_install:
+    - echo $ENABLE_CONTRIB > contrib.enabled
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh
     - python find_version.py
diff --git a/appveyor.yml b/appveyor.yml
@@ -107,7 +107,7 @@ before_test:
 
     cd ..
 
-    "%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python
+    if %ENABLE_CONTRIB% EQU 0 ("%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python) else ("%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-contrib-python)
 
 test_script:
 - cmd: >-
diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh
@@ -10,6 +10,8 @@ echo 'PIP and brew installs'
 
 pip install -r requirements.txt
 
+ENABLE_CONTRIB=$(<contrib.enabled)
+
 echo 'Config make'
 
 cd opencv
