kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for HXP API change

Browse Source
This commit is contained in:
Joshua Granick
2018-08-04 18:09:44 -07:00
parent 46ab854e8e
commit bd9abc4c2a
50 changed files with 1343 additions and 1272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/utils/JavaExternGenerator.hx
View File

@@ -5,11 +5,11 @@ import haxe.crypto.BaseCode;
import haxe.io.Bytes;
import haxe.io.Input;
import haxe.io.Output;
import haxe.io.Path;
import hxp.Path;
import haxe.zip.Reader;
#if (hxp > "1.0.0")
import hxp.PathHelper;
import hxp.ProcessHelper;
import hxp.Path;
import hxp.System;
import lime.tools.Project;
#else
import hxp.helpers.PathHelper;
@@ -78,8 +78,8 @@ class JavaExternGenerator
if (Path.extension (javaPath) == "jar") {
this.javaPath = path + "/";
PathHelper.mkdir (path);
ProcessHelper.runCommand (path, "jar", [ "-xvf", FileSystem.fullPath (javaPath) ], false);
System.mkdir (path);
System.runCommand (path, "jar", [ "-xvf", FileSystem.fullPath (javaPath) ], false);
getPaths(path, "", paths);
} else {
@@ -149,9 +149,9 @@ class JavaExternGenerator
if (FileSystem.exists(androidJAR))
{
PathHelper.mkdir (path);
System.mkdir (path);
extractedAndroidPaths.push (path);
ProcessHelper.runCommand (path, "jar", [ "-xvf", androidJAR ], false);
System.runCommand (path, "jar", [ "-xvf", androidJAR ], false);
}
}
@@ -179,12 +179,12 @@ class JavaExternGenerator
var dir_parts = parts.slice(0,parts.length-1);
var outputBase = externPath;
var dir = outputBase;
PathHelper.mkdir(dir);
System.mkdir(dir);
for(d in dir_parts)
{
dir += "/" + d;
PathHelper.mkdir(dir);
System.mkdir(dir);
}
var filename = javaPath + inClass + ".class";
@@ -525,12 +525,12 @@ class JavaExternGenerator
var dir = "stubs";
var parts = mCurrentType.split(".");
var dir_parts = parts.slice(0, parts.length - 1);
PathHelper.mkdir(dir);
System.mkdir(dir);
for(d in dir_parts)
{
dir += "/" + d;
PathHelper.mkdir(dir);
System.mkdir(dir);
}
var interface_name = parts[parts.length - 1];
@@ -771,16 +771,16 @@ class JavaExternGenerator
java_out.writeString("}\n");
java_out.close();
PathHelper.mkdir("compiled");
System.mkdir("compiled");
var nme_path = getHaxelib("openfl") + "/__backends/native/templates/android/template/src";
ProcessHelper.runCommand ("", "javac", [ "-classpath", "\"classes/android.jar\";\"" + javaPath.substr (0, javaPath.length -1) + "\"", "-sourcepath", nme_path, "-d", "compiled", "stubs/" + java_name ], true, true, true);
System.runCommand ("", "javac", [ "-classpath", "\"classes/android.jar\";\"" + javaPath.substr (0, javaPath.length -1) + "\"", "-sourcepath", nme_path, "-d", "compiled", "stubs/" + java_name ], true, true, true);
//Sys.setCwd("compiled");
var class_name = java_name.substr(0, java_name.length - 4) + "class";
var dx = Sys.getEnv("ANDROID_SDK") + "/platforms/" + extractedAndroidPaths[0] + "/tools/dx";
ProcessHelper.runCommand ("compiled", dx, [ "--dex", "--output=classes.jar", class_name ], true, true, true);
System.runCommand ("compiled", dx, [ "--dex", "--output=classes.jar", class_name ], true, true, true);
if (FileSystem.exists ("classes.jar")) {