From a0e03e6b3529653f87ed07380c0541a03e4dda41 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Mon, 28 Dec 2015 13:43:20 -0800 Subject: [PATCH] Improve use of tools without haxelib --- run.n | Bin 155835 -> 157175 bytes tools/CommandLineTools.hx | 50 ++++++++++++++++++++++++++++++++------ tools/RunScript.hx | 5 +--- tools/svg.hxml | 3 ++- tools/tools.hxml | 3 ++- 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/run.n b/run.n index ae4568d2c69adf461455dbd04f295cb59e00e02a..a2ddad55f9b3b170bc9807fd3c4e176c6815295f 100644 GIT binary patch delta 17293 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 0) { // When the command-line tools are called from haxelib, // the last argument is the project directory and the - // path to NME is the current working directory + // path to Lime is the current working directory var lastArgument = ""; @@ -1439,6 +1454,25 @@ class CommandLineTools { if (FileSystem.exists (lastArgument) && FileSystem.isDirectory (lastArgument)) { Sys.setCwd (lastArgument); + runFromHaxelib = true; + + } else { + + arguments.push (lastArgument); + + } + + } + + if (!runFromHaxelib) { + + if (FileSystem.exists ("tools.n")) { + + PathHelper.haxelibOverrides.set ("lime", PathHelper.combine (Sys.getCwd (), "../")); + + } else if (FileSystem.exists ("run.n")) { + + PathHelper.haxelibOverrides.set ("lime", Sys.getCwd ()); } diff --git a/tools/RunScript.hx b/tools/RunScript.hx index 4e8ceea24..01ac425c0 100644 --- a/tools/RunScript.hx +++ b/tools/RunScript.hx @@ -160,11 +160,8 @@ class RunScript { public static function main () { var args = Sys.args (); - if (args.length == 0) return; - var command = args[0].toLowerCase (); - - if (args.length > 2 && command == "rebuild" && args[1] == "tools") { + if (args.length > 2 && args[0] == "rebuild" && args[1] == "tools") { var lastArgument = new Path (args[args.length - 1]).toString (); diff --git a/tools/svg.hxml b/tools/svg.hxml index 6120edb2d..baa37191b 100644 --- a/tools/svg.hxml +++ b/tools/svg.hxml @@ -1,6 +1,7 @@ -main SVGExport -neko ../svg.n --lib lime +-D lime +-cp .. -lib openfl -lib svg -D lime_cairo diff --git a/tools/tools.hxml b/tools/tools.hxml index 3242cbe27..06f6c4541 100644 --- a/tools/tools.hxml +++ b/tools/tools.hxml @@ -1,7 +1,8 @@ -main CommandLineTools -neko tools.n -D lime-curl --lib lime +-D lime +-cp .. -lib format #-lib svg -D optional_cffi \ No newline at end of file