Cleanup

Author: twistedfall

README.md

@@ -33,7 +33,7 @@ use opencv::prelude::*;
 
 OpenCV package in Arch is suitable for this:
 
-`pacman -S clang qt5-base opencv`
+`pacman -S clang qt6-base opencv`
 
 and additionally to support more OpenCV modules:
 
@@ -281,18 +281,14 @@ The following variables are rarely used, but you might need them under some circ
       cmake (cmake related environment variables are applicable with this probe)
     * vcpkg
 
-* `OPENCV_MODULE_WHITELIST` and `OPENCV_MODULE_BLACKLIST`
-  Not used anymore. These used to be used to select modules that get their binding generated. We have switched to
-  using cargo features for module selection. Please see the section on features to learn how to switch.
-
 The following variables affect the building the of the `opencv` crate, but belong to external components:
 
 * `PKG_CONFIG_PATH`
   Where to look for `*.pc` files see the [man pkg-config](https://linux.die.net/man/1/pkg-config)
   Path specified here must contain `opencv.pc` (pre OpenCV 4) or `opencv4.pc` (OpenCV 4 and later).
 
-* `VCPKG_ROOT` and `VCPKGRS_DYNAMIC`
-  The root of `vcpkg` installation and flag allowing use of `*.dll` libraries, see the
+* `VCPKG_ROOT`, `VCPKGRS_DYNAMIC` and `VCPKGRS_TRIPLET`
+  The root of `vcpkg` installation, flag allowing use of `*.dll` libraries and selected `vcpkg` triplet, see the
   [documentation for `vcpkg` crate](https://docs.rs/vcpkg)
 
 * `OpenCV_DIR`

binding-generator/src/type_ref/desc.rs

@@ -320,8 +320,7 @@ impl<'tu> ClangTypeExt<'tu> for Type<'tu> {
 		match self.get_kind() {
 			TypeKind::Void => TypeRefKind::Primitive("()", "void"),
 			TypeKind::Bool => TypeRefKind::Primitive("bool", "bool"),
-			TypeKind::CharS => TypeRefKind::Primitive("c_char", "char"),
-			TypeKind::CharU => TypeRefKind::Primitive("c_char", "char"),
+			TypeKind::CharS | TypeKind::CharU => TypeRefKind::Primitive("c_char", "char"),
 			TypeKind::SChar => TypeRefKind::Primitive("i8", "signed char"),
 			TypeKind::UChar => TypeRefKind::Primitive("u8", "unsigned char"),
 			TypeKind::WChar => TypeRefKind::Primitive("u16", "wchar_t"),

build.rs

@@ -1,10 +1,10 @@
 use std::collections::HashSet;
+use std::env;
 use std::ffi::OsStr;
 use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::path::{Path, PathBuf};
 use std::time::Instant;
-use std::{env, iter};
 
 use once_cell::sync::{Lazy, OnceCell};
 use semver::{Version, VersionReq};
@@ -49,7 +49,9 @@ static OPENCV_BRANCH_34: Lazy<VersionReq> =
 static OPENCV_BRANCH_4: Lazy<VersionReq> =
 	Lazy::new(|| VersionReq::parse("~4").expect("Can't parse OpenCV 4 version requirement"));
 
-static ENV_VARS: [&str; 16] = [
+/// Environment vars that affect the build, the source will be rebuilt if those change, the contents of those vars will also
+/// be present in the debug log
+static AFFECTING_ENV_VARS: [&str; 17] = [
 	"OPENCV_PACKAGE_NAME",
 	"OPENCV_PKGCONFIG_NAME",
 	"OPENCV_CMAKE_NAME",
@@ -64,10 +66,14 @@ static ENV_VARS: [&str; 16] = [
 	"PKG_CONFIG_PATH",
 	"VCPKG_ROOT",
 	"VCPKGRS_DYNAMIC",
+	"VCPKGRS_TRIPLET",
 	"OCVRS_DOCS_GENERATE_DIR",
 	"DOCS_RS",
 ];
 
+/// The contents of these vars will be present in the debug log, but will not cause the source rebuild
+static DEBUG_ENV_VARS: [&str; 1] = ["PATH"];
+
 pub enum GenerateFullBindings {
 	Stop,
 	Proceed,
@@ -260,7 +266,7 @@ fn build_compiler(opencv: &Library) -> cc::Build {
 }
 
 fn setup_rerun() -> Result<()> {
-	for &v in ENV_VARS.iter() {
+	for &v in AFFECTING_ENV_VARS.iter() {
 		println!("cargo:rerun-if-env-changed={v}");
 	}
 
@@ -306,7 +312,7 @@ fn main() -> Result<()> {
 
 	eprintln!("=== Crate version: {:?}", env::var_os("CARGO_PKG_VERSION"));
 	eprintln!("=== Environment configuration:");
-	for v in ENV_VARS.into_iter().chain(iter::once("PATH")) {
+	for v in AFFECTING_ENV_VARS.into_iter().chain(DEBUG_ENV_VARS) {
 		eprintln!("===   {v} = {:?}", env::var_os(v));
 	}
 	eprintln!("=== Enabled features:");

ci/install-windows-vcpkg.sh

@@ -21,6 +21,7 @@ git checkout "$VCPKG_VERSION"
 echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-windows.cmake
 echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-windows-static.cmake
 echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x86-windows.cmake
+echo "set(VCPKG_BUILD_TYPE release)" >> triplets/community/x64-windows-static-md.cmake
 export VCPKG_DEFAULT_TRIPLET=x64-windows
 #./vcpkg install llvm  # takes very long time
 choco install -y llvm --version "$CHOCO_LLVM_VERSION"