Merge pull request #153 from MarijnS95/linux-compat

Linux compatibility: Guard Windows-only modules with cfg macro

.github/workflows/ci-workflow.yml

@@ -1,6 +1,6 @@
 name: Build and Test
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -11,10 +11,11 @@ env:
 
 jobs:
   test:
-    runs-on: windows-latest
-    strategy: 
-      matrix: 
+    strategy:
+      matrix:
         rust: [1.42.0, stable]
+        os: [windows-latest, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
@@ -25,8 +26,8 @@ jobs:
         components: rustfmt
 
     - name: tests
-      run: cargo test --all 
+      run: cargo test --all
 
     - name: fmt
+      if: matrix.rust == 'stable'
       run: cargo fmt --all -- --check
-      if: matrix.rust == 'stable'

examples/basic/client/src/main.rs

@@ -1,11 +1,16 @@
-use com::{
-    interfaces::iclass_factory::IClassFactory,
-    interfaces::iunknown::IUnknown,
-    runtime::{create_instance, get_class_object, init_apartment, ApartmentType},
-};
-use interface::{Food, IAnimal, ICat, IDomesticAnimal, IExample, CLSID_CAT_CLASS};
-
 fn main() {
+    #[cfg(windows)]
+    run()
+}
+
+#[cfg(windows)]
+fn run() {
+    use com::{
+        interfaces::iclass_factory::IClassFactory,
+        interfaces::iunknown::IUnknown,
+        runtime::{create_instance, get_class_object, init_apartment, ApartmentType},
+    };
+    use interface::{Food, IAnimal, ICat, IDomesticAnimal, IExample, CLSID_CAT_CLASS};
     // Initialize the COM apartment
     init_apartment(ApartmentType::SingleThreaded)
         .unwrap_or_else(|hr| panic!("Failed to initialize COM Library{:x}", hr));

examples/basic/server/src/lib.rs

@@ -1,3 +1,5 @@
+#![cfg(windows)]
+
 mod british_short_hair_cat;
 
 use british_short_hair_cat::BritishShortHairCat;

examples/basic/src/main.rs

@@ -11,21 +11,23 @@ fn main() {
         return;
     }
 
-    let mut child_proc = Command::new("cmd")
-        .args(&["/C", "regsvr32 /s ../../target/release/server.dll"])
-        .spawn()
-        .expect("Something went wrong!");
-    if !child_proc.wait().unwrap().success() {
-        println!("Failed to register server.dll! Make sure you have administrator rights!");
-        return;
-    }
+    if cfg!(windows) {
+        let mut child_proc = Command::new("cmd")
+            .args(&["/C", "regsvr32 /s ../../target/release/server.dll"])
+            .spawn()
+            .expect("Something went wrong!");
+        if !child_proc.wait().unwrap().success() {
+            println!("Failed to register server.dll! Make sure you have administrator rights!");
+            return;
+        }
 
-    let mut child_proc = Command::new("cmd")
-        .args(&["/C", "cargo run --release --package client"])
-        .spawn()
-        .expect("Something went wrong!");
-    if !child_proc.wait().unwrap().success() {
-        println!("Execution of client failed.");
-        return;
+        let mut child_proc = Command::new("cmd")
+            .args(&["/C", "cargo run --release --package client"])
+            .spawn()
+            .expect("Something went wrong!");
+        if !child_proc.wait().unwrap().success() {
+            println!("Execution of client failed.");
+            return;
+        }
     }
 }