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

Embed a custom copy of haxelib, fix 'haxelib path'

Browse Source
This commit is contained in:
Joshua Granick
2017-05-18 11:20:53 -07:00
parent 9d373c6b08
commit f4d1df57ee
22 changed files with 3943 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/CommandLineTools.hx
View File

@@ -59,7 +59,7 @@ class CommandLineTools {
overrides = new HXProject ();
overrides.architectures = [];
HaxelibHelper.setOverridePath (new Haxelib ("lime-tools"), PathHelper.combine (HaxelibHelper.getPath (new Haxelib ("lime")), "tools"));
//HaxelibHelper.setOverridePath (new Haxelib ("lime-tools"), PathHelper.combine (HaxelibHelper.getPath (new Haxelib ("lime")), "tools"));
processArguments ();
version = HaxelibHelper.getVersion ();
@@ -602,7 +602,7 @@ class CommandLineTools {
} else {
ProcessHelper.runCommand ("", "haxelib", [ "run", handler ].concat (args));
HaxelibHelper.runCommand ("", [ "run", handler ].concat (args));
}
@@ -1813,6 +1813,8 @@ class CommandLineTools {
if (FileSystem.exists (lastArgument) && FileSystem.isDirectory (lastArgument)) {
HaxelibHelper.setOverridePath (new Haxelib ("lime-tools"), PathHelper.combine (Sys.getCwd (), "tools"));
Sys.setCwd (lastArgument);
runFromHaxelib = true;
@@ -1826,16 +1828,25 @@ class CommandLineTools {
if (!runFromHaxelib) {
var path = null;
if (FileSystem.exists ("tools.n")) {
HaxelibHelper.setOverridePath (new Haxelib ("lime"), PathHelper.combine (Sys.getCwd (), "../"));
path = PathHelper.combine (Sys.getCwd (), "../");
} else if (FileSystem.exists ("run.n")) {
HaxelibHelper.setOverridePath (new Haxelib ("lime"), Sys.getCwd ());
path = Sys.getCwd ();
} else {
LogHelper.error ("Could not run Lime tools from this directory");
}
HaxelibHelper.setOverridePath (new Haxelib ("lime"), path);
HaxelibHelper.setOverridePath (new Haxelib ("lime-tools"), PathHelper.combine (path, "tools"));
}
var catchArguments = false;
@@ -2161,7 +2172,7 @@ class CommandLineTools {
if (path != null && path != "") {
ProcessHelper.runCommand ("", "haxelib", [ "remove", name ]);
HaxelibHelper.runCommand ("", [ "remove", name ]);
}