openvino: trying both Travis and AppVeyor builds against OpenCV 3.4.2

Signed-off-by: Ron Evans <ron@hybridgroup.com>
leprosus · Jun 14, 2018 · d720611 · d720611
1 parent 422f2b2
commit d720611
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ platform:
 environment:
   GOPATH: c:\gopath
   GOROOT: c:\go
-  GOVERSION: 1.9.2
+  GOVERSION: 1.10
   TEST_EXTERNAL: 1
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
 

diff --git a/appveyor_build_opencv.cmd b/appveyor_build_opencv.cmd
@@ -2,21 +2,21 @@ if not exist "C:\opencv" mkdir "C:\opencv"
 if not exist "C:\opencv\build" mkdir "C:\opencv\build"
 if not exist "C:\opencv\testdata" mkdir "C:\opencv\testdata"
 
-appveyor DownloadFile https://github.com/opencv/opencv/archive/3.4.1.zip -FileName c:\opencv\opencv-3.4.1.zip
-7z x c:\opencv\opencv-3.4.1.zip -oc:\opencv -y
-del c:\opencv\opencv-3.4.1.zip /q
-appveyor DownloadFile https://github.com/opencv/opencv_contrib/archive/3.4.1.zip -FileName c:\opencv\opencv_contrib-3.4.1.zip
-7z x c:\opencv\opencv_contrib-3.4.1.zip -oc:\opencv -y
-del c:\opencv\opencv_contrib-3.4.1.zip /q
+appveyor DownloadFile https://github.com/opencv/opencv/archive/3.4.zip -FileName c:\opencv\opencv-3.4.zip
+7z x c:\opencv\opencv-3.4.zip -oc:\opencv -y
+del c:\opencv\opencv-3.4.zip /q
+appveyor DownloadFile https://github.com/opencv/opencv_contrib/archive/3.4.zip -FileName c:\opencv\opencv_contrib-3.4.zip
+7z x c:\opencv\opencv_contrib-3.4.zip -oc:\opencv -y
+del c:\opencv\opencv_contrib-3.4.zip /q
 cd C:\opencv\build
 set PATH=C:\Perl\site\bin;C:\Perl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft\Web Platform Installer\;C:\Tools\PsTools;C:\Program Files (x86)\CMake\bin;C:\go\bin;C:\Tools\NuGet;C:\Program Files\LLVM\bin;C:\Tools\curl\bin;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Yarn\bin;C:\Users\appveyor\AppData\Local\Yarn\bin;C:\Program Files\AppVeyor\BuildAgent\
 set PATH=%PATH%;C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
-cmake C:\opencv\opencv-3.4.1 -G "MinGW Makefiles" -BC:\opencv\build -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH=C:\opencv\opencv_contrib-3.4.1\modules -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DCPU_DISPATCH= -Wno-dev
+cmake C:\opencv\opencv-3.4 -G "MinGW Makefiles" -BC:\opencv\build -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH=C:\opencv\opencv_contrib-3.4.1\modules -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DCPU_DISPATCH= -Wno-dev
 mingw32-make
 mingw32-make install
-copy c:\opencv\opencv-3.4.1\samples\data\dnn\bvlc_googlenet.prototxt C:\opencv\testdata\bvlc_googlenet.prototxt
+copy c:\opencv\opencv-3.4\samples\data\dnn\bvlc_googlenet.prototxt C:\opencv\testdata\bvlc_googlenet.prototxt
 appveyor DownloadFile http://dl.caffe.berkeleyvision.org/bvlc_googlenet.caffemodel -FileName C:\opencv\testdata\bvlc_googlenet.caffemodel
 appveyor DownloadFile https://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip -FileName C:\opencv\testdata\inception5h.zip
 7z x C:\opencv\testdata\inception5h.zip -oC:\opencv\testdata tensorflow_inception_graph.pb -y
-rmdir c:\opencv\opencv-3.4.1 /s /q
-rmdir c:\opencv\opencv_contrib-3.4.1 /s /q
+rmdir c:\opencv\opencv-3.4 /s /q
+rmdir c:\opencv\opencv_contrib-3.4 /s /q
diff --git a/cgo.go b/cgo.go
@@ -8,6 +8,6 @@ package gocv
 #cgo !windows pkg-config: opencv
 #cgo CXXFLAGS:   --std=c++11
 #cgo windows  CPPFLAGS:   -IC:/opencv/build/install/include
-#cgo windows  LDFLAGS:    -LC:/opencv/build/install/x64/mingw/lib -lopencv_core341 -lopencv_face341 -lopencv_videoio341 -lopencv_imgproc341 -lopencv_highgui341 -lopencv_imgcodecs341 -lopencv_objdetect341 -lopencv_features2d341 -lopencv_video341 -lopencv_dnn341 -lopencv_xfeatures2d341 -lopencv_plot341 -lopencv_tracking341 -lopencv_img_hash341 -lopencv_calib3d341
+#cgo windows  LDFLAGS:    -LC:/opencv/build/install/x64/mingw/lib -lopencv_core342 -lopencv_face342 -lopencv_videoio342 -lopencv_imgproc342 -lopencv_highgui342 -lopencv_imgcodecs342 -lopencv_objdetect342 -lopencv_features2d342 -lopencv_video342 -lopencv_dnn342 -lopencv_xfeatures2d342 -lopencv_plot342 -lopencv_tracking342 -lopencv_img_hash342 -lopencv_calib3d342
 */
 import "C"
diff --git a/contrib/cgo.go b/contrib/cgo.go
@@ -8,6 +8,6 @@ package contrib
 #cgo !windows pkg-config: opencv
 #cgo CXXFLAGS:   --std=c++11
 #cgo windows  CPPFLAGS:   -IC:/opencv/build/install/include
-#cgo windows  LDFLAGS:    -LC:/opencv/build/install/x64/mingw/lib -lopencv_core341 -lopencv_face341 -lopencv_videoio341 -lopencv_imgproc341 -lopencv_highgui341 -lopencv_imgcodecs341 -lopencv_objdetect341 -lopencv_features2d341 -lopencv_video341 -lopencv_dnn341 -lopencv_xfeatures2d341 -lopencv_plot341 -lopencv_tracking341 -lopencv_img_hash341
+#cgo windows  LDFLAGS:    -LC:/opencv/build/install/x64/mingw/lib -lopencv_core342 -lopencv_face342 -lopencv_videoio342 -lopencv_imgproc342 -lopencv_highgui342 -lopencv_imgcodecs342 -lopencv_objdetect342 -lopencv_features2d342 -lopencv_video342 -lopencv_dnn342 -lopencv_xfeatures2d342 -lopencv_plot342 -lopencv_tracking342 -lopencv_img_hash342
 */
 import "C"
diff --git a/travis_build_opencv.sh b/travis_build_opencv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
 
-OPENCV_VERSION=${OPENCV_VERSION:-3.4.1}
+OPENCV_VERSION=${OPENCV_VERSION:-3.4}
 
 #GRAPHICAL=ON
 GRAPHICAL=${GRAPHICAL:-OFF}