Changeset 53765 in webkit

Timestamp:

Jan 23, 2010 1:51:47 AM (14 years ago)

Author:

mitz@apple.com

Message:

Added a user default for specifying a fallback frameworks path in case
the bundle does not contain frameworks for the current Mac OS X version.

Reviewed by Mark Rowe.

• WebKitLauncher/main.m:

(fallbackMacOSXVersion): Added. Looks up the fallback version in a dictionary
keyed by the FallbackSystemVersions user default and returns it.
(main): If a frameworks directory for the current system version is not found,
try the fallback.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• WebKitLauncher/main.m (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-23  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Added a user default for specifying a fallback frameworks path in case
+        the bundle does not contain frameworks for the current Mac OS X version.
+
+        * WebKitLauncher/main.m:
+        (fallbackMacOSXVersion): Added. Looks up the fallback version in a dictionary
+        keyed by the FallbackSystemVersions user default and returns it.
+        (main): If a frameworks directory for the current system version is not found,
+        try the fallback.
+
 2010-01-22  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebKitTools/WebKitLauncher/main.m

@@ -167 +167 @@
 }
 
+static NSString *fallbackMacOSXVersion(NSString *systemVersion)
+{
+    NSDictionary *fallbackVersionMap = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"FallbackSystemVersions"];
+    if (!fallbackVersionMap)
+        return nil;
+    NSString *fallbackSystemVersion = [fallbackVersionMap objectForKey:systemVersion];
+    if (!fallbackSystemVersion || ![fallbackSystemVersion isKindOfClass:[NSString class]])
+        return nil;
+    return fallbackSystemVersion;
+}
+
 static BOOL checkFrameworkPath(NSString *frameworkPath)
 {
@@ -187 +198 @@
     NSString *systemVersion = currentMacOSXVersion();
     NSString *frameworkPath = [[[NSBundle mainBundle] privateFrameworksPath] stringByAppendingPathComponent:systemVersion];
+
+    BOOL frameworkPathIsUsable = checkFrameworkPath(frameworkPath);
+
+    if (!frameworkPathIsUsable) {
+        NSString *fallbackSystemVersion = fallbackMacOSXVersion(systemVersion);
+        if (fallbackSystemVersion) {
+            frameworkPath = [[[NSBundle mainBundle] privateFrameworksPath] stringByAppendingPathComponent:fallbackSystemVersion];
+            frameworkPathIsUsable = checkFrameworkPath(frameworkPath);
+        }
+    }
+
+    if (!frameworkPathIsUsable)
+        displayErrorAndQuit([NSString stringWithFormat:@"Mac OS X %@ is not supported", systemVersion],
+                            [NSString stringWithFormat:@"Nightly builds of WebKit are not supported on Mac OS X %@ at this time.", systemVersion]);
+
     NSString *pathToEnablerLib = [[NSBundle mainBundle] pathForResource:@"WebKitNightlyEnabler" ofType:@"dylib"];
 
     NSBundle *safariBundle = locateSafariBundle();
     NSString *executablePath = [safariBundle executablePath];
-
-    if (!checkFrameworkPath(frameworkPath))
-        displayErrorAndQuit([NSString stringWithFormat:@"Mac OS X %@ is not supported", systemVersion],
-                            [NSString stringWithFormat:@"Nightly builds of WebKit are not supported on Mac OS X %@ at this time.", systemVersion]);
 
     if (!checkSafariVersion(safariBundle)) {