Adapt to be able to build with msvc toolchain: need further work especially for bindgen i32/u32 issue

Author: EliseChouleur

Dockerfile

@@ -9,7 +9,7 @@ RUN strip /build/${DIRNAME}/lib/x86_64-linux-android/libcblite.so -o /build/${DI
 RUN strip /build/${DIRNAME}/lib/i686-linux-android/libcblite.so -o /build/${DIRNAME}/lib/i686-linux-android/libcblite.stripped.so
 RUN /usr/aarch64-linux-gnu/bin/strip /build/${DIRNAME}/lib/aarch64-linux-android/libcblite.so -o /build/${DIRNAME}/lib/aarch64-linux-android/libcblite.stripped.so
 RUN /usr/aarch64-linux-gnu/bin/strip /build/${DIRNAME}/lib/arm-linux-androideabi/libcblite.so -o /build/${DIRNAME}/lib/arm-linux-androideabi/libcblite.stripped.so
-RUN strip /build/${DIRNAME}/lib/x86_64-pc-windows-gnu/cblite.dll -o /build/${DIRNAME}/lib/x86_64-pc-windows-gnu/cblite.stripped.dll
+RUN strip /build/${DIRNAME}/lib/windows/cblite.dll -o /build/${DIRNAME}/lib/windows/cblite.stripped.dll
 
 FROM scratch AS strip
 COPY --from=strip-stage /build/${DIRNAME}/ .

build.rs

@@ -172,6 +172,10 @@ fn generate_bindings() -> Result<(), Box<dyn Error>> {
             .clang_arg(format!("--target={}", "x86_64-pc-windows-gnu"));
     }
 
+    bindings = bindings
+        .clang_arg("-IC:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\include".to_string())
+        .clang_arg("-IC:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.17763.0\\ucrt");
+
     let out_dir = env::var("OUT_DIR")?;
     bindings
         .allowlist_type("CBL.*")
@@ -221,6 +225,13 @@ fn configure_rustc() -> Result<(), Box<dyn Error>> {
             env!("CARGO_MANIFEST_DIR"),
             CBL_LIB_DIR
         );
+    } else if target_os == "windows" {
+        println!("cargo:rustc-link-lib=dylib=cblite");
+        println!(
+            "cargo:rustc-link-search={}/{}/windows",
+            env!("CARGO_MANIFEST_DIR"),
+            CBL_LIB_DIR
+        );
     } else {
         println!("cargo:rustc-link-lib=dylib=cblite");
         println!(
@@ -239,10 +250,8 @@ pub fn copy_lib() -> Result<(), Box<dyn Error>> {
         "{}/{}/{}/",
         env!("CARGO_MANIFEST_DIR"),
         CBL_LIB_DIR,
-        if target_os == "ios" {
-            "ios".to_string()
-        } else if target_os == "macos" {
-            "macos".to_string()
+        if target_os == "ios" || target_os == "macos" || target_os == "windows" {
+            target_os.clone()
         } else {
             env::var("TARGET").unwrap()
         }

libcblite_enterprise/lib/x86_64-pc-windows-gnu/cblite.dll renamed to libcblite_enterprise/lib/windows/cblite.dll

@@ -212,7 +212,7 @@ impl Error {
     }
 
     pub(crate) fn as_cbl_error(&self) -> CBLError {
-        let domain: u32;
+        let domain: i32;
         let code: i32;
         match &self.code {
             ErrorCode::CouchbaseLite(e) => {
@@ -278,7 +278,7 @@ impl fmt::Display for Error {
 
 impl ErrorCode {
     fn new(err: &CBLError) -> Self {
-        match u32::from(err.domain) {
+        match i32::from(err.domain) {
             kCBLDomain => CouchbaseLiteError::from_i32(err.code)
                 .map_or(Self::untranslatable(), Self::CouchbaseLite),
             kCBLNetworkDomain => {

libcblite_enterprise/lib/x86_64-pc-windows-gnu/cblite.lib renamed to libcblite_enterprise/lib/windows/cblite.lib

@@ -71,7 +71,7 @@ impl Fleece {
     pub fn parse(data: &[u8], trust: Trust) -> Result<Self> {
         unsafe {
             let copied = FLSlice_Copy(from_bytes(data).get_ref());
-            let doc = FLDoc_FromResultData(copied, trust as u32, ptr::null_mut(), NULL_SLICE);
+            let doc = FLDoc_FromResultData(copied, trust as i32, ptr::null_mut(), NULL_SLICE);
             if doc.is_null() {
                 return Err(Error::fleece_error(FLError_kFLInvalidData));
             }

libcblite_enterprise/lib/x86_64-pc-windows-gnu/cblite.stripped.dll renamed to libcblite_enterprise/lib/windows/cblite.stripped.dll

@@ -80,7 +80,7 @@ impl MutableArray {
     pub fn from_array_(array: &Array, flags: CopyFlags) -> Self {
         unsafe {
             Self {
-                cbl_ref: FLArray_MutableCopy(array.get_ref(), flags as u32),
+                cbl_ref: FLArray_MutableCopy(array.get_ref(), flags as i32),
             }
         }
     }
@@ -274,7 +274,7 @@ impl MutableDict {
     pub fn from_dict_(dict: &Dict, flags: CopyFlags) -> Self {
         unsafe {
             Self {
-                cbl_ref: FLDict_MutableCopy(dict.get_ref(), flags as u32),
+                cbl_ref: FLDict_MutableCopy(dict.get_ref(), flags as i32),
             }
         }
     }

src/error.rs

@@ -170,7 +170,7 @@ pub enum ReplicatorType {
 
 impl From<CBLReplicatorType> for ReplicatorType {
     fn from(repl_type: CBLReplicatorType) -> Self {
-        match u32::from(repl_type) {
+        match i32::from(repl_type) {
             kCBLReplicatorTypePushAndPull => Self::PushAndPull,
             kCBLReplicatorTypePush => Self::Push,
             kCBLReplicatorTypePull => Self::Pull,
@@ -197,7 +197,7 @@ pub enum ProxyType {
 
 impl From<CBLProxyType> for ProxyType {
     fn from(proxy_type: CBLProxyType) -> Self {
-        match u32::from(proxy_type) {
+        match i32::from(proxy_type) {
             kCBLProxyHTTP => Self::HTTP,
             kCBLProxyHTTPS => Self::HTTPS,
             _ => unreachable!(),
@@ -297,7 +297,10 @@ unsafe extern "C" fn c_replication_pull_filter(
     }
 }
 fn read_document_flags(flags: CBLDocumentFlags) -> (bool, bool) {
-    (flags & DELETED != 0, flags & ACCESS_REMOVED != 0)
+    (
+        flags & DELETED as u32 != 0,
+        flags & ACCESS_REMOVED as u32 != 0,
+    )
 }
 
 /** Conflict-resolution callback for use in replications. This callback will be invoked
@@ -1085,7 +1088,7 @@ pub enum ReplicatorActivityLevel {
 
 impl From<u8> for ReplicatorActivityLevel {
     fn from(level: u8) -> Self {
-        match u32::from(level) {
+        match i32::from(level) {
             kCBLReplicatorStopped => Self::Stopped,
             kCBLReplicatorOffline => Self::Offline,
             kCBLReplicatorConnecting => Self::Connecting,
@@ -1178,8 +1181,8 @@ unsafe extern "C" fn c_replicator_document_change_listener(
 }
 
 /** Flags describing a replicated document. */
-pub static DELETED: u32 = kCBLDocumentFlagsDeleted;
-pub static ACCESS_REMOVED: u32 = kCBLDocumentFlagsAccessRemoved;
+pub static DELETED: i32 = kCBLDocumentFlagsDeleted;
+pub static ACCESS_REMOVED: i32 = kCBLDocumentFlagsAccessRemoved;
 
 /** Information about a document that's been pushed or pulled. */
 pub struct ReplicatedDocument {

src/fleece.rs

@@ -183,7 +183,7 @@ do
                 ;;
 
             windows)
-                platformFolder="${libFolder}/x86_64-pc-windows-gnu"
+                platformFolder="${libFolder}/windows"
                 mkdir $platformFolder
 
                 libFile="${unzipPlatformFolder}/libcblite-${version}/lib/cblite.lib"