Changeset 93451 in webkit
- Timestamp:
- Aug 19, 2011 4:24:51 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
Source/ThirdParty/ChangeLog (modified) (1 diff)
-
Source/ThirdParty/gtest/README.WebKit (modified) (1 diff)
-
Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h (modified) (1 diff)
-
Source/ThirdParty/gtest/msvc/gtest-md.vcproj (modified) (7 diffs)
-
Source/ThirdParty/gtest/xcode/Config/General.xcconfig (modified) (1 diff)
-
Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (modified) (28 diffs)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/ThirdParty/ChangeLog
r93426 r93451 1 2011-08-19 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r93426. 4 http://trac.webkit.org/changeset/93426 5 https://bugs.webkit.org/show_bug.cgi?id=66607 6 7 Broke the Mac build by not building gtest.framework anymore 8 (Requested by andersca on #webkit). 9 10 * gtest/README.WebKit: 11 * gtest/include/gtest/internal/gtest-port.h: 12 * gtest/msvc/gtest-md.vcproj: 13 * gtest/xcode/Config/General.xcconfig: 14 * gtest/xcode/gtest.xcodeproj/project.pbxproj: 15 1 16 2011-08-18 Dmitry Lomov <dslomov@google.com> 2 17 -
trunk/Source/ThirdParty/gtest/README.WebKit
r93426 r93451 3 3 http://googletest.googlecode.com/svn/tags/release-1.5.0/ 4 4 5 2011-08-19 Dmitry Lomov (dslomov@google.com)6 - WebKit port of gtest uses universal "new" and "delete" operators from JavaScriptCore.7 - removed all dynamic targets from gtest.xcodeproject (we only build static libgtest.a8 and statically-linked gtest unit-test runner).9 10 5 2011-05-06 Dmitry Lomov (dslomov@google.com) 11 6 gtest-md.vcproj upgraded to VS 2005 (8.0) format to match the rest of WebKit -
trunk/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
r93426 r93451 178 178 #endif // !_WIN32_WCE 179 179 180 #include <wtf/Platform.h>181 182 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)183 #define JS_EXPORTDATA __declspec(dllimport)184 #define WEBKIT_EXPORTDATA __declspec(dllimport)185 #define WTF_EXPORT_PRIVATE186 #define JS_EXPORT_PRIVATE187 #define JS_EXPORTCLASS JS_EXPORTDATA188 #else189 #define JS_EXPORTDATA190 #define JS_EXPORTCLASS191 #define WEBKIT_EXPORTDATA192 #define WTF_EXPORT_PRIVATE193 #define JS_EXPORT_PRIVATE194 #endif195 196 #include <wtf/FastMalloc.h>197 198 180 #include <iostream> // NOLINT 199 181 #include <sstream> // NOLINT -
trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
r93426 r93451 21 21 IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)" 22 22 ConfigurationType="4" 23 InheritedPropertySheets=" "$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops""23 InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops" 24 24 CharacterSet="2" 25 25 > … … 41 41 <Tool 42 42 Name="VCCLCompilerTool" 43 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""44 43 Optimization="0" 45 44 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" … … 105 104 <Tool 106 105 Name="VCCLCompilerTool" 107 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""108 106 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 109 107 RuntimeLibrary="2" … … 167 165 <Tool 168 166 Name="VCCLCompilerTool" 169 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""170 167 Optimization="0" 171 168 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" … … 232 229 <Tool 233 230 Name="VCCLCompilerTool" 234 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""235 231 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 236 232 RuntimeLibrary="2" … … 294 290 <Tool 295 291 Name="VCCLCompilerTool" 296 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""297 292 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 298 293 RuntimeLibrary="2" … … 356 351 <Tool 357 352 Name="VCCLCompilerTool" 358 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""359 353 Optimization="0" 360 354 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" -
trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
r93426 r93451 10 10 // Build for PPC and Intel, 32- and 64-bit 11 11 ARCHS = i386 x86_64 12 13 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders/ForwardingHeaders ../ ../include/14 12 15 13 // Zerolink prevents link warnings so turn it off -
trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
r93426 r93451 15 15 ); 16 16 dependencies = ( 17 40899F9D0FFA740F000B29AE /* PBXTargetDependency */, 17 18 40C849F7101A43440083642A /* PBXTargetDependency */, 19 4089A0980FFAD34A000B29AE /* PBXTargetDependency */, 20 40C849F9101A43490083642A /* PBXTargetDependency */, 18 21 ); 19 22 name = Check; … … 35 38 36 39 /* Begin PBXBuildFile section */ 40 224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */ = {isa = PBXBuildFile; fileRef = 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */; settings = {ATTRIBUTES = (Public, ); }; }; 41 3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */; }; 42 3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */; settings = {ATTRIBUTES = (Public, ); }; }; 43 404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DB0E2F799B00CF7658 /* gtest-death-test.h */; settings = {ATTRIBUTES = (Public, ); }; }; 44 404884390E2F799B00CF7658 /* gtest-message.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DC0E2F799B00CF7658 /* gtest-message.h */; settings = {ATTRIBUTES = (Public, ); }; }; 45 4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DD0E2F799B00CF7658 /* gtest-spi.h */; settings = {ATTRIBUTES = (Public, ); }; }; 46 4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47 4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; }; 48 4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; }; 49 404884500E2F799B00CF7658 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README */; }; 50 404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; }; 51 404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; }; 52 404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; }; 53 404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E50E2F799B00CF7658 /* gtest-port.h */; }; 54 404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E60E2F799B00CF7658 /* gtest-string.h */; }; 55 404884AC0E2F7CD900CF7658 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 404884A90E2F7CD900CF7658 /* CHANGES */; }; 56 404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */ = {isa = PBXBuildFile; fileRef = 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */; }; 57 404884AE0E2F7CD900CF7658 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* COPYING */; }; 58 40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; }; 59 40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 40899F4D0FFA7271000B29AE /* gtest-tuple.h */; }; 60 40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; }; 61 4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; }; 62 4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; }; 37 63 40C848FF101A21150083642A /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; }; 38 64 40C84915101A21DF0083642A /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4048840D0E2F799B00CF7658 /* gtest_main.cc */; }; 65 40C84916101A235B0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; 66 40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; 67 40C84978101A36540083642A /* libgtest_main.a in Resources */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; 39 68 40C84980101A36850083642A /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; }; 40 69 40C84982101A36850083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; }; 41 70 40C84983101A36850083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; 42 F38599A313FEE001001BD872 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F385987A13FEDE8F001BD872 /* JavaScriptCore.framework */; }; 71 40C8498F101A36A60083642A /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; }; 72 40C84990101A36A60083642A /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; }; 73 40C84992101A36A60083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; }; 74 40C84993101A36A60083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; 75 40C849A2101A37050083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; }; 76 40C849A4101A37150083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; }; 77 4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 4539C9330EC280AE00A70F4C /* gtest-param-test.h */; settings = {ATTRIBUTES = (Public, ); }; }; 78 4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */; }; 79 4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; }; 80 4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9370EC280E200A70F4C /* gtest-param-util.h */; }; 43 81 /* End PBXBuildFile section */ 44 82 45 83 /* Begin PBXContainerItemProxy section */ 46 40C8497C101A36850083642A /* PBXContainerItemProxy */ = { 84 40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */ = { 85 isa = PBXContainerItemProxy; 86 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 87 proxyType = 1; 88 remoteGlobalIDString = 40899F420FFA7184000B29AE; 89 remoteInfo = gtest_unittest; 90 }; 91 4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */ = { 92 isa = PBXContainerItemProxy; 93 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 94 proxyType = 1; 95 remoteGlobalIDString = 4089A0120FFACEFC000B29AE; 96 remoteInfo = sample1_unittest; 97 }; 98 408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */ = { 47 99 isa = PBXContainerItemProxy; 48 100 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; … … 51 103 remoteInfo = "gtest-static"; 52 104 }; 105 40C44AE50E379922008FCC51 /* PBXContainerItemProxy */ = { 106 isa = PBXContainerItemProxy; 107 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 108 proxyType = 1; 109 remoteGlobalIDString = 40C44ADC0E3798F4008FCC51; 110 remoteInfo = Version.h; 111 }; 112 40C8497C101A36850083642A /* PBXContainerItemProxy */ = { 113 isa = PBXContainerItemProxy; 114 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 115 proxyType = 1; 116 remoteGlobalIDString = 40C848F9101A209C0083642A; 117 remoteInfo = "gtest-static"; 118 }; 53 119 40C8497E101A36850083642A /* PBXContainerItemProxy */ = { 54 120 isa = PBXContainerItemProxy; … … 58 124 remoteInfo = "gtest_main-static"; 59 125 }; 126 40C8498B101A36A60083642A /* PBXContainerItemProxy */ = { 127 isa = PBXContainerItemProxy; 128 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 129 proxyType = 1; 130 remoteGlobalIDString = 40C848F9101A209C0083642A; 131 remoteInfo = "gtest-static"; 132 }; 133 40C8498D101A36A60083642A /* PBXContainerItemProxy */ = { 134 isa = PBXContainerItemProxy; 135 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 136 proxyType = 1; 137 remoteGlobalIDString = 40C8490A101A217E0083642A; 138 remoteInfo = "gtest_main-static"; 139 }; 140 40C8499B101A36DC0083642A /* PBXContainerItemProxy */ = { 141 isa = PBXContainerItemProxy; 142 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 143 proxyType = 1; 144 remoteGlobalIDString = 40C8490A101A217E0083642A; 145 remoteInfo = "gtest_main-static"; 146 }; 147 40C8499D101A36E50083642A /* PBXContainerItemProxy */ = { 148 isa = PBXContainerItemProxy; 149 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 150 proxyType = 1; 151 remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; 152 remoteInfo = "gtest-framework"; 153 }; 154 40C8499F101A36F10083642A /* PBXContainerItemProxy */ = { 155 isa = PBXContainerItemProxy; 156 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 157 proxyType = 1; 158 remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; 159 remoteInfo = "gtest-framework"; 160 }; 60 161 40C849F6101A43440083642A /* PBXContainerItemProxy */ = { 61 162 isa = PBXContainerItemProxy; … … 65 166 remoteInfo = "gtest_unittest-static"; 66 167 }; 168 40C849F8101A43490083642A /* PBXContainerItemProxy */ = { 169 isa = PBXContainerItemProxy; 170 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 171 proxyType = 1; 172 remoteGlobalIDString = 40C84989101A36A60083642A; 173 remoteInfo = "sample1_unittest-static"; 174 }; 67 175 /* End PBXContainerItemProxy section */ 176 177 /* Begin PBXCopyFilesBuildPhase section */ 178 404884A50E2F7C0400CF7658 /* Copy Headers Internal */ = { 179 isa = PBXCopyFilesBuildPhase; 180 buildActionMask = 2147483647; 181 dstPath = Headers/internal; 182 dstSubfolderSpec = 6; 183 files = ( 184 404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */, 185 404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */, 186 404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */, 187 4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */, 188 4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */, 189 4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */, 190 404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */, 191 404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */, 192 40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */, 193 3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */, 194 ); 195 name = "Copy Headers Internal"; 196 runOnlyForDeploymentPostprocessing = 0; 197 }; 198 /* End PBXCopyFilesBuildPhase section */ 68 199 69 200 /* Begin PBXFileReference section */ … … 91 222 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; }; 92 223 404884AB0E2F7CD900CF7658 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; }; 224 40899F430FFA7184000B29AE /* gtest_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gtest_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 93 225 40899F4D0FFA7271000B29AE /* gtest-tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-tuple.h"; sourceTree = "<group>"; }; 94 226 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryTarget.xcconfig; sourceTree = "<group>"; }; 227 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 95 228 4089A02C0FFACF7F000B29AE /* sample1.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1.cc; sourceTree = "<group>"; }; 96 229 4089A02D0FFACF7F000B29AE /* sample1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample1.h; sourceTree = "<group>"; }; … … 99 232 40C8490B101A217E0083642A /* libgtest_main.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest_main.a; sourceTree = BUILT_PRODUCTS_DIR; }; 100 233 40C84987101A36850083642A /* gtest_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gtest_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; 234 40C84997101A36A60083642A /* sample1_unittest-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-static"; sourceTree = BUILT_PRODUCTS_DIR; }; 101 235 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugProject.xcconfig; sourceTree = "<group>"; }; 102 236 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FrameworkTarget.xcconfig; sourceTree = "<group>"; }; … … 104 238 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseProject.xcconfig; sourceTree = "<group>"; }; 105 239 40D4CF510E30F5E200294801 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 240 4539C8FF0EC27F6400A70F4C /* gtest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = gtest.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 106 241 4539C9330EC280AE00A70F4C /* gtest-param-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-test.h"; sourceTree = "<group>"; }; 107 242 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-linked_ptr.h"; sourceTree = "<group>"; }; 108 243 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util-generated.h"; sourceTree = "<group>"; }; 109 244 4539C9370EC280E200A70F4C /* gtest-param-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util.h"; sourceTree = "<group>"; }; 110 F385987A13FEDE8F001BD872 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };111 245 /* End PBXFileReference section */ 112 246 113 247 /* Begin PBXFrameworksBuildPhase section */ 248 40899F410FFA7184000B29AE /* Frameworks */ = { 249 isa = PBXFrameworksBuildPhase; 250 buildActionMask = 2147483647; 251 files = ( 252 40C849A4101A37150083642A /* gtest.framework in Frameworks */, 253 40C84916101A235B0083642A /* libgtest_main.a in Frameworks */, 254 ); 255 runOnlyForDeploymentPostprocessing = 0; 256 }; 257 4089A0110FFACEFC000B29AE /* Frameworks */ = { 258 isa = PBXFrameworksBuildPhase; 259 buildActionMask = 2147483647; 260 files = ( 261 40C849A2101A37050083642A /* gtest.framework in Frameworks */, 262 40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */, 263 ); 264 runOnlyForDeploymentPostprocessing = 0; 265 }; 114 266 40C84981101A36850083642A /* Frameworks */ = { 115 267 isa = PBXFrameworksBuildPhase; 116 268 buildActionMask = 2147483647; 117 269 files = ( 118 F38599A313FEE001001BD872 /* JavaScriptCore.framework in Frameworks */,119 270 40C84982101A36850083642A /* libgtest.a in Frameworks */, 120 271 40C84983101A36850083642A /* libgtest_main.a in Frameworks */, … … 122 273 runOnlyForDeploymentPostprocessing = 0; 123 274 }; 275 40C84991101A36A60083642A /* Frameworks */ = { 276 isa = PBXFrameworksBuildPhase; 277 buildActionMask = 2147483647; 278 files = ( 279 40C84992101A36A60083642A /* libgtest.a in Frameworks */, 280 40C84993101A36A60083642A /* libgtest_main.a in Frameworks */, 281 ); 282 runOnlyForDeploymentPostprocessing = 0; 283 }; 124 284 /* End PBXFrameworksBuildPhase section */ 125 285 … … 128 288 isa = PBXGroup; 129 289 children = ( 290 4539C8FF0EC27F6400A70F4C /* gtest.framework */, 130 291 40C848FA101A209C0083642A /* libgtest.a */, 131 292 40C8490B101A217E0083642A /* libgtest_main.a */, 293 40899F430FFA7184000B29AE /* gtest_unittest-framework */, 132 294 40C84987101A36850083642A /* gtest_unittest */, 295 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */, 296 40C84997101A36A60083642A /* sample1_unittest-static */, 133 297 ); 134 298 name = Products; … … 143 307 403EE37B0E377822004BD1E2 /* Scripts */, 144 308 034768DDFF38A45A11DB9C8B /* Products */, 145 F385987A13FEDE8F001BD872 /* JavaScriptCore.framework */,146 309 ); 147 310 name = gtest; … … 267 430 /* End PBXGroup section */ 268 431 432 /* Begin PBXHeadersBuildPhase section */ 433 8D07F2BD0486CC7A007CD1D0 /* Headers */ = { 434 isa = PBXHeadersBuildPhase; 435 buildActionMask = 2147483647; 436 files = ( 437 404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */, 438 404884390E2F799B00CF7658 /* gtest-message.h in Headers */, 439 4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */, 440 3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */, 441 4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */, 442 4048843B0E2F799B00CF7658 /* gtest.h in Headers */, 443 4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */, 444 4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */, 445 224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */, 446 ); 447 runOnlyForDeploymentPostprocessing = 0; 448 }; 449 /* End PBXHeadersBuildPhase section */ 450 269 451 /* Begin PBXNativeTarget section */ 452 40899F420FFA7184000B29AE /* gtest_unittest-framework */ = { 453 isa = PBXNativeTarget; 454 buildConfigurationList = 40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */; 455 buildPhases = ( 456 40899F400FFA7184000B29AE /* Sources */, 457 40899F410FFA7184000B29AE /* Frameworks */, 458 ); 459 buildRules = ( 460 ); 461 dependencies = ( 462 40C849A0101A36F10083642A /* PBXTargetDependency */, 463 ); 464 name = "gtest_unittest-framework"; 465 productName = gtest_unittest; 466 productReference = 40899F430FFA7184000B29AE /* gtest_unittest-framework */; 467 productType = "com.apple.product-type.tool"; 468 }; 469 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */ = { 470 isa = PBXNativeTarget; 471 buildConfigurationList = 4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */; 472 buildPhases = ( 473 4089A0100FFACEFC000B29AE /* Sources */, 474 4089A0110FFACEFC000B29AE /* Frameworks */, 475 ); 476 buildRules = ( 477 ); 478 dependencies = ( 479 40C8499E101A36E50083642A /* PBXTargetDependency */, 480 ); 481 name = "sample1_unittest-framework"; 482 productName = sample1_unittest; 483 productReference = 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */; 484 productType = "com.apple.product-type.tool"; 485 }; 270 486 40C848F9101A209C0083642A /* gtest-static */ = { 271 487 isa = PBXNativeTarget; … … 316 532 productType = "com.apple.product-type.tool"; 317 533 }; 534 40C84989101A36A60083642A /* sample1_unittest-static */ = { 535 isa = PBXNativeTarget; 536 buildConfigurationList = 40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */; 537 buildPhases = ( 538 40C8498E101A36A60083642A /* Sources */, 539 40C84991101A36A60083642A /* Frameworks */, 540 ); 541 buildRules = ( 542 ); 543 dependencies = ( 544 40C8498A101A36A60083642A /* PBXTargetDependency */, 545 40C8498C101A36A60083642A /* PBXTargetDependency */, 546 ); 547 name = "sample1_unittest-static"; 548 productName = sample1_unittest; 549 productReference = 40C84997101A36A60083642A /* sample1_unittest-static */; 550 productType = "com.apple.product-type.tool"; 551 }; 552 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */ = { 553 isa = PBXNativeTarget; 554 buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */; 555 buildPhases = ( 556 8D07F2C10486CC7A007CD1D0 /* Sources */, 557 8D07F2BD0486CC7A007CD1D0 /* Headers */, 558 404884A50E2F7C0400CF7658 /* Copy Headers Internal */, 559 8D07F2BF0486CC7A007CD1D0 /* Resources */, 560 ); 561 buildRules = ( 562 ); 563 dependencies = ( 564 40C44AE60E379922008FCC51 /* PBXTargetDependency */, 565 408BEC101046CFE900DEF522 /* PBXTargetDependency */, 566 40C8499C101A36DC0083642A /* PBXTargetDependency */, 567 ); 568 name = "gtest-framework"; 569 productInstallPath = "$(HOME)/Library/Frameworks"; 570 productName = gtest; 571 productReference = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; 572 productType = "com.apple.product-type.framework"; 573 }; 318 574 /* End PBXNativeTarget section */ 319 575 … … 323 579 buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */; 324 580 compatibilityVersion = "Xcode 2.4"; 325 developmentRegion = English;326 581 hasScannedForEncodings = 1; 327 582 knownRegions = ( … … 337 592 projectRoot = ""; 338 593 targets = ( 594 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */, 339 595 40C848F9101A209C0083642A /* gtest-static */, 340 596 40C8490A101A217E0083642A /* gtest_main-static */, 597 40899F420FFA7184000B29AE /* gtest_unittest-framework */, 341 598 40C8497A101A36850083642A /* gtest_unittest-static */, 599 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */, 600 40C84989101A36A60083642A /* sample1_unittest-static */, 342 601 3B238F5F0E828B5400846E11 /* Check */, 343 602 40C44ADC0E3798F4008FCC51 /* Version Info */, … … 345 604 }; 346 605 /* End PBXProject section */ 606 607 /* Begin PBXResourcesBuildPhase section */ 608 8D07F2BF0486CC7A007CD1D0 /* Resources */ = { 609 isa = PBXResourcesBuildPhase; 610 buildActionMask = 2147483647; 611 files = ( 612 404884500E2F799B00CF7658 /* README in Resources */, 613 404884AC0E2F7CD900CF7658 /* CHANGES in Resources */, 614 404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */, 615 404884AE0E2F7CD900CF7658 /* COPYING in Resources */, 616 40C84978101A36540083642A /* libgtest_main.a in Resources */, 617 ); 618 runOnlyForDeploymentPostprocessing = 0; 619 }; 620 /* End PBXResourcesBuildPhase section */ 347 621 348 622 /* Begin PBXShellScriptBuildPhase section */ … … 380 654 381 655 /* Begin PBXSourcesBuildPhase section */ 656 40899F400FFA7184000B29AE /* Sources */ = { 657 isa = PBXSourcesBuildPhase; 658 buildActionMask = 2147483647; 659 files = ( 660 40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */, 661 ); 662 runOnlyForDeploymentPostprocessing = 0; 663 }; 664 4089A0100FFACEFC000B29AE /* Sources */ = { 665 isa = PBXSourcesBuildPhase; 666 buildActionMask = 2147483647; 667 files = ( 668 4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */, 669 4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */, 670 ); 671 runOnlyForDeploymentPostprocessing = 0; 672 }; 382 673 40C848F7101A209C0083642A /* Sources */ = { 383 674 isa = PBXSourcesBuildPhase; … … 404 695 runOnlyForDeploymentPostprocessing = 0; 405 696 }; 697 40C8498E101A36A60083642A /* Sources */ = { 698 isa = PBXSourcesBuildPhase; 699 buildActionMask = 2147483647; 700 files = ( 701 40C8498F101A36A60083642A /* sample1.cc in Sources */, 702 40C84990101A36A60083642A /* sample1_unittest.cc in Sources */, 703 ); 704 runOnlyForDeploymentPostprocessing = 0; 705 }; 706 8D07F2C10486CC7A007CD1D0 /* Sources */ = { 707 isa = PBXSourcesBuildPhase; 708 buildActionMask = 2147483647; 709 files = ( 710 40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */, 711 ); 712 runOnlyForDeploymentPostprocessing = 0; 713 }; 406 714 /* End PBXSourcesBuildPhase section */ 407 715 408 716 /* Begin PBXTargetDependency section */ 717 40899F9D0FFA740F000B29AE /* PBXTargetDependency */ = { 718 isa = PBXTargetDependency; 719 target = 40899F420FFA7184000B29AE /* gtest_unittest-framework */; 720 targetProxy = 40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */; 721 }; 722 4089A0980FFAD34A000B29AE /* PBXTargetDependency */ = { 723 isa = PBXTargetDependency; 724 target = 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */; 725 targetProxy = 4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */; 726 }; 727 408BEC101046CFE900DEF522 /* PBXTargetDependency */ = { 728 isa = PBXTargetDependency; 729 target = 40C848F9101A209C0083642A /* gtest-static */; 730 targetProxy = 408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */; 731 }; 732 40C44AE60E379922008FCC51 /* PBXTargetDependency */ = { 733 isa = PBXTargetDependency; 734 target = 40C44ADC0E3798F4008FCC51 /* Version Info */; 735 targetProxy = 40C44AE50E379922008FCC51 /* PBXContainerItemProxy */; 736 }; 409 737 40C8497B101A36850083642A /* PBXTargetDependency */ = { 410 738 isa = PBXTargetDependency; … … 417 745 targetProxy = 40C8497E101A36850083642A /* PBXContainerItemProxy */; 418 746 }; 747 40C8498A101A36A60083642A /* PBXTargetDependency */ = { 748 isa = PBXTargetDependency; 749 target = 40C848F9101A209C0083642A /* gtest-static */; 750 targetProxy = 40C8498B101A36A60083642A /* PBXContainerItemProxy */; 751 }; 752 40C8498C101A36A60083642A /* PBXTargetDependency */ = { 753 isa = PBXTargetDependency; 754 target = 40C8490A101A217E0083642A /* gtest_main-static */; 755 targetProxy = 40C8498D101A36A60083642A /* PBXContainerItemProxy */; 756 }; 757 40C8499C101A36DC0083642A /* PBXTargetDependency */ = { 758 isa = PBXTargetDependency; 759 target = 40C8490A101A217E0083642A /* gtest_main-static */; 760 targetProxy = 40C8499B101A36DC0083642A /* PBXContainerItemProxy */; 761 }; 762 40C8499E101A36E50083642A /* PBXTargetDependency */ = { 763 isa = PBXTargetDependency; 764 target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */; 765 targetProxy = 40C8499D101A36E50083642A /* PBXContainerItemProxy */; 766 }; 767 40C849A0101A36F10083642A /* PBXTargetDependency */ = { 768 isa = PBXTargetDependency; 769 target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */; 770 targetProxy = 40C8499F101A36F10083642A /* PBXContainerItemProxy */; 771 }; 419 772 40C849F7101A43440083642A /* PBXTargetDependency */ = { 420 773 isa = PBXTargetDependency; 421 774 target = 40C8497A101A36850083642A /* gtest_unittest-static */; 422 775 targetProxy = 40C849F6101A43440083642A /* PBXContainerItemProxy */; 776 }; 777 40C849F9101A43490083642A /* PBXTargetDependency */ = { 778 isa = PBXTargetDependency; 779 target = 40C84989101A36A60083642A /* sample1_unittest-static */; 780 targetProxy = 40C849F8101A43490083642A /* PBXContainerItemProxy */; 423 781 }; 424 782 /* End PBXTargetDependency section */ … … 446 804 name = Release; 447 805 }; 806 40899F450FFA7185000B29AE /* Debug */ = { 807 isa = XCBuildConfiguration; 808 buildSettings = { 809 HEADER_SEARCH_PATHS = ../; 810 PRODUCT_NAME = "gtest_unittest-framework"; 811 }; 812 name = Debug; 813 }; 814 40899F460FFA7185000B29AE /* Release */ = { 815 isa = XCBuildConfiguration; 816 buildSettings = { 817 HEADER_SEARCH_PATHS = ../; 818 PRODUCT_NAME = "gtest_unittest-framework"; 819 }; 820 name = Release; 821 }; 822 4089A0150FFACEFD000B29AE /* Debug */ = { 823 isa = XCBuildConfiguration; 824 buildSettings = { 825 PRODUCT_NAME = "sample1_unittest-framework"; 826 }; 827 name = Debug; 828 }; 829 4089A0160FFACEFD000B29AE /* Release */ = { 830 isa = XCBuildConfiguration; 831 buildSettings = { 832 PRODUCT_NAME = "sample1_unittest-framework"; 833 }; 834 name = Release; 835 }; 448 836 40C44ADF0E3798F4008FCC51 /* Debug */ = { 449 837 isa = XCBuildConfiguration; … … 468 856 GCC_INLINES_ARE_PRIVATE_EXTERN = YES; 469 857 GCC_SYMBOLS_PRIVATE_EXTERN = YES; 858 HEADER_SEARCH_PATHS = ( 859 ../, 860 ../include/, 861 ); 470 862 PRODUCT_NAME = gtest; 471 863 }; … … 478 870 GCC_INLINES_ARE_PRIVATE_EXTERN = YES; 479 871 GCC_SYMBOLS_PRIVATE_EXTERN = YES; 872 HEADER_SEARCH_PATHS = ( 873 ../, 874 ../include/, 875 ); 480 876 PRODUCT_NAME = gtest; 481 877 }; … … 486 882 baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */; 487 883 buildSettings = { 884 HEADER_SEARCH_PATHS = ( 885 ../, 886 ../include/, 887 ); 488 888 PRODUCT_NAME = gtest_main; 489 889 }; … … 494 894 baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */; 495 895 buildSettings = { 896 HEADER_SEARCH_PATHS = ( 897 ../, 898 ../include/, 899 ); 496 900 PRODUCT_NAME = gtest_main; 497 901 }; … … 501 905 isa = XCBuildConfiguration; 502 906 buildSettings = { 503 ARCHS = "$(NATIVE_ARCH_ACTUAL)";907 HEADER_SEARCH_PATHS = ../; 504 908 PRODUCT_NAME = gtest_unittest; 505 909 }; … … 509 913 isa = XCBuildConfiguration; 510 914 buildSettings = { 511 ARCHS = "$(NATIVE_ARCH_ACTUAL)";915 HEADER_SEARCH_PATHS = ../; 512 916 PRODUCT_NAME = gtest_unittest; 917 }; 918 name = Release; 919 }; 920 40C84995101A36A60083642A /* Debug */ = { 921 isa = XCBuildConfiguration; 922 buildSettings = { 923 PRODUCT_NAME = "sample1_unittest-static"; 924 }; 925 name = Debug; 926 }; 927 40C84996101A36A60083642A /* Release */ = { 928 isa = XCBuildConfiguration; 929 buildSettings = { 930 PRODUCT_NAME = "sample1_unittest-static"; 931 }; 932 name = Release; 933 }; 934 4FADC24308B4156D00ABE55E /* Debug */ = { 935 isa = XCBuildConfiguration; 936 baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */; 937 buildSettings = { 938 DYLIB_COMPATIBILITY_VERSION = 1; 939 DYLIB_CURRENT_VERSION = 1; 940 HEADER_SEARCH_PATHS = ( 941 ../, 942 ../include/, 943 ); 944 INFOPLIST_FILE = Resources/Info.plist; 945 INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h"; 946 INFOPLIST_PREPROCESS = YES; 947 PRODUCT_NAME = gtest; 948 VERSIONING_SYSTEM = "apple-generic"; 949 }; 950 name = Debug; 951 }; 952 4FADC24408B4156D00ABE55E /* Release */ = { 953 isa = XCBuildConfiguration; 954 baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */; 955 buildSettings = { 956 DYLIB_COMPATIBILITY_VERSION = 1; 957 DYLIB_CURRENT_VERSION = 1; 958 HEADER_SEARCH_PATHS = ( 959 ../, 960 ../include/, 961 ); 962 INFOPLIST_FILE = Resources/Info.plist; 963 INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h"; 964 INFOPLIST_PREPROCESS = YES; 965 PRODUCT_NAME = gtest; 966 VERSIONING_SYSTEM = "apple-generic"; 513 967 }; 514 968 name = Release; … … 540 994 defaultConfigurationName = Release; 541 995 }; 996 40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */ = { 997 isa = XCConfigurationList; 998 buildConfigurations = ( 999 40899F450FFA7185000B29AE /* Debug */, 1000 40899F460FFA7185000B29AE /* Release */, 1001 ); 1002 defaultConfigurationIsVisible = 0; 1003 defaultConfigurationName = Release; 1004 }; 1005 4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */ = { 1006 isa = XCConfigurationList; 1007 buildConfigurations = ( 1008 4089A0150FFACEFD000B29AE /* Debug */, 1009 4089A0160FFACEFD000B29AE /* Release */, 1010 ); 1011 defaultConfigurationIsVisible = 0; 1012 defaultConfigurationName = Release; 1013 }; 542 1014 40C44AE40E379905008FCC51 /* Build configuration list for PBXAggregateTarget "Version Info" */ = { 543 1015 isa = XCConfigurationList; … … 576 1048 defaultConfigurationName = Release; 577 1049 }; 1050 40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */ = { 1051 isa = XCConfigurationList; 1052 buildConfigurations = ( 1053 40C84995101A36A60083642A /* Debug */, 1054 40C84996101A36A60083642A /* Release */, 1055 ); 1056 defaultConfigurationIsVisible = 0; 1057 defaultConfigurationName = Release; 1058 }; 1059 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */ = { 1060 isa = XCConfigurationList; 1061 buildConfigurations = ( 1062 4FADC24308B4156D00ABE55E /* Debug */, 1063 4FADC24408B4156D00ABE55E /* Release */, 1064 ); 1065 defaultConfigurationIsVisible = 0; 1066 defaultConfigurationName = Release; 1067 }; 578 1068 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */ = { 579 1069 isa = XCConfigurationList; -
trunk/Tools/ChangeLog
r93444 r93451 1 2011-08-19 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r93426. 4 http://trac.webkit.org/changeset/93426 5 https://bugs.webkit.org/show_bug.cgi?id=66607 6 7 Broke the Mac build by not building gtest.framework anymore 8 (Requested by andersca on #webkit). 9 10 * TestWebKitAPI/Tests/WTF/StringOperators.cpp: 11 1 12 2011-08-19 James Robinson <jamesr@chromium.org> 2 13 -
trunk/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp
r93426 r93451 24 24 */ 25 25 26 #define JS_EXPORTDATA 26 27 #define WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING() (++wtfStringCopyCount) 27 28
Note: See TracChangeset
for help on using the changeset viewer.
