feat(cli.rs): allow using cross instead of cargo, add target triple arg (#1664)

Author: lucasfernog

.changes/cli-runner-arg.md

@@ -0,0 +1,5 @@
+---
+"cli.rs": patch
+---
+
+Adds `--runner [PROGRAM]` argument on the `dev` and `build` command, allowing using the specified program to run and build the application (example program: `cross`).

.changes/cli-target-triple.md

@@ -0,0 +1,5 @@
+---
+"cli.rs": patch
+---
+
+Adds `--target [TARGET_TRIPLE]` option to the `build` command (example: `--target arm-unknown-linux-gnueabihf`).

.changes/cli-targets-refactor.md

@@ -0,0 +1,5 @@
+---
+"cli.rs": patch
+---
+
+Rename `--target` option on the `build` command to `--bundle`.

examples/api/src-tauri/Cargo.toml

@@ -11,7 +11,7 @@ tauri-build = { path = "../../../core/tauri-build" }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { path = "../../../core/tauri", features =["api-all", "cli", "updater"]}
+tauri = { path = "../../../core/tauri", features = ["api-all", "cli", "updater"] }
 
 [features]
 default = [ "custom-protocol" ]

examples/helloworld/src-tauri/Cargo.toml

@@ -5,12 +5,12 @@ description = "A very simple Tauri Appplication"
 edition = "2018"
 
 [build-dependencies]
-tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ]}
+tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { path = "../../../core/tauri", features =["api-all"]}
+tauri = { path = "../../../core/tauri", features = ["api-all"] }
 
 [features]
 default = [ "custom-protocol" ]

examples/multiwindow/src-tauri/Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0 OR MIT"
 tauri-build = { path = "../../../core/tauri-build" }
 
 [dependencies]
-tauri = { path = "../../../core/tauri", features =["api-all"]}
+tauri = { path = "../../../core/tauri", features = ["api-all"] }
 
 [features]
 default = [ "custom-protocol" ]

examples/updater/src-tauri/Cargo.toml

@@ -6,12 +6,12 @@ edition = "2018"
 license = "Apache-2.0 OR MIT"
 
 [build-dependencies]
-tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ]}
+tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { path = "../../../core/tauri", features =["api-all", "updater"]}
+tauri = { path = "../../../core/tauri", features = ["api-all", "updater"] }
 
 [features]
 default = [ "custom-protocol" ]

tooling/cli.rs/config_definition.rs

@@ -583,6 +583,8 @@ fn default_dialog() -> Option<bool> {
 #[derive(Debug, PartialEq, Clone, Deserialize, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct BuildConfig {
+  /// The binary used to build and run the application.
+  pub runner: Option<String>,
   /// the app's dev server URL, or the path to the directory containing an index.html file
   #[serde(default = "default_dev_path")]
   pub dev_path: String,
@@ -629,6 +631,7 @@ pub struct Config {
 
 fn default_build() -> BuildConfig {
   BuildConfig {
+    runner: None,
     dev_path: default_dev_path(),
     dist_dir: default_dist_dir(),
     before_dev_command: None,

tooling/cli.rs/schema.json

@@ -234,6 +234,13 @@
           "default": "../dist",
           "type": "string"
         },
+        "runner": {
+          "description": "The binary used to build and run the application.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "withGlobalTauri": {
           "description": "Whether we should inject the Tauri API on `window.__TAURI__` or not.",
           "default": false,

tooling/cli.rs/src/build.rs

@@ -19,9 +19,11 @@ mod rust;
 
 #[derive(Default)]
 pub struct Build {
+  runner: Option<String>,
   debug: bool,
   verbose: bool,
-  targets: Option<Vec<String>>,
+  target: Option<String>,
+  bundles: Option<Vec<String>>,
   config: Option<String>,
 }
 
@@ -40,8 +42,18 @@ impl Build {
     self
   }
 
-  pub fn targets(mut self, targets: Vec<String>) -> Self {
-    self.targets = Some(targets);
+  pub fn runner(mut self, runner: String) -> Self {
+    self.runner.replace(runner);
+    self
+  }
+
+  pub fn target(mut self, target: String) -> Self {
+    self.target.replace(target);
+    self
+  }
+
+  pub fn bundles(mut self, bundles: Vec<String>) -> Self {
+    self.bundles.replace(bundles);
     self
   }
 
@@ -90,7 +102,13 @@ impl Build {
       ));
     }
 
-    rust::build_project(self.debug)?;
+    let runner_from_config = config_.build.runner.clone();
+    let runner = self
+      .runner
+      .or(runner_from_config)
+      .unwrap_or_else(|| "cargo".to_string());
+
+    rust::build_project(runner, &self.target, self.debug)?;
 
     let app_settings = rust::AppSettings::new(&config_)?;
 
@@ -135,7 +153,7 @@ impl Build {
         settings_builder = settings_builder.verbose();
       }
 
-      if let Some(names) = self.targets {
+      if let Some(names) = self.bundles {
         let mut types = vec![];
         for name in names {
           if name == "none" {