aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-01-02 08:01:35 -0500
committerAlexander Kurtakov2018-01-02 08:01:35 -0500
commitad7e7f15aca42271b2978be32b7e5fda7ef819ef (patch)
tree2948c192804747303f77850890d53baadc438868
parentf424c62ee1ba04fae505f72e2d05a246d3caf2ff (diff)
downloadeclipse.pde.build-ad7e7f15aca42271b2978be32b7e5fda7ef819ef.tar.gz
eclipse.pde.build-ad7e7f15aca42271b2978be32b7e5fda7ef819ef.tar.xz
eclipse.pde.build-ad7e7f15aca42271b2978be32b7e5fda7ef819ef.zip
Revert the part removing lookup for deltapack as the test.xml file still creates one. Totally bogus test IMHO. Change-Id: I30d2935125203e088e2f50d780d6940838932264 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
index 805ac19b..a91a2e99 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java
@@ -344,6 +344,15 @@ public class Utils {
}
}
}
+
+ 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();
+ }
+ executableLocation = findExecutable(new File(baseLocation.getParent(), "deltapack/eclipse"));
return executableLocation;
}