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

Merge branch 'develop' into 8.2.0-Dev

Browse Source
This commit is contained in:
Josh Tynjala
2024-07-01 08:53:48 -07:00
parent d27aaebc01 5f7e63425e
commit e257b7ebe4
17 changed files with 98 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lime/system/CFFI.hx
View File

@@ -165,6 +165,11 @@ class CFFI
{
result = __tryLoad(ndllFolder + __sysName() + "64/" + library, library, method, args);
}
if (result == null)
{
result = __tryLoad(ndllFolder + __sysName() + "Arm64/" + library, library, method, args);
}
}
}

2
src/lime/system/Clipboard.hx
View File

@@ -46,6 +46,8 @@ class Clipboard
{
_text = FlashClipboard.generalClipboard.getData(TEXT_FORMAT);
}
#elseif (js || html5)
_text = cacheText;
#end
__updated = true;

48
src/lime/tools/AndroidHelper.hx
View File

@@ -8,8 +8,6 @@ class AndroidHelper
{
private static var adbName:String;
private static var adbPath:String;
private static var androidName:String;
private static var androidPath:String;
private static var emulatorName:String;
private static var emulatorPath:String;
@@ -159,30 +157,33 @@ class AndroidHelper
public static function initialize(project:HXProject):Void
{
adbPath = project.environment.get("ANDROID_SDK") + "/tools/";
androidPath = project.environment.get("ANDROID_SDK") + "/tools/";
emulatorPath = project.environment.get("ANDROID_SDK") + "/tools/";
adbPath = project.environment.get("ANDROID_SDK") + "/platform-tools/";
emulatorPath = project.environment.get("ANDROID_SDK") + "/emulator/";
adbName = "adb";
androidName = "android";
emulatorName = "emulator";
if (System.hostPlatform == WINDOWS)
{
adbName += ".exe";
androidName += ".bat";
emulatorName += ".exe";
}
if (!FileSystem.exists(adbPath + adbName))
{
adbPath = project.environment.get("ANDROID_SDK") + "/platform-tools/";
// in older SDKs, adb was located in /tools/
adbPath = project.environment.get("ANDROID_SDK") + "/tools/";
}
if (!FileSystem.exists(emulatorPath + emulatorName))
{
// in older SDKs, emulator was located in /tools/
emulatorPath = project.environment.get("ANDROID_SDK") + "/tools/";
}
if (System.hostPlatform != WINDOWS)
{
adbName = "./" + adbName;
androidName = "./" + androidName;
emulatorName = "./" + emulatorName;
}
@@ -194,8 +195,18 @@ class AndroidHelper
public static function install(project:HXProject, targetPath:String, deviceID:String = null):String
{
if (!FileSystem.exists(adbPath + adbName))
{
Log.error("adb not found in Android SDK: " + project.environment.get("ANDROID_SDK"));
}
if (project.targetFlags.exists("emulator") || project.targetFlags.exists("simulator"))
{
if (!FileSystem.exists(emulatorPath + emulatorName))
{
Log.error("emulator not found in Android SDK: " + project.environment.get("ANDROID_SDK"));
}
Log.info("", "Searching for Android emulator");
var devices = listDevices();
@@ -280,16 +291,13 @@ class AndroidHelper
public static function listAVDs():Array<String>
{
var avds = new Array<String>();
var output = System.runProcess(androidPath, androidName, ["list", "avd"]);
var output = System.runProcess(emulatorPath, emulatorName, ["-list-avds"]);
if (output != null && output != "")
{
// -list-avds returns only the avd names, separated by line breaks
for (line in output.split("\n"))
{
if (line.indexOf("Name") > -1)
{
avds.push(StringTools.trim(line.substr(line.indexOf("Name") + 6)));
}
avds.push(StringTools.trim(line));
}
}
@@ -343,6 +351,11 @@ class AndroidHelper
public static function trace(project:HXProject, debug:Bool, deviceID:String = null, customFilter:String = null):Void
{
if (!FileSystem.exists(adbPath + adbName))
{
Log.error("adb not found in Android SDK: " + project.environment.get("ANDROID_SDK"));
}
// Use -DFULL_LOGCAT or <set name="FULL_LOGCAT" /> if you do not want to filter log messages
var args = ["logcat"];
@@ -395,6 +408,11 @@ class AndroidHelper
public static function uninstall(packageName:String, deviceID:String = null):Void
{
if (!FileSystem.exists(adbPath + adbName))
{
Log.error("adb not found in Android SDK");
}
var args = ["uninstall", packageName];
if (deviceID != null && deviceID != "")

36
src/lime/tools/ProjectXMLParser.hx
View File

@@ -894,7 +894,10 @@ class ProjectXMLParser extends HXProject
Log.error(substitute(element.att.value));
case "echo":
Log.println(substitute(element.att.value));
if (command != "display")
{
Log.println(substitute(element.att.value));
}
case "log":
var verbose = "";
@@ -908,21 +911,24 @@ class ProjectXMLParser extends HXProject
{
Log.error(substitute(element.att.error), verbose);
}
else if (element.has.warn)
else if (command != "display")
{
Log.warn(substitute(element.att.warn), verbose);
}
else if (element.has.info)
{
Log.info(substitute(element.att.info), verbose);
}
else if (element.has.value)
{
Log.info(substitute(element.att.value), verbose);
}
else if (verbose != "")
{
Log.info("", verbose);
if (element.has.warn)
{
Log.warn(substitute(element.att.warn), verbose);
}
else if (element.has.info)
{
Log.info(substitute(element.att.info), verbose);
}
else if (element.has.value)
{
Log.info(substitute(element.att.value), verbose);
}
else if (verbose != "")
{
Log.info("", verbose);
}
}
case "path":