Merge pull request #646 from Gama11/haxelib-validate
ProjectXMLParser: add a validate attribute to <haxelib>
This commit is contained in:
@@ -427,7 +427,7 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
if (element.has.embed) {
|
||||
|
||||
embed = substitute (element.att.embed) == "true";
|
||||
embed = parseBool (element.att.embed);
|
||||
|
||||
}
|
||||
|
||||
@@ -590,7 +590,7 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
if (childElement.has.embed) {
|
||||
|
||||
childEmbed = substitute (childElement.att.embed) == "true";
|
||||
childEmbed = parseBool (childElement.att.embed);
|
||||
|
||||
}
|
||||
|
||||
@@ -762,6 +762,13 @@ class ProjectXMLParser extends HXProject {
|
||||
}
|
||||
|
||||
|
||||
private function parseBool (attribute:String):Bool {
|
||||
|
||||
return substitute (attribute) == "true";
|
||||
|
||||
}
|
||||
|
||||
|
||||
private function parseXML (xml:Fast, section:String, extensionPath:String = ""):Void {
|
||||
|
||||
for (element in xml.elements) {
|
||||
@@ -956,6 +963,7 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
var name = substitute (element.att.name);
|
||||
var version = "";
|
||||
var validate = true;
|
||||
|
||||
if (element.has.version) {
|
||||
|
||||
@@ -963,6 +971,12 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
}
|
||||
|
||||
if (element.has.validate) {
|
||||
|
||||
validate = parseBool (element.att.validate);
|
||||
|
||||
}
|
||||
|
||||
/*if (name == "nme" && defines.exists ("openfl")) {
|
||||
|
||||
name = "openfl-nme-compatibility";
|
||||
@@ -979,7 +993,13 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
} else {
|
||||
|
||||
path = PathHelper.getHaxelib (haxelib, true);
|
||||
path = PathHelper.getHaxelib (haxelib, validate);
|
||||
|
||||
}
|
||||
|
||||
if (path == "") {
|
||||
|
||||
continue;
|
||||
|
||||
}
|
||||
|
||||
@@ -1049,7 +1069,7 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
if (element.has.register) {
|
||||
|
||||
registerStatics = (substitute (element.att.register) == "true");
|
||||
registerStatics = parseBool (element.att.register);
|
||||
|
||||
}
|
||||
|
||||
@@ -1252,19 +1272,19 @@ class ProjectXMLParser extends HXProject {
|
||||
|
||||
if (element.has.embed) {
|
||||
|
||||
embed = (substitute (element.att.embed) == "true");
|
||||
embed = parseBool (element.att.embed);
|
||||
|
||||
}
|
||||
|
||||
if (element.has.preload) {
|
||||
|
||||
preload = (substitute (element.att.preload) == "true");
|
||||
preload = parseBool (element.att.preload);
|
||||
|
||||
}
|
||||
|
||||
if (element.has.generate) {
|
||||
|
||||
generate = (substitute (element.att.generate) == "true");
|
||||
generate = parseBool (element.att.generate);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user