Update ci and tools
MODIFY
.github/workflows/opencv-rust.yml
.github/workflows/opencv-rust.yml
@@ -84,7 +84,7 @@ jobs:
OS_FAMILY: ${{ matrix.os.family }}
RUST_TOOLCHAIN: ${{ matrix.rust }}
VCPKG_OPENCV_VERSION: ${{ matrix.version.vcpkg }}
- VCPKG_TREE_COMMIT: 2022.02.23
+ VCPKG_TREE_COMMIT: 2022.10.19
steps:
- uses: actions/checkout@v3
@@ -132,7 +132,7 @@ jobs:
opencv: 3.4.16
brew: "@3"
- branch: 4
- opencv: 4.5.5
+ opencv: 4.6.0
brew: "@4"
include:
- os:

MODIFY
ci/install-windows-chocolatey.sh
ci/install-windows-chocolatey.sh
set -vex
-choco install -y llvm --version 15.0.1
+choco install -y llvm --version 15.0.3
choco install -y opencv --version "$OPENCV_VERSION"

MODIFY
ci/install-windows-vcpkg.sh
ci/install-windows-vcpkg.sh
@@ -21,7 +21,7 @@ echo "set(VCPKG_BUILD_TYPE release)" >> "$VCPKG_ROOT/triplets/x64-windows-static
echo "set(VCPKG_BUILD_TYPE release)" >> "$VCPKG_ROOT/triplets/x86-windows.cmake"
export VCPKG_DEFAULT_TRIPLET=x64-windows
#./vcpkg install llvm # takes very long time
-choco install -y llvm --version 15.0.1
+choco install -y llvm --version 15.0.3
"$VCPKG_ROOT/vcpkg" upgrade --no-dry-run
"$VCPKG_ROOT/vcpkg" install --recurse "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
popd

MODIFY
ci/script.sh
ci/script.sh
@@ -38,8 +38,6 @@ elif [[ "$OS_FAMILY" == "linux" ]]; then
export VCPKG_ROOT="$HOME/build/vcpkg"
echo "=== Installed vcpkg packages:"
"$VCPKG_ROOT/vcpkg" list
- # link order is often broken when vcpkg detection on Linux is used
- export OPENCV_LINK_LIBS="+opencv_imgcodecs,opencv_imgproc,opencv_core,png,tiff,jpeg,webp,lzma,z"
fi
fi

ADD
tools/macos-src-env.sh
+#!/bin/bash
+
+OPENCV_VERSION=4.5.4
+toolchain_path="$(xcode-select --print-path)/Toolchains/XcodeDefault.xctoolchain/"
+echo "export DYLD_FALLBACK_LIBRARY_PATH=\"$toolchain_path/usr/lib/\""
+clang_dir="$(clang --print-search-dirs | awk -F= '/^libraries: =/ { print $2 }')"
+echo "export OPENCV_LINK_PATHS=\"$HOME/build/opencv/opencv-$OPENCV_VERSION-build,$clang_dir/lib/darwin\""
+echo "export OPENCV_LINK_LIBS=\"opencv2.framework,OpenCL.framework,Cocoa.framework,Accelerate.framework,AVFoundation.framework,CoreGraphics.framework,CoreMedia.framework,CoreVideo.framework,QuartzCore.framework,clang_rt.osx\""
+echo "export OPENCV_INCLUDE_PATHS=\"$HOME/build/opencv/opencv-$OPENCV_VERSION-build\""

MODIFY
tools/macos-sync.sh
tools/macos-sync.sh
@@ -8,4 +8,6 @@ script_dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
cd "$script_dir/.."
-rsync -av --progress --exclude "/target" --exclude "/.idea" ./ "$MACOS_ADDR:opencv-rust/"
+rsync -av --progress --delete \
+ --exclude "/.idea" --exclude "/.git" --exclude "/out" --exclude "/target" --exclude "/ci/test-proj/target" \
+ ./ "$MACOS_ADDR:opencv-rust/"

MODIFY
tools/win-sync.sh
tools/win-sync.sh
@@ -8,4 +8,6 @@ script_dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
cd "$script_dir/.."
-rsync -av --progress --exclude "/target" --exclude "/.idea" ./ "$WIN_ADDR:opencv-rust/"
+rsync -av --progress --delete \
+ --exclude "/.idea" --exclude "/.git" --exclude "/out" --exclude "/target" --exclude "/ci/test-proj/target" \
+ ./ "$WIN_ADDR:/c/Users/win/opencv-rust/"

Update ci and tools