From acbc6d15b87959a86f2b22c96cd3f1f923cf057d Mon Sep 17 00:00:00 2001 From: shmyga Date: Thu, 9 Aug 2018 12:16:34 +0300 Subject: [PATCH 1/2] [exec] add line break in begin failure message --- haxetool/exec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haxetool/exec.js b/haxetool/exec.js index 6e65efe..eb79541 100755 --- a/haxetool/exec.js +++ b/haxetool/exec.js @@ -9,7 +9,7 @@ const queue = async.queue((task, done) => { child_process.exec(task.command, {cwd: task.dir, maxBuffer: 1024 * 10000}, (err, stdout, stderr) => { if (err) { log.v('!%s!', err); - task.failure(stderr || stdout || err); + task.failure('\n' + (stderr || stdout || err)); } else { log.v('%s', stdout); task.success({stdout: stdout, stderr: stderr}); From bfc90c6dbea8ed0c0dc4f710d50c526e3af15684 Mon Sep 17 00:00:00 2001 From: shmyga Date: Thu, 9 Aug 2018 17:41:33 +0300 Subject: [PATCH 2/2] [core] add flags to params --- haxetool/core.js | 2 ++ template/project.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/haxetool/core.js b/haxetool/core.js index 42c6dfa..763a072 100644 --- a/haxetool/core.js +++ b/haxetool/core.js @@ -29,6 +29,7 @@ class Config { this.assets = []; this.libs = []; this.macros = []; + this.flags = []; this.icon = null; this.meta = { title: null, @@ -57,6 +58,7 @@ class Config { if (params.assets !== undefined) this.assets = this.assets.concat(params.assets.map(Config.absolutePath)); if (params.libs !== undefined) this.libs = this.libs.concat(Array.isArray(params.libs) ? params.libs : Object.entries(params.libs).map(([k, v]) => ({name: k, version: v}))); if (params.macros !== undefined) this.macros = this.macros.concat(params.macros); + if (params.flags !== undefined) this.flags = this.flags.concat(params.flags); if (params.meta !== undefined) this.meta = {...this.meta, ...params.meta}; if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon); } diff --git a/template/project.xml b/template/project.xml index 0a7e1bb..bbd63c1 100644 --- a/template/project.xml +++ b/template/project.xml @@ -11,6 +11,8 @@ <% }); %> <% macros.forEach(function(item) { %> <% }); %> + <% flags.forEach(function(item) { %> + <% }); %>