When Safari 6 is launched via the WebKit Xcode workspace, it does not link against...

https://bugs.webkit.org/show_bug.cgi?id=92331

Reviewed by Mark Rowe.

Changed references to the Safari executable to the SafariForWebKitDevelopment binary.

* WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@123834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 9acc8ca32f162e71d403158272aa444b0afe676e..fc2139ebb6a96d2b851cff1c86b29a7c1a5c9810 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-26  Dan Bernstein  <mitz@apple.com>
+
+        When Safari 6 is launched via the WebKit Xcode workspace, it does not link against the built frameworks
+        https://bugs.webkit.org/show_bug.cgi?id=92331
+
+        Reviewed by Mark Rowe.
+
+        Changed references to the Safari executable to the SafariForWebKitDevelopment binary.
+
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
 2012-07-26  Keishi Hattori  <keishi@webkit.org>
 
         Implement ColorSuggestionPicker page popup

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
index 6039bd50dee8028812c5be229187633061670c68..72d60effb9bbba0520e520ec3c1aa43f348c6997 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
@@ -154,7 +154,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "-client-executable /Applications/Safari.app/Contents/MacOS/Safari"
+            argument = "-client-executable /Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
index aa986097ad5460ae54c8e3dae6a85f0dc46347b8..fd2cca7ebda8ede8f0a66389925caf5c0e425fb4 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
@@ -127,7 +127,7 @@
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
       <PathRunnable
-         FilePath = "/Applications/Safari.app">
+         FilePath = "/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment">
       </PathRunnable>
       <AdditionalOptions>
       </AdditionalOptions>