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

Add support for rolling back to older Lime tools, after switching to local repository version

Browse Source
This commit is contained in:
Joshua Granick
2017-07-12 13:07:01 -07:00
parent 4d48be431a
commit e81fd6aa13
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/CommandLineTools.hx
View File

@@ -1731,6 +1731,7 @@ class CommandLineTools {
LogHelper.info ("", LogHelper.accentColor + "Requesting tools version " + getToolsVersion (haxelib.version) + "...\x1b[0m\n"); LogHelper.info ("", LogHelper.accentColor + "Requesting tools version " + getToolsVersion (haxelib.version) + "...\x1b[0m\n");
HaxelibHelper.pathOverrides.remove ("lime");
var path = HaxelibHelper.getPath (haxelib); var path = HaxelibHelper.getPath (haxelib);
var args = Sys.args (); var args = Sys.args ();
@@ -1748,15 +1749,16 @@ class CommandLineTools {
var args = [ PathHelper.combine (path, "run.n") ].concat (args); var args = [ PathHelper.combine (path, "run.n") ].concat (args);
args.push (workingDirectory); args.push (workingDirectory);
//trace (args);
Sys.exit (Sys.command ("neko", args)); Sys.exit (Sys.command ("neko", args));
return null;
//var args = [ "run", "lime:" + haxelib.version ].concat (args); //var args = [ "run", "lime:" + haxelib.version ].concat (args);
//Sys.exit (Sys.command ("haxelib", args)); //Sys.exit (Sys.command ("haxelib", args));
} else { } else {
if (Std.string (version) != Std.string (HaxelibHelper.getVersion (haxelib))) {
LogHelper.warn ("", LogHelper.accentColor + "Could not switch to requested tools version\x1b[0m"); LogHelper.warn ("", LogHelper.accentColor + "Could not switch to requested tools version\x1b[0m");
} }
@@ -1765,6 +1767,8 @@ class CommandLineTools {
} }
}
if (overrides.architectures.length > 0) { if (overrides.architectures.length > 0) {
project.architectures = overrides.architectures; project.architectures = overrides.architectures;