diff --git a/include.xml b/include.xml index f7720c255..46b291fdf 100644 --- a/include.xml +++ b/include.xml @@ -2,7 +2,7 @@ - + diff --git a/lime/project/ProjectXMLParser.hx b/lime/project/ProjectXMLParser.hx index 0cf1d7b89..da6a47d9f 100644 --- a/lime/project/ProjectXMLParser.hx +++ b/lime/project/ProjectXMLParser.hx @@ -128,12 +128,6 @@ class ProjectXMLParser extends HXProject { } - var p = new sys.io.Process ("haxe", ["-version"]); - var haxeVersion = StringTools.replace (p.stderr.readAll ().toString (), "\n", ""); - p.close (); - defines.set ("haxe", haxeVersion); - defines.set ("haxe"+haxeVersion.split(".")[0], "1"); - if (debug) { defines.set ("debug", "1"); diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index 5d11cb3d5..36f9b5dfa 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -1388,11 +1388,18 @@ class CommandLineTools { } - // Not sure why this gets no output? - - //var haxeVersion = ProcessHelper.runProcess ("", "haxe", [ "-version" ], true, true, true); - //environment.set ("haxe", haxeVersion); - //environment.set ("haxe_ver", haxeVersion); + try { + + var process = new Process ("haxe", [ "-version" ]); + var haxeVersion = StringTools.trim (process.stderr.readAll ().toString ()); + process.close (); + + environment.set ("haxe", haxeVersion); + environment.set ("haxe_ver", haxeVersion); + + environment.set ("haxe" + haxeVersion.split (".")[0], "1"); + + } catch (e:Dynamic) {} if (!environment.exists ("HAXE_STD_PATH")) {