Reviewers: cromwellian, Message: Ray,
Can you confirm that this patch fixes the Snow Leopard issue. It's the same patch as before with the typo fixed and the error message slightly expanded. Please review this at http://gwt-code-reviews.appspot.com/64805 Affected files: M dev/mac/src/com/google/gwt/dev/BootStrapPlatform.java Index: dev/mac/src/com/google/gwt/dev/BootStrapPlatform.java diff --git a/dev/mac/src/com/google/gwt/dev/BootStrapPlatform.java b/dev/mac/src/com/google/gwt/dev/BootStrapPlatform.java index 164a4a6afbda075cb2c71695ee1b72f99f26c65d..e1c70573fec7098757477143e7087b0a23068080 100644 --- a/dev/mac/src/com/google/gwt/dev/BootStrapPlatform.java +++ b/dev/mac/src/com/google/gwt/dev/BootStrapPlatform.java @@ -69,8 +69,10 @@ public class BootStrapPlatform { * The following check must be made before attempting to initialize Safari, * or we'll fail with an less-than-helpful UnsatisfiedLinkError. */ - if (!isJava5()) { - System.err.println("You must use a Java 1.5 runtime to use GWT Hosted Mode on Mac OS X."); + if (!is32Bit()) { + System.err.println("You must use a 32-bit runtime to use GWT Hosted Mode on Mac OS X."); + System.err.println(" Leopard: Use the Java 1.5 runtime."); + System.err.println(" Snow Leopard: Use the Java 1.6 runtime and add -d32"); System.exit(-1); } @@ -111,11 +113,10 @@ public class BootStrapPlatform { } /** - * Determine if we're using the Java 1.5 runtime, since the 1.6 runtime is - * 64-bit. + * Determine if we're using a 32 bit runtime. */ - private static boolean isJava5() { - return System.getProperty("java.version").startsWith("1.5"); + private static boolean is32Bit() { + return "32".equals(System.getProperty("sun.arch.data.model")); } /** --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
