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

Merge HXProject defaults and exclude architectures at end

Browse Source
This commit is contained in:
Joshua Granick
2022-03-23 14:00:32 -07:00
parent 54338c082a
commit 362be074f4
18 changed files with 924 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/CommandLineTools.hx
View File

@@ -54,7 +54,6 @@ class CommandLineTools
words = new Array<String>();
overrides = new HXProject();
overrides.architectures = [];
// Haxelib.setOverridePath (new Haxelib ("lime-tools"), Path.combine (Haxelib.getPath (new Haxelib ("lime")), "tools"));
@@ -1859,18 +1858,25 @@ class CommandLineTools
if (Reflect.hasField(project, field))
{
var fieldValue = Reflect.field(project, field);
if (Reflect.hasField(fieldValue, attribute))
var typeValue:Dynamic = switch(field)
{
if ((Reflect.field(fieldValue, attribute) is String))
case "app": ApplicationData._ApplicationDataType.fields;
case "meta": MetaData._MetaDataType.fields;
case "window": WindowData._WindowDataType.fields;
default: fieldValue;
};
if (Reflect.hasField(typeValue, attribute))
{
if ((Reflect.field(typeValue, attribute) is String))
{
Reflect.setField(fieldValue, attribute, projectDefines.get(key));
}
else if ((Reflect.field(fieldValue, attribute) is Float))
else if ((Reflect.field(typeValue, attribute) is Float))
{
Reflect.setField(fieldValue, attribute, Std.parseFloat(projectDefines.get(key)));
}
else if ((Reflect.field(fieldValue, attribute) is Bool))
else if ((Reflect.field(typeValue, attribute) is Bool))
{
Reflect.setField(fieldValue, attribute, (projectDefines.get(key).toLowerCase() == "true"
|| projectDefines.get(key) == "1"));
@@ -2122,10 +2128,17 @@ class CommandLineTools
if (field == "meta-build-number") property = "buildNumber";
var fieldReference = Reflect.field(overrides, fieldName);
if (Reflect.hasField(fieldReference, property))
var typeValue:Dynamic = switch(fieldName)
{
var propertyReference = Reflect.field(fieldReference, property);
case "app": ApplicationData._ApplicationDataType.fields;
case "meta": MetaData._MetaDataType.fields;
case "window": WindowData._WindowDataType.fields;
default: fieldReference;
};
if (Reflect.hasField(typeValue, property))
{
var propertyReference = Reflect.field(typeValue, property);
if ((propertyReference is Bool))
{