Skip to content

Fix RunScript to use local haxelib paths. #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MAJigsaw77 wants to merge 4 commits into
base: develop
Choose a base branch
from
+19 −14
Open

Fix RunScript to use local haxelib paths. #1992

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c982f60
Fix `RunScript` to use local `haxelib` paths.
MAJigsaw77 Oct 21, 2025
205eacc
Fix for `Eval`.
MAJigsaw77 Oct 21, 2025
9a04f39
Better patchup for `Eval`.
MAJigsaw77 Oct 21, 2025
29738a5
Revert change to Sys.setCwd behavior
tobil4sk Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions tools/RunScript.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,9 @@ class RunScript
{
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 > 0)
{
var lastArgument = new Path(args[args.length - 1]).toString();
var cacheDirectory = Sys.getCwd();

if (((StringTools.endsWith(lastArgument, "/") && lastArgument != "/") || StringTools.endsWith(lastArgument, "\\"))
&& !StringTools.endsWith(lastArgument, ":\\"))
Expand All @@ -149,10 +139,25 @@ class RunScript

if (FileSystem.exists(lastArgument) && FileSystem.isDirectory(lastArgument))
{
Sys.setCwd(lastArgument);
Haxelib.workingDirectory = lastArgument;
}
}

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")
{
var cacheDirectory = Sys.getCwd();
// used for Path.tryFullPath when setting overrides
Sys.setCwd(Haxelib.workingDirectory);

Haxelib.workingDirectory = Sys.getCwd();
var rebuildBinaries = true;

for (arg in args)
Expand Down Expand Up @@ -210,7 +215,7 @@ class RunScript
"-D", "lime",
"-cp", toolsDirectory,
"-cp", Path.combine(toolsDirectory, "platforms"),
"-cp", "src",
"-cp", Path.combine(limeDirectory, "src"),
"-lib", "format",
"-lib", "hxp",
"--run", "CommandLineTools"].concat(args);
Expand Down