[template] add flags to project.hxml template

CHANGELOG.md

@@ -1,3 +1,7 @@
+0.1.6
+-----
+* Android: fix build result apk path
+
 0.1.5
 -----
 * Haxe: default version 4.0.5

haxetool/core.js

@@ -16,6 +16,7 @@ const Platform = {
     WINDOWS: 'windows',
     ANDROID: 'android',
     NEKO: 'neko',
+    CPP: 'cpp',
 };
 
 

haxetool/haxe.js

@@ -105,7 +105,7 @@ class Haxe extends Sdk {
         const target = path.resolve(buildDir, platform, 'bin');
         fse.emptyDirSync(target);
         const result = {
-            'android': 'app/build/outputs/apk/*-debug.apk',
+            'android': `app/build/outputs/**/${config.meta.filename}-debug.apk`,
             'flash': '*.swf',
         }[platform] || '**/*';
         return this.haxelib(args).then(() => {
@@ -143,11 +143,22 @@ class Haxe extends Sdk {
             args.push('-debug');
         }
         const target = path.resolve(buildDir, platform, 'bin');
+        if (platform !== 'cpp') {
             fse.emptyDirSync(target);
+        }
         for (const asset of config.assets) {
             fse.copySync(asset, path.join(target, asset.split("/").pop()));
         }
-        return this.haxe(args).then(() => vfs.src(`${target}/**/*`));
+        const result = {
+            'cpp': `${config.meta.filename}/${config.main.split('.').pop()}${debug ? '-debug' : ''}`,
+        }[platform] || '**/*';
+        return this.haxe(args).then(() => {
+            let r = vfs.src(`${target}/${result}`);
+            if (platform === 'cpp') {
+                r = r.pipe(rename(config.meta.filename));
+            }
+            return r;
+        });
     }
 
     install(packages) {

haxetool/project.js

@@ -392,6 +392,19 @@ class LinuxRunner extends Runner {
 
 Runner.register(Platform.LINUX, LinuxRunner);
 
+/**
+ *
+ */
+class CPPRunner extends LinuxRunner {
+
+    constructor(config, debug) {
+        super(config, debug);
+        this.platform = Platform.CPP
+    }
+}
+
+Runner.register(Platform.CPP, CPPRunner);
+
 /**
  *
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-haxetool",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "HaXe Tool for Gulp",
   "main": "index.js",
   "dependencies": {

template/project.hxml

@@ -4,6 +4,8 @@
 -lib <%=item.name%>:<%=item.version.split('@').shift()%><% }); %>
 <% macros.forEach(function(item) { %>
 --macro "<%=item%>"<% }); %>
+<% flags.forEach(function(item) { %>
+-D <%=item%><% }); %>
 
 -main <%=main%>
 -<%=out%> "<%=buildDir%>/<%=platform%>/bin/<%=meta.filename%><%=ext%>"