InfernalGames/gulp-haxetool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/android'

Browse Source
This commit is contained in:
shmyga
2018-10-12 14:57:03 +03:00
parent 54830d1d01 bfc90c6dbe
commit 04dae41e2c
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
haxetool/core.js
View File

@@ -29,6 +29,7 @@ class Config {
this.assets = []; this.assets = [];
this.libs = []; this.libs = [];
this.macros = []; this.macros = [];
this.flags = [];
this.icon = null; this.icon = null;
this.meta = { this.meta = {
title: null, title: null,
@@ -57,6 +58,7 @@ class Config {
if (params.assets !== undefined) this.assets = this.assets.concat(params.assets.map(Config.absolutePath)); 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.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.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 (params.meta !== undefined) this.meta = {...this.meta, ...params.meta};
if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon); if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon);
} }

2
haxetool/exec.js
View File

@@ -9,7 +9,7 @@ const queue = async.queue((task, done) => {
child_process.exec(task.command, {cwd: task.dir, maxBuffer: 1024 * 10000}, (err, stdout, stderr) => { child_process.exec(task.command, {cwd: task.dir, maxBuffer: 1024 * 10000}, (err, stdout, stderr) => {
if (err) { if (err) {
log.v('!%s!', err); log.v('!%s!', err);
task.failure(stderr || stdout || err); task.failure('\n' + (stderr || stdout || err));
} else { } else {
log.v('%s', stdout); log.v('%s', stdout);
task.success({stdout: stdout, stderr: stderr}); task.success({stdout: stdout, stderr: stderr});

2
template/project.xml
View File

@@ -11,6 +11,8 @@
<haxelib name="<%=item.name%>" version="<%=item.version.split('@').shift()%>"/><% }); %> <haxelib name="<%=item.name%>" version="<%=item.version.split('@').shift()%>"/><% }); %>
<% macros.forEach(function(item) { %> <% macros.forEach(function(item) { %>
<haxeflag name="--macro" value="<%=item%>"/><% }); %> <haxeflag name="--macro" value="<%=item%>"/><% }); %>
<% flags.forEach(function(item) { %>
<haxeflag name="-D" value="<%=item%>"/><% }); %>
<window fps="30"/> <window fps="30"/>
<window width="1024" height="768" unless="html5"/> <window width="1024" height="768" unless="html5"/>