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

Wildcard haxelib version patch

Browse Source
This commit is contained in:
Joshua Granick
2017-05-18 09:38:33 -07:00
parent d3837f3b2c
commit 9d373c6b08
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lime/project/HXProject.hx
View File

@@ -1114,15 +1114,25 @@ class HXProject {
for (haxelib in haxelibs) {
var name = haxelib.name;
var version = HaxelibHelper.getVersion (haxelib);
if (haxelib.version != "") {
if (haxelib.version != null) {
name += ":" + haxelib.version;
name += ":" + version;
}
#if lime
// TODO: Need to be able to handle this without 'haxelib path'
if (version == HaxelibHelper.getVersion (new Haxelib (haxelib.name))) {
// Fix case where using dev directory newer than other versions
name = haxelib.name;
}
if (HaxelibHelper.pathOverrides.exists (name)) {
var param = "-cp " + HaxelibHelper.pathOverrides.get (name);

8
lime/project/ProjectXMLParser.hx
View File

@@ -1318,15 +1318,15 @@ class ProjectXMLParser extends HXProject {
}
if (version != "" && defines.exists (name) && defines.get (name) != version) {
var haxelib = new Haxelib (name, version);
if (version != "" && defines.exists (name) && !haxelib.versionMatches (defines.get (name))) {
LogHelper.warn ("Ignoring requested haxelib \"" + name + "\" version \"" + version + "\" (version \"" + defines.get (name) + "\" was already included)");
continue;
}
var haxelib = new Haxelib (name, version);
if (path == null) {
if (defines.exists ("setup")) {
@@ -1363,7 +1363,7 @@ class ProjectXMLParser extends HXProject {
if (!defines.exists (haxelib.name)) {
defines.set (haxelib.name, HaxelibHelper.getVersion (haxelib));
defines.set (haxelib.name, Std.string (HaxelibHelper.getVersion (haxelib)));
}

2
lime/tools/helpers/HaxelibHelper.hx
View File

@@ -340,6 +340,8 @@ class HaxelibHelper {
}
getPath (haxelib, true, clearCache);
//if (haxelib.version != "") {
//return haxelib.version;