Skip to content

Search for executable at old locations too in pde.build.tests #1857

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

Merged
HannesWell merged 1 commit into from
Jul 8, 2025
Merged

Search for executable at old locations too in pde.build.tests #1857

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
23 changes: 17 additions & 6 deletions build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,18 +383,29 @@ public static File findExecutable() throws IOException {
}
}
}

if (Platform.OS_MACOSX.equals(Platform.getOS())) {
// After https://bugs.eclipse.org/431116 and related changes, the install
// location on the Mac
// moved down two directories (from <folder-containing-Eclipse.app> to
// Eclipse.app/Contents/Eclipse).
baseLocation = baseLocation.getParentFile().getParentFile();
}
File fallback1 = new File(baseLocation.getParentFile(), "deltapack/eclipse");
executableLocation = findExecutable(fallback1);
if (executableLocation != null) {
return executableLocation;
}
if (Platform.OS.isMac()) {
// After https://bugs.eclipse.org/431116 and related changes, the install
// location on the Mac
// moved down two directories (from <folder-containing-Eclipse.app> to
// Eclipse.app/Contents/Eclipse).
baseLocation = baseLocation.getParentFile().getParentFile().getParentFile();
baseLocation = baseLocation.getParentFile();
}
File fallback = new File(baseLocation.getParentFile().getParentFile(), "deltapack/eclipse");
executableLocation = findExecutable(fallback);
assertNotNull("All attempts to find the executable failed including fallback to " + fallback.getAbsolutePath(),
executableLocation);
File fallback2 = new File(baseLocation.getParentFile().getParentFile(), "deltapack/eclipse");
executableLocation = findExecutable(fallback2);
assertNotNull("All attempts to find the executable failed including fallback to " + fallback1.getAbsolutePath()
+ " or to " + fallback2.getAbsolutePath(), executableLocation);
return executableLocation;
}

Expand Down
Loading