Add Windows implementations.

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       matrix:
         rust_version: [stable, beta, nightly]
         platform:
-          # - { target: x86_64-pc-windows-msvc, os: windows-latest }
+          - { target: x86_64-pc-windows-msvc, os: windows-latest }
           - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
           - { target: x86_64-apple-darwin, os: macos-latest }
 

Cargo.toml

@@ -26,6 +26,7 @@ bicycle = { git = "https://github.com/BrainiumLLC/bicycle", rev = "28080e0c6fa40
 bossy = "0.2.1"
 colored = "1.9.3"
 deunicode = "1.1.1"
+dunce = "1.0.2"
 english-numbers = "0.3.3"
 env_logger = "0.7.1"
 heck = "0.3.1"
@@ -62,7 +63,15 @@ ureq = "2.2.0"
 freedesktop_entry_parser = "1.1"
 lexical-core = "0.7.6"
 
+[target.'cfg(windows)'.dependencies]
+const-utf16 = "0.2.1"
+windows = "0.21.1"
+
 [build-dependencies]
 bicycle = { git = "https://github.com/BrainiumLLC/bicycle", rev = "28080e0c6fa4067d9dd1b0f2b7322b6b32178e1f" }
 hit = "0.1.0"
 home = "0.5.3"
+
+[target.'cfg(windows)'.build-dependencies]
+embed-resource = "1.6.4"
+windows = "0.21.1"

build.rs

@@ -57,4 +57,31 @@ fn main() {
         )
         .expect("failed to process actions");
     }
+
+    #[cfg(windows)]
+    {
+        // Embed application manifest
+        let resource_path = manifest_dir.join("cargo-mobile-manifest.rc");
+        let manifest_path = manifest_dir.join("cargo-mobile.exe.manifest");
+        println!("cargo:rerun-if-changed={}", resource_path.display());
+        println!("cargo:rerun-if-changed={}", manifest_path.display());
+        embed_resource::compile("cargo-mobile-manifest.rc");
+
+        // Build winapi bindings
+        windows::build! {
+            Windows::Win32::{
+                Foundation::MAX_PATH,
+                System::{
+                    Diagnostics::Debug::{GetLastError, WIN32_ERROR},
+                    Memory::LocalFree,
+                    SystemInformation::{VerifyVersionInfoW, VerSetConditionMask},
+                    SystemServices::{VER_EQUAL, VER_GREATER_EQUAL},
+                    Registry::HKEY_LOCAL_MACHINE,
+
+                },
+                UI::Shell::{ASSOCF_INIT_IGNOREUNKNOWN, AssocQueryStringW, CommandLineToArgvW, SHRegGetPathW},
+                Storage::FileSystem::CreateHardLinkW,
+            },
+        }
+    }
 }

cargo-mobile-manifest.rc

@@ -0,0 +1,2 @@
+#define RT_MANIFEST 24
+1 RT_MANIFEST "cargo-mobile.exe.manifest"

cargo-mobile.exe.manifest

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+        type="win32"
+        name="cargo-mobile"
+        version="0.1.0.0"
+        processorArchitecture="x86"
+    />
+    <description>cargo-mobile</description>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+        </application>
+    </compatibility>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <!--
+                  UAC settings:
+                  - app should run at same integrity level as calling process
+                  - app does not need to manipulate windows belonging to
+                    higher-integrity-level processes
+                  -->
+                <requestedExecutionLevel
+                    level="asInvoker"
+                    uiAccess="false"
+                />   
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+</assembly>

src/android/cli.rs

@@ -86,7 +86,7 @@ pub enum Error {
     MetadataFailed(metadata::Error),
     Unsupported,
     ProjectDirAbsent { project_dir: PathBuf },
-    OpenFailed(bossy::Error),
+    OpenFailed(os::OpenFileError),
     CheckFailed(CompileLibError),
     BuildFailed(BuildError),
     RunFailed(RunError),

src/android/device.rs

@@ -8,6 +8,7 @@ use super::{
 use crate::{
     env::ExplicitEnv as _,
     opts::{self, FilterLevel, NoiseLevel, Profile},
+    os::{consts, gradlew_command},
     util::{
         self,
         cli::{Report, Reportable},
@@ -19,11 +20,7 @@ use std::{
 };
 
 fn gradlew(config: &Config, env: &Env) -> bossy::Command {
-    let gradlew_path = config.project_dir().join("gradlew");
-    bossy::Command::pure(&gradlew_path)
-        .with_env_vars(env.explicit_env())
-        .with_arg("--project-dir")
-        .with_arg(config.project_dir())
+    gradlew_command(&config.project_dir()).with_env_vars(env.explicit_env())
 }
 
 #[derive(Debug)]
@@ -371,7 +368,7 @@ impl<'a> Device<'a> {
     pub fn stacktrace(&self, config: &Config, env: &Env) -> Result<(), StacktraceError> {
         // -d = print and exit
         let logcat_command = adb::adb(env, &self.serial_no).with_args(&["logcat", "-d"]);
-        let stack_command = bossy::Command::pure("ndk-stack")
+        let stack_command = bossy::Command::pure(env.ndk.home().join(consts::NDK_STACK))
             .with_env_vars(env.explicit_env())
             .with_env_var(
                 "PATH",

src/android/jnilibs.rs

@@ -1,4 +1,6 @@
 use super::{config::Config, target::Target};
+#[cfg(windows)]
+use crate::os;
 use crate::{
     target::TargetTrait as _,
     util::{
@@ -118,15 +120,17 @@ impl JniLibs {
     pub fn symlink_lib(&self, src: &Path) -> Result<(), SymlinkLibError> {
         log::info!("symlinking lib {:?} in jniLibs dir {:?}", src, self.path);
         if src.is_file() {
-            ln::force_symlink(
-                src,
-                self.path.join(
-                    src.file_name()
-                        .expect("developer error: file had no file name"),
-                ),
-                ln::TargetStyle::File,
-            )
-            .map_err(SymlinkLibError::SymlinkFailed)
+            let dest = self.path.join(
+                src.file_name()
+                    .expect("developer error: file had no file name"),
+            );
+            #[cfg(not(windows))]
+            ln::force_symlink(src, &dest, ln::TargetStyle::File)
+                .map_err(SymlinkLibError::SymlinkFailed)?;
+            #[cfg(windows)]
+            os::ln::force_hard_link_or_copy_file(src, &dest)
+                .map_err(SymlinkLibError::SymlinkFailed)?;
+            Ok(())
         } else {
             Err(SymlinkLibError::SourceMissing(src.to_owned()))
         }

src/android/ndk.rs

@@ -2,7 +2,10 @@ use super::{
     source_props::{self, SourceProps},
     target::Target,
 };
-use crate::util::cli::{Report, Reportable};
+use crate::{
+    os::consts,
+    util::cli::{Report, Reportable},
+};
 use once_cell_regex::regex_multi_line;
 use std::{
     collections::HashSet,
@@ -45,8 +48,8 @@ pub enum Compiler {
 impl Compiler {
     fn as_str(&self) -> &'static str {
         match self {
-            Compiler::Clang => "clang",
-            Compiler::Clangxx => "clang++",
+            Compiler::Clang => consts::CLANG,
+            Compiler::Clangxx => consts::CLANGXX,
         }
     }
 }
@@ -61,8 +64,8 @@ pub enum Binutil {
 impl Binutil {
     fn as_str(&self) -> &'static str {
         match self {
-            Binutil::Ar => "ar",
-            Binutil::Ld => "ld",
+            Binutil::Ar => consts::AR,
+            Binutil::Ld => consts::LD,
         }
     }
 }
@@ -260,7 +263,8 @@ impl Env {
 
     fn readelf_path(&self, triple: &str) -> Result<PathBuf, MissingToolError> {
         MissingToolError::check_file(
-            self.tool_dir()?.join(format!("{}-readelf", triple)),
+            self.tool_dir()?
+                .join(format!("{}-{}", triple, consts::READELF)),
             "readelf",
         )
     }