@@ -360,8 +360,10 @@ public static File findExecutable() throws IOException {
360360
361361 File baseLocation = new File (Platform .getInstallLocation ().getURL ().getPath ());
362362
363+ System .out .println ("Search exe at baseLocation: " + baseLocation );
363364 executableLocation = findExecutable (baseLocation );
364365 if (executableLocation != null ) {
366+ System .out .println ("Found exe at 1: " + executableLocation );
365367 return executableLocation ;
366368 }
367369
@@ -371,12 +373,14 @@ public static File findExecutable() throws IOException {
371373 BundleInfo [] bundles = manipulator
372374 .loadConfiguration (BundleHelper .getDefault ().getBundle ().getBundleContext (), null );
373375 // find a fragment for a platform we aren't
374- String id = "org.eclipse.equinox.launcher.win32.win32.x86_64" ;
376+ String id = "org.eclipse.equinox.launcher.win32.win32.x86_64" ; // FIXME: try for other platforms too?!
375377 for (BundleInfo bundle : bundles ) {
376378 if (bundle .getSymbolicName ().equals (id )) {
377379 URI location = bundle .getLocation ();
380+ System .out .println ("Search exe at bundle location: " + location );
378381 executableLocation = findExecutable (URIUtil .toFile (URIUtil .append (location , "../.." )));
379382 if (executableLocation != null ) {
383+ System .out .println ("Found exe at 2: " + executableLocation );
380384 return executableLocation ;
381385 }
382386 break ;
@@ -390,9 +394,14 @@ public static File findExecutable() throws IOException {
390394 // moved down two directories (from <folder-containing-Eclipse.app> to
391395 // Eclipse.app/Contents/Eclipse).
392396 baseLocation = baseLocation .getParentFile ().getParentFile ().getParentFile ();
397+ System .out .println ("On Mac! Move baseLocation to: " + baseLocation );
393398 }
394399 File fallback = new File (baseLocation .getParentFile ().getParentFile (), "deltapack/eclipse" );
400+ System .out .println ("Search exe at fallback: " + fallback );
395401 executableLocation = findExecutable (fallback );
402+ if (executableLocation != null ) {
403+ System .out .println ("Found exe at 4: " + executableLocation );
404+ }
396405 assertNotNull ("All attempts to find the executable failed including fallback to " + fallback .getAbsolutePath (),
397406 executableLocation );
398407 return executableLocation ;
0 commit comments