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

Check Haxe version once

Browse Source
This commit is contained in:
Joshua Granick
2016-10-31 10:03:11 -07:00
parent 7fe79ca748
commit 8be354b073
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include.xml
View File

@@ -2,7 +2,7 @@
<extension>
<log error="Lime ${lime} is not compatible with Haxe ${haxe} (version 3.2.0 or higher is required)" if="${haxe < 3.2.0}" />
<set name="lime" />
<haxedef name="native" if="cpp || neko || nodejs || cs" />

6
lime/project/ProjectXMLParser.hx
View File

@@ -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");

17
tools/CommandLineTools.hx
View File

@@ -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")) {