fix(cli): append .cmd on the gradle plugin binary on Windows, fix #6502 (#6503)

Author: lucasfernog

.changes/fix-tauri-binary-windows.md

@@ -0,0 +1,6 @@
+---
+"cli.rs": patch
+"cli.js": patch
+---
+
+Fixes the Android build gradle plugin implementation on Windows.

tooling/cli/src/mobile/init.rs

@@ -121,8 +121,10 @@ pub fn exec(
   let binary_path = PathBuf::from(&binary);
   let bin_stem = binary_path.file_stem().unwrap().to_string_lossy();
   let r = regex::Regex::new("(nodejs|node)\\-?([1-9]*)*$").unwrap();
+  let mut is_npm = false;
   if r.is_match(&bin_stem) {
     if let Some(npm_execpath) = var_os("npm_execpath").map(PathBuf::from) {
+      is_npm = true;
       let manager_stem = npm_execpath.file_stem().unwrap().to_os_string();
       binary = if manager_stem == "npm-cli" {
         "npm".into()
@@ -142,7 +144,21 @@ pub fn exec(
       }
     }
   }
-  map.insert("tauri-binary", binary.to_string_lossy());
+  if is_npm {
+    map.insert(
+      "executable",
+      format!(
+        r#"if (Os.isFamily(Os.FAMILY_WINDOWS)) {{ """{binary}.cmd""" }} else {{ """{binary}""" }}"#,
+        binary = binary.to_string_lossy()
+      ),
+    );
+  } else {
+    map.insert(
+      "executable",
+      format!(r#""""{}""""#, binary.to_string_lossy()),
+    );
+  }
+
   map.insert("tauri-binary-args", &build_args);
   map.insert("tauri-binary-args-str", build_args.join(" "));
 

tooling/cli/src/mobile/ios/xcode_script.rs

@@ -10,7 +10,7 @@ use crate::{
 };
 
 use clap::Parser;
-use tauri_mobile::{apple::target::Target, opts::Profile, util};
+use tauri_mobile::{apple::target::Target, opts::Profile};
 
 use std::{collections::HashMap, env::var_os, ffi::OsStr, path::PathBuf};
 
@@ -72,13 +72,7 @@ pub fn command(options: Options) -> Result<()> {
   let macos = macos_from_platform(&options.platform);
 
   with_config(None, |_root_conf, config, metadata, cli_options| {
-    let env = env()?;
-    // The `PATH` env var Xcode gives us is missing any additions
-    // made by the user's profile, so we'll manually add cargo's
-    // `PATH`.
-    let env = env
-      .explicit_env_vars(cli_options.vars)
-      .prepend_to_path(util::home_dir()?.join(".cargo/bin"));
+    let env = env()?.explicit_env_vars(cli_options.vars);
 
     if !options.sdk_root.is_dir() {
       return Err(anyhow::anyhow!(

tooling/cli/templates/mobile/android/buildSrc/src/main/kotlin/BuildTask.kt

@@ -1,6 +1,7 @@
 package {{reverse-domain app.domain}}
 
 import java.io.File
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.logging.LogLevel
@@ -26,7 +27,7 @@ open class BuildTask : DefaultTask() {
         val release = release ?: throw GradleException("release cannot be null")
         project.exec {
             workingDir(File(project.projectDir, rootDirRel.path))
-            executable("""{{ tauri-binary }}""")
+            executable({{executable}})
             args(listOf({{quote-and-join tauri-binary-args}}))
             if (project.logger.isEnabled(LogLevel.DEBUG)) {
                 args("-vv")