34808.patch5rкshmBINIndex: macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java,v retrieving revision 1.12 diff -u -r1.12 MacOSXLaunchingPlugin.java --- macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java 10 Mar 2003 21:56:05 -0000 1.12 +++ macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java 13 Mar 2003 04:34:18 -0000 @@ -79,7 +79,7 @@ } static String createWrapper(Class where, String filename) { - + /* * In order to build an application bundle under MacOS X we need a small stub * that reads the various artefacts of a bundle and starts the Java VM. We copy @@ -95,7 +95,15 @@ javaApplStub= javaApplStub.substring(0, javaApplStub.length()-expected.length()); javaApplStub+= "/Contents/MacOS/"; //$NON-NLS-1$ } else { - javaApplStub= "/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/"; //$NON-NLS-1$ + javaApplStub= System.getProperty("java.class.path"); //$NON-NLS-1$ + pos= javaApplStub.indexOf(expected); + if (pos > 0) { + javaApplStub= javaApplStub.substring(0, pos); + javaApplStub+= "/Contents/MacOS/"; //$NON-NLS-1$ + } else { + // fall back + javaApplStub= "/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/"; //$NON-NLS-1$ + } } javaApplStub= "JAVASTUB=\""+ javaApplStub + "\"\n"; //$NON-NLS-1$ //$NON-NLS-2$