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

Fix command-line NDLL path when running Lime in a local .haxelib repository

Browse Source
This commit is contained in:
Joshua Granick
2017-07-24 15:05:55 -07:00
parent baf7b12326
commit 3e8344d9b5
1 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
tools/CommandLineTools.hx
View File

@@ -478,68 +478,70 @@ class CommandLineTools {
}
var process = new Process ("haxelib", [ "path", "lime" ]);
var path = "";
var lines = new Array<String> ();
try {
if (FileSystem.exists ("tools.n")) {
while (true) {
var length = lines.length;
var line = StringTools.trim (process.stdout.readLine ());
if (length > 0 && (line == "-D lime" || StringTools.startsWith (line, "-D lime="))) {
path = StringTools.trim (lines[length - 1]);
}
lines.push (line);
}
path = PathHelper.combine (Sys.getCwd (), "../");
} catch (e:Dynamic) {
} else if (FileSystem.exists ("run.n")) {
path = Sys.getCwd ();
}
if (path == "") {
for (line in lines) {
var process = new Process ("haxelib", [ "path", "lime" ]);
var lines = new Array<String> ();
try {
if (line != "" && line.substr (0, 1) != "-") {
while (true) {
try {
var length = lines.length;
var line = StringTools.trim (process.stdout.readLine ());
if (length > 0 && (line == "-D lime" || StringTools.startsWith (line, "-D lime="))) {
if (FileSystem.exists (line)) {
path = line;
}
path = StringTools.trim (lines[length - 1]);
} catch (e:Dynamic) {}
}
lines.push (line);
}
} catch (e:Dynamic) {
}
if (path == "") {
for (line in lines) {
if (line != "" && line.substr (0, 1) != "-") {
try {
if (FileSystem.exists (line)) {
path = line;
}
} catch (e:Dynamic) {}
}
}
}
}
if (path == "") {
if (FileSystem.exists ("tools.n")) {
path = PathHelper.combine (Sys.getCwd (), "../");
} else if (FileSystem.exists ("run.n")) {
path = Sys.getCwd ();
}
process.close ();
}
process.close ();
path += "/ndll/";
switch (PlatformHelper.hostPlatform) {