From ba2f4b55fd26f5341c52c41f8345c0366f9a00c9 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucasfernandesnog@gmail.com>
Date: Fri, 6 Mar 2020 12:22:38 -0300
Subject: [PATCH] feat(tauri.js) expose target arg to `tauri build` (#490)

---
 cli/tauri.js/bin/tauri-build.js | 12 ++++++++++--
 cli/tauri.js/src/runner.ts      | 11 ++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cli/tauri.js/bin/tauri-build.js b/cli/tauri.js/bin/tauri-build.js
index f7b6354bf..0d83d4787 100644
--- a/cli/tauri.js/bin/tauri-build.js
+++ b/cli/tauri.js/bin/tauri-build.js
@@ -3,7 +3,8 @@ const parseArgs = require('minimist')
 const argv = parseArgs(process.argv.slice(2), {
   alias: {
     h: 'help',
-    d: 'debug'
+    d: 'debug',
+    t: 'target'
   },
   boolean: ['h', 'd']
 })
@@ -16,10 +17,17 @@ if (argv.help) {
     $ tauri build
   Options
     --help, -h     Displays this message
+    --debug, -d    Builds with the debug flag
+    --target, -t   Comma-separated list of target triples to build against
   `)
   process.exit(0)
 }
 
 const build = require('../dist/api/build')
 
-build({ ctx: { debug: argv.debug } })
+build({
+  ctx: {
+    debug: argv.debug,
+    target: argv.target
+  }
+})
diff --git a/cli/tauri.js/src/runner.ts b/cli/tauri.js/src/runner.ts
index 0d0dcf366..f01c1e0c7 100644
--- a/cli/tauri.js/src/runner.ts
+++ b/cli/tauri.js/src/runner.ts
@@ -135,8 +135,8 @@ class Runner {
           .concat(target ? ['--target', target] : [])
       })
 
-    if (cfg.ctx.debug || !cfg.ctx.targetName) {
-      // on debug mode or if no target specified,
+    if (!cfg.ctx.target) {
+      // if no target specified,
       // build only for the current platform
       await buildFn()
     } else {
@@ -251,7 +251,7 @@ class Runner {
     extraArgs?: string[]
     dev?: boolean
   }): Promise<void> {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
       this.pid = spawn(
         'cargo',
 
@@ -264,6 +264,7 @@ class Runner {
             warn()
             warn('⚠️  [FAIL] Cargo CLI has failed')
             warn()
+            reject()
             process.exit(1)
           }
 
@@ -276,10 +277,10 @@ class Runner {
             warn()
             process.exit(0)
           }
+
+          resolve()
         }
       )
-
-      resolve()
     })
   }