Added bmalloc to the WebKit workspace.

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

Reviewed by Geoff Garen.

* WebKit.xcworkspace/contents.xcworkspacedata:
* 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@166950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 7dd74771350a9a7c2c343d087d3d590efc9037a9..2e9c062e8ac6dbbeb13df53c49a373f6c2e6e992 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-04-08  Dan Bernstein  <mitz@apple.com>
+
+        Added bmalloc to the WebKit workspace.
+        https://bugs.webkit.org/show_bug.cgi?id=131362
+
+        Reviewed by Geoff Garen.
+
+        * WebKit.xcworkspace/contents.xcworkspacedata:
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme:
+        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+
 2014-04-08  Geoffrey Garen  <ggaren@apple.com>
 
         Build bmalloc on iOS too

diff --git a/WebKit.xcworkspace/contents.xcworkspacedata b/WebKit.xcworkspace/contents.xcworkspacedata
index 0910f212d454a4035d408cd5b880497a782eeff0..5353ec3afb7cf465d25d675730bb992476d84116 100644 (file)
--- a/WebKit.xcworkspace/contents.xcworkspacedata
+++ b/WebKit.xcworkspace/contents.xcworkspacedata
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "group:Source/bmalloc/bmalloc.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:Source/WTF/WTF.xcodeproj">
    </FileRef>

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
index ef75029eb573e494593d2f1c6d9019e8a7877a37..83ed414ff5b9b1adf0eef127dbf9f7b5c55f9ad1 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
@@ -23,6 +23,20 @@
          </ExecutionAction>
       </PreActions>
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "14F271BD18EA3963008C152F"
+               BuildableName = "libbmalloc.a"
+               BlueprintName = "bmalloc"
+               ReferencedContainer = "container:Source/bmalloc/bmalloc.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
index 5b60fab522894eb69c0508bbb33910a5e3dde041..d419c5612df9f25b62a6d2778289fd0062f2509f 100644 (file)
--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
@@ -23,6 +23,20 @@
          </ExecutionAction>
       </PreActions>
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "14F271BD18EA3963008C152F"
+               BuildableName = "libbmalloc.a"
+               BlueprintName = "bmalloc"
+               ReferencedContainer = "container:Source/bmalloc/bmalloc.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"