summaryrefslogtreecommitdiffstats
path: root/WebKitTools/WebKitLauncher
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitTools/WebKitLauncher')
-rw-r--r--WebKitTools/WebKitLauncher/main.m13
1 files changed, 1 insertions, 12 deletions
diff --git a/WebKitTools/WebKitLauncher/main.m b/WebKitTools/WebKitLauncher/main.m
index 7c9b9a5..7d13994 100644
--- a/WebKitTools/WebKitLauncher/main.m
+++ b/WebKitTools/WebKitLauncher/main.m
@@ -130,15 +130,6 @@ NSBundle *locateSafariBundle()
return safariBundle;
}
-NSString *currentSystemVersion()
-{
- long version;
- if (Gestalt(gestaltSystemVersion, &version) != noErr)
- return @"10.4";
-
- return [NSString stringWithFormat:@"%x.%x", (version & 0xFF00) >> 8, (version & 0x00F0) >> 4];
-}
-
int main(int argc, char *argv[])
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -146,10 +137,8 @@ int main(int argc, char *argv[])
NSBundle *safariBundle = locateSafariBundle();
NSString *executablePath = [safariBundle executablePath];
- NSString *frameworkPath = [[[NSBundle mainBundle] privateFrameworksPath] stringByAppendingPathComponent:currentSystemVersion()];
+ NSString *frameworkPath = [[NSBundle mainBundle] resourcePath];
NSString *pathToEnablerLib = [[NSBundle mainBundle] pathForResource:@"WebKitNightlyEnabler" ofType:@"dylib"];
-
- NSLog(@"Using framework path of %@", frameworkPath);
if ([frameworkPath rangeOfString:@":"].location != NSNotFound ||
[pathToEnablerLib rangeOfString:@":"].location != NSNotFound)