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

Merge pull request #1873 from player-03/RunScript_absolute_paths

Browse Source 
Use absolute paths when running Lime.
This commit is contained in:
player-03
2024-12-10 20:38:40 -05:00
committed by GitHub
parent c81ad95ae5 8a1083be25
commit 0b08e7fa61
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/RunScript.hx
View File

@@ -7,16 +7,8 @@ import sys.FileSystem;
class RunScript class RunScript
{ {
private static function rebuildTools(rebuildBinaries = true):Void private static function rebuildTools(limeDirectory:String, toolsDirectory:String, rebuildBinaries = true):Void
{ {
var limeDirectory = Haxelib.getPath(new Haxelib("lime"), true);
var toolsDirectory = Path.combine(limeDirectory, "tools");
if (!FileSystem.exists(toolsDirectory))
{
toolsDirectory = Path.combine(limeDirectory, "../tools");
}
/*var extendedToolsDirectory = Haxelib.getPath (new Haxelib ("lime-extended"), false); /*var extendedToolsDirectory = Haxelib.getPath (new Haxelib ("lime-extended"), false);
if (extendedToolsDirectory != null && extendedToolsDirectory != "") { if (extendedToolsDirectory != null && extendedToolsDirectory != "") {
@@ -135,6 +127,15 @@ class RunScript
{ {
var args = Sys.args(); var args = Sys.args();
var limeDirectory = Haxelib.getPath(new Haxelib("lime"), true);
var toolsDirectory = Path.combine(limeDirectory, "tools");
if (!FileSystem.exists(toolsDirectory))
{
limeDirectory = Path.combine(limeDirectory, "..");
toolsDirectory = Path.combine(limeDirectory, "tools");
}
if (args.length > 2 && args[0] == "rebuild" && args[1] == "tools") if (args.length > 2 && args[0] == "rebuild" && args[1] == "tools")
{ {
var lastArgument = new Path(args[args.length - 1]).toString(); var lastArgument = new Path(args[args.length - 1]).toString();
@@ -187,7 +188,7 @@ class RunScript
} }
} }
rebuildTools(rebuildBinaries); rebuildTools(limeDirectory, toolsDirectory, rebuildBinaries);
if (args.indexOf("-openfl") > -1) if (args.indexOf("-openfl") > -1)
{ {
@@ -207,8 +208,8 @@ class RunScript
var args = [ var args = [
"-D", "lime", "-D", "lime",
"-cp", "tools", "-cp", toolsDirectory,
"-cp", "tools/platforms", "-cp", Path.combine(toolsDirectory, "platforms"),
"-cp", "src", "-cp", "src",
"-lib", "format", "-lib", "format",
"-lib", "hxp", "-lib", "hxp",
@@ -216,12 +217,13 @@ class RunScript
Sys.exit(runCommand("", "haxe", args)); Sys.exit(runCommand("", "haxe", args));
} }
if (!FileSystem.exists("tools/tools.n") || args.indexOf("-rebuild") > -1) var tools_n = Path.combine(toolsDirectory, "tools.n");
if (!FileSystem.exists(tools_n) || args.indexOf("-rebuild") > -1)
{ {
rebuildTools(); rebuildTools(limeDirectory, toolsDirectory);
} }
var args = ["tools/tools.n"].concat(args); var args = [tools_n].concat(args);
Sys.exit(runCommand("", "neko", args)); Sys.exit(runCommand("", "neko", args));
} }
} }