feat(android): up android sdk version

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/android.js

@@ -12,27 +12,22 @@ const Env = require('./env');
 
 class Android extends Sdk {
 
-    constructor(version) {
+    constructor(version, ndkVersion) {
         super(Android.ID, version || Android.VERSION);
-        this.ndk_version = 'r15c';
+        this.ndk_version = ndkVersion || Android.NDK_VERSION;
+        this.repository = 'https://dl.google.com/android/repository';
     }
 
     get prepared() {
         try {
-            return fs.existsSync(`${this.path}/tools/bin/sdkmanager`);
+            return fs.existsSync(this.sdkmanager_bin);
         } catch (e) {
             return false;
         }
     }
 
     get link() {
-        const system = System.isWindows ? 'windows' : System.isLinux ? 'linux' : null;
-        if (!system) throw 'Unsupported system';
-        if (this.version.indexOf('.') > -1) {
-            return `https://dl.google.com/android/repository/tools_r${this.version}-${system}.zip`;
-        } else {
-            return `https://dl.google.com/android/repository/sdk-tools-${system}-${this.version}.zip`;
-        }
+        return `${this.repository}/commandlinetools-${System.os}-${this.version}_latest.zip`;
     }
 
     get android_home() {
@@ -43,6 +38,10 @@ class Android extends Sdk {
         return path.join(this.path, 'ndk-bundle')
     }
 
+    get sdkmanager_bin() {
+        return path.join(this.path, 'cmdline-tools/bin/sdkmanager');
+    }
+
     prepare() {
         const result = [];
         result.push(super.prepare(0));
@@ -54,7 +53,7 @@ class Android extends Sdk {
 
     prepare_ndk() {
         // ToDo: support windows
-        const url = `https://dl.google.com/android/repository/android-ndk-${this.ndk_version}-linux-x86_64.zip`;
+        const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`;
         this.log.d('download: *%s*', url);
         return Sdk.Downloader.download(url, this.ndk_home, 1, true);
     }
@@ -76,12 +75,15 @@ class Android extends Sdk {
         if (install.size === 0) {
             return Promise.resolve();
         }
-        const androidBin = path.join(this.path, 'tools/bin/sdkmanager');
-        if (fs.existsSync(androidBin)) {
-            fs.chmodSync(androidBin, 0o755);
+        const sdkmanagerBin = this.sdkmanager_bin;
+        if (fs.existsSync(sdkmanagerBin)) {
+            fs.chmodSync(sdkmanagerBin, 0o755);
         }
         const yes = '(while sleep 3; do echo "y"; done)';
-        const command = [yes, '|', androidBin].concat(Array.from(install).map(name => `"${name}"`)).join(' ');
+        const command = [yes, '|', sdkmanagerBin]
+            .concat(Array.from(install).map(name => `"${name}"`))
+            .concat([`--sdk_root="${this.path}"`])
+            .join(' ');
         return exec('.', command).then(() => {
             for (const key of install) {
                 installed.add(key);
@@ -180,8 +182,11 @@ class Android extends Sdk {
         const self = this;
         return through.obj(function(file, enc, callback) {
             self._installApk(file.path, file.package).then(() => {
-                this.push(file);
-                callback();
+                // ToDo: kludge: delay before start
+                setTimeout(() => {
+                    this.push(file);
+                    callback();
+                }, 500);
             });
         });
     }
@@ -242,10 +247,10 @@ class Android extends Sdk {
 
 Android.ID = 'android';
 
-Android.VERSION_25_2_3 = '25.2.3';
-Android.VERSION_3859397 = '3859397';
-Android.VERSION_4333796 = '4333796';
+Android.VERSION_7302050 = '7302050';
+Android.VERSION = Android.VERSION_7302050;
 
-Android.VERSION = Android.VERSION_4333796;
+Android.NDK_VERSION_R15C = 'r15c';
+Android.NDK_VERSION = Android.NDK_VERSION_R15C;
 
 module.exports = Android;

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');
-        fse.emptyDirSync(target);
+        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

@@ -106,7 +106,7 @@ class HaxeBuilder extends Builder {
                         'build-tools;27.0.3',
                         'platforms;android-28',  //ToDo: lime version 7.6.0 -> 28; 7.0.0 -> 26
                         //'ndk-bundle',
-                        'lldb;3.1',
+                        //'lldb;3.1',
                         'cmake;3.6.4111459',
                     ]));
                 const AndroidSDK = this.android.android_home;
@@ -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);
+
 /**
  *
  */

haxetool/sdk.js

@@ -55,6 +55,11 @@ class Downloader {
                     if (entry.type === 'Directory') {
                         fse.ensureDirSync(path.join(dest, path.normalize(filePath)));
                     } else if (entry.type === 'File') {
+                        const fullFilePath = path.join(dest, path.normalize(filePath));
+                        const dirPath = path.dirname(fullFilePath);
+                        if (!fs.existsSync(dirPath)) {
+                            fse.ensureDirSync(dirPath);
+                        }
                         entry.pipe(fs.createWriteStream(path.join(dest, path.normalize(filePath)), {
                             // ToDo: zip entry file mode?
                             mode: executable ? 0o755 : undefined,

haxetool/system.js

@@ -10,6 +10,14 @@ class System {
         return os.type() === 'Linux';
     }
 
+    static get os() {
+        return (
+            this.isWindows ? 'windows' :
+            this.isLinux ? 'linux' :
+                undefined
+        );
+    }
+
     static get archInt() {
         if (os.arch() === 'ia32') return 32;
         if (os.arch() === 'x64') return 64;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-haxetool",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "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%>"