WebKit.xcworkspace "All Source" scheme always copies OS X WebKitSystemInterface libraries

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

Reviewed by Alexey Proskuryakov.

Fixes an issue where building the "All Source" scheme in WebKit.xcworkspace would
always copy the OS X WebKitSystemInterface libraries regardless of the selected
base SDK. In particular, it would copy the OS X WebKitSystemInterface libraries
when building with SDK iphonesimulator. WebKit.xcworkspace should copy the SDK-
specific WebKitSystemInterface libraries.

* WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:

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

diff --git a/ChangeLog b/ChangeLog
index b021545..fa9c15e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2016-03-27  Daniel Bates  <dabates@apple.com>
+
+        WebKit.xcworkspace "All Source" scheme always copies OS X WebKitSystemInterface libraries
+        https://bugs.webkit.org/show_bug.cgi?id=155889
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fixes an issue where building the "All Source" scheme in WebKit.xcworkspace would
+        always copy the OS X WebKitSystemInterface libraries regardless of the selected
+        base SDK. In particular, it would copy the OS X WebKitSystemInterface libraries
+        when building with SDK iphonesimulator. WebKit.xcworkspace should copy the SDK-
+        specific WebKitSystemInterface libraries.
+
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
 2016-03-25  Brady Eidson  <beidson@apple.com>
 
         Soften push/replaceState frequency restrictions.

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
index 94c7fb7..e8325ce 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
@@ -9,7 +9,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot; --wksi">
+               scriptText = "&quot;$SRCROOT/../../Tools/Scripts/copy-webkitlibraries-to-product-directory&quot; --wksi --sdk &quot;$SDKROOT&quot;">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"