Skip to content

Fix tool launching on macOS #850

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
sciencewhiz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix tool launching on macOS #850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions src/main/java/org/wpilib/gradlerio/wpi/dependencies/tools/CppToolRunTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ public CppToolRunTask(ObjectFactory objects, ExecOperations execOperations) {
@TaskAction
public void runTool() {
boolean isWindows = OperatingSystem.current().isWindows();
boolean isMac = OperatingSystem.current().isMacOsX();
if (isWindows) {
runToolWindows();
} else if (isMac) {
runToolMac();
} else {
runToolUnix();
}
Expand Down Expand Up @@ -86,6 +89,18 @@ private void runToolUnix() {
});
}

private void runToolMac() {
Directory toolsFolder = this.toolsFolder.get();
String toolName = this.toolName.get();
String toolApp = toolName + ".app";
File outputFile = toolsFolder.file(toolApp).getAsFile();
String argPath = getArgumentPath(toolName.toLowerCase());
operations.exec(spec -> {
spec.setExecutable("open");
spec.args(outputFile.getAbsolutePath(), "--args", argPath);
});
}

@Override
@Internal
public Provider<String> getSingletonName() {
Expand Down
Loading