Rolled back in r166972.

This time, we conditionally exclude linking against bmalloc in Production
builds. Production builds will not be able to link against bmalloc
until the Production build system has been updated to build bmalloc.

    WTF should link against bmalloc
    https://bugs.webkit.org/show_bug.cgi?id=131403

    Reviewed by Mark Rowe.

    * Configurations/WTF.xcconfig:
    * WTF.xcodeproj/project.pbxproj:

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

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 88dcda1..9b94f2e 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,5 +1,21 @@
 2014-04-09  Geoffrey Garen  <ggaren@apple.com>
 
+        Rolled back in r166972.
+
+        This time, we conditionally exclude linking against bmalloc in Production
+        builds. Production builds will not be able to link against bmalloc
+        until the Production build system has been updated to build bmalloc.
+
+            WTF should link against bmalloc
+            https://bugs.webkit.org/show_bug.cgi?id=131403
+
+            Reviewed by Mark Rowe.
+
+            * Configurations/WTF.xcconfig:
+            * WTF.xcodeproj/project.pbxproj:
+
+2014-04-09  Geoffrey Garen  <ggaren@apple.com>
+
         Put bmalloc headers in the right place
         https://bugs.webkit.org/show_bug.cgi?id=131464
 

diff --git a/Source/WTF/Configurations/WTF.xcconfig b/Source/WTF/Configurations/WTF.xcconfig
index 924f8d0..197b1b5 100644 (file)
--- a/Source/WTF/Configurations/WTF.xcconfig
+++ b/Source/WTF/Configurations/WTF.xcconfig
@@ -26,3 +26,6 @@ INSTALL_PATH_ACTUAL = /usr/local/lib;
 PRODUCT_NAME = WTF;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
+EXCLUDED_SOURCE_FILE_NAMES_Production = libbmalloc.a;

diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
index 6324806..e447f66 100644 (file)
--- a/Source/WTF/WTF.xcodeproj/project.pbxproj
+++ b/Source/WTF/WTF.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
                0FD81AC5154FB22E00983E72 /* FastBitVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD81AC4154FB22E00983E72 /* FastBitVector.h */; settings = {ATTRIBUTES = (); }; };
                0FDDBFA71666DFA300C55FEF /* StringPrintStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDDBFA51666DFA300C55FEF /* StringPrintStream.cpp */; };
                0FDDBFA81666DFA300C55FEF /* StringPrintStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDDBFA61666DFA300C55FEF /* StringPrintStream.h */; };
+               14022F4118F5C3FC007FF0EB /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14022F4018F5C3FC007FF0EB /* libbmalloc.a */; };
                143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 143F611D1565F0F900DB514A /* RAMSize.cpp */; };
                143F61201565F0F900DB514A /* RAMSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 143F611E1565F0F900DB514A /* RAMSize.h */; settings = {ATTRIBUTES = (); }; };
                1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419016EAAF6D0024E146 /* RunLoopTimer.h */; settings = {ATTRIBUTES = (); }; };
@@ -309,6 +310,7 @@
                0FDDBFA51666DFA300C55FEF /* StringPrintStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringPrintStream.cpp; sourceTree = "<group>"; };
                0FDDBFA61666DFA300C55FEF /* StringPrintStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringPrintStream.h; sourceTree = "<group>"; };
                0FEC3EE4171B834700FDAC8D /* ByteSpinLock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ByteSpinLock.h; sourceTree = "<group>"; };
+               14022F4018F5C3FC007FF0EB /* libbmalloc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbmalloc.a; path = libbmalloc.a; sourceTree = BUILT_PRODUCTS_DIR; };
                143F611D1565F0F900DB514A /* RAMSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RAMSize.cpp; sourceTree = "<group>"; };
                143F611E1565F0F900DB514A /* RAMSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAMSize.h; sourceTree = "<group>"; };
                1469419016EAAF6D0024E146 /* RunLoopTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoopTimer.h; sourceTree = "<group>"; };
@@ -561,12 +563,21 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               14022F4118F5C3FC007FF0EB /* libbmalloc.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+               14022F3F18F5C3E5007FF0EB /* Libraries */ = {
+                       isa = PBXGroup;
+                       children = (
+                               14022F4018F5C3FC007FF0EB /* libbmalloc.a */,
+                       );
+                       name = Libraries;
+                       sourceTree = "<group>";
+               };
                1FA47C87152502DA00568D1B /* ios */ = {
                        isa = PBXGroup;
                        children = (
@@ -588,6 +599,7 @@
                        isa = PBXGroup;
                        children = (
                                5D247B6D14689C4700E78B76 /* Configurations */,
+                               14022F3F18F5C3E5007FF0EB /* Libraries */,
                                5D247B6314689B8600E78B76 /* Products */,
                                5D247B7614689D7600E78B76 /* Source */,
                        );