Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/WebKit/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj ('k') | third_party/WebKit/JavaScriptCore/JavaScriptCoreSources.bkl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // !$*UTF8*$! 1 // !$*UTF8*$!
2 { 2 {
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 objectVersion = 42; 6 objectVersion = 42;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXAggregateTarget section */ 9 /* Begin PBXAggregateTarget section */
10 65FB3F6609D11E9100F49DEB /* Derived Sources */ = { 10 65FB3F6609D11E9100F49DEB /* Derived Sources */ = {
(...skipping 22 matching lines...) Expand all
33 }; 33 };
34 /* End PBXAggregateTarget section */ 34 /* End PBXAggregateTarget section */
35 35
36 /* Begin PBXBuildFile section */ 36 /* Begin PBXBuildFile section */
37 06D358B30DAADAA4003B174E /* MainThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06D358A20DAAD9C4003B174E /* MainThread.cpp */; }; 37 06D358B30DAADAA4003B174E /* MainThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06D358A20DAAD9C4003B174E /* MainThread.cpp */; };
38 06D358B40DAADAAA003B174E /* MainThreadMac.mm in Sources */ = {is a = PBXBuildFile; fileRef = 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */; }; 38 06D358B40DAADAAA003B174E /* MainThreadMac.mm in Sources */ = {is a = PBXBuildFile; fileRef = 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */; };
39 088FA5BB0EF76D4300578E6F /* RandomNumber.cpp in Sources */ = {is a = PBXBuildFile; fileRef = 088FA5B90EF76D4300578E6F /* RandomNumber.cpp */; }; 39 088FA5BB0EF76D4300578E6F /* RandomNumber.cpp in Sources */ = {is a = PBXBuildFile; fileRef = 088FA5B90EF76D4300578E6F /* RandomNumber.cpp */; };
40 088FA5BC0EF76D4300578E6F /* RandomNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 088FA5BA0EF76D4300578E6F /* RandomNumber.h */; setting s = {ATTRIBUTES = (Private, ); }; }; 40 088FA5BC0EF76D4300578E6F /* RandomNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 088FA5BA0EF76D4300578E6F /* RandomNumber.h */; setting s = {ATTRIBUTES = (Private, ); }; };
41 08E279E90EF83B10007DB523 /* RandomNumberSeed.h in Headers */ = { isa = PBXBuildFile; fileRef = 08E279E80EF83B10007DB523 /* RandomNumberSeed.h */; }; 41 08E279E90EF83B10007DB523 /* RandomNumberSeed.h in Headers */ = { isa = PBXBuildFile; fileRef = 08E279E80EF83B10007DB523 /* RandomNumberSeed.h */; };
42 0B1F921D0F1753500036468E /* PtrAndFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B1F921B0F17502D0036468E /* PtrAndFlags.h */; settings = {ATTRIBUTES = (Private, ); }; }; 42 0B1F921D0F1753500036468E /* PtrAndFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B1F921B0F17502D0036468E /* PtrAndFlags.h */; settings = {ATTRIBUTES = (Private, ); }; };
43 0B330C270F38C62300692DE3 /* TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B330C260F38C62300692DE3 /* TypeTraits.cpp */; };
44 0B4D7E630F319AC800AD7E58 /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */; settings = {ATTRIBUTES = (Private, ); }; }; 43 0B4D7E630F319AC800AD7E58 /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
45 140B7D1D0DC69AF7009C42B8 /* JSActivation.cpp in Sources */ = {is a = PBXBuildFile; fileRef = 14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */; }; 44 140B7D1D0DC69AF7009C42B8 /* JSActivation.cpp in Sources */ = {is a = PBXBuildFile; fileRef = 14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */; };
46 140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */; setti ngs = {ATTRIBUTES = (Private, ); }; }; 45 140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */; setti ngs = {ATTRIBUTES = (Private, ); }; };
47 141211310A48794D00480255 /* JavaScriptCore.framework in Framewor ks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCor e.framework */; }; 46 141211310A48794D00480255 /* JavaScriptCore.framework in Framewor ks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCor e.framework */; };
48 141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBX BuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; }; 47 141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBX BuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; };
49 1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PB XBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; }; 48 1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PB XBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; };
50 1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1429D77B0ED20D7300B89619 /* Interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; }; 49 1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1429D77B0ED20D7300B89619 /* Interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
51 1429D7D40ED2128200B89619 /* Interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D7D30ED2128200B89619 /* Interpreter.cpp */; setti ngs = {COMPILER_FLAGS = "-fno-var-tracking"; }; }; 50 1429D7D40ED2128200B89619 /* Interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D7D30ED2128200B89619 /* Interpreter.cpp */; setti ngs = {COMPILER_FLAGS = "-fno-var-tracking"; }; };
52 1429D8780ED21ACD00B89619 /* ExceptionHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D8770ED21ACD00B89619 /* ExceptionHelpers.cpp */; }; 51 1429D8780ED21ACD00B89619 /* ExceptionHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D8770ED21ACD00B89619 /* ExceptionHelpers.cpp */; };
53 1429D8850ED21C3D00B89619 /* SamplingTool.cpp in Sources */ = {is a = PBXBuildFile; fileRef = 1429D8830ED21C3D00B89619 /* SamplingTool.cpp */; }; 52 1429D8850ED21C3D00B89619 /* SamplingTool.cpp in Sources */ = {is a = PBXBuildFile; fileRef = 1429D8830ED21C3D00B89619 /* SamplingTool.cpp */; };
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 /* End PBXCopyFilesBuildPhase section */ 423 /* End PBXCopyFilesBuildPhase section */
425 424
426 /* Begin PBXFileReference section */ 425 /* Begin PBXFileReference section */
427 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */ = {isa = PBXFile Reference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = M ainThreadMac.mm; sourceTree = "<group>"; }; 426 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */ = {isa = PBXFile Reference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = M ainThreadMac.mm; sourceTree = "<group>"; };
428 06D358A20DAAD9C4003B174E /* MainThread.cpp */ = {isa = PBXFileRe ference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainTh read.cpp; sourceTree = "<group>"; }; 427 06D358A20DAAD9C4003B174E /* MainThread.cpp */ = {isa = PBXFileRe ference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainTh read.cpp; sourceTree = "<group>"; };
429 06D358A30DAAD9C4003B174E /* MainThread.h */ = {isa = PBXFileRefe rence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainThread.h ; sourceTree = "<group>"; }; 428 06D358A30DAAD9C4003B174E /* MainThread.h */ = {isa = PBXFileRefe rence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainThread.h ; sourceTree = "<group>"; };
430 088FA5B90EF76D4300578E6F /* RandomNumber.cpp */ = {isa = PBXFile Reference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rand omNumber.cpp; sourceTree = "<group>"; }; 429 088FA5B90EF76D4300578E6F /* RandomNumber.cpp */ = {isa = PBXFile Reference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rand omNumber.cpp; sourceTree = "<group>"; };
431 088FA5BA0EF76D4300578E6F /* RandomNumber.h */ = {isa = PBXFileRe ference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomNumb er.h; sourceTree = "<group>"; }; 430 088FA5BA0EF76D4300578E6F /* RandomNumber.h */ = {isa = PBXFileRe ference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomNumb er.h; sourceTree = "<group>"; };
432 08E279E80EF83B10007DB523 /* RandomNumberSeed.h */ = {isa = PBXFi leReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Random NumberSeed.h; sourceTree = "<group>"; }; 431 08E279E80EF83B10007DB523 /* RandomNumberSeed.h */ = {isa = PBXFi leReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Random NumberSeed.h; sourceTree = "<group>"; };
433 0B1F921B0F17502D0036468E /* PtrAndFlags.h */ = {isa = PBXFileRef erence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrAndFlags .h; sourceTree = "<group>"; }; 432 0B1F921B0F17502D0036468E /* PtrAndFlags.h */ = {isa = PBXFileRef erence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrAndFlags .h; sourceTree = "<group>"; };
434 0B330C260F38C62300692DE3 /* TypeTraits.cpp */ = {isa = PBXFileRe ference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TypeTr aits.cpp; sourceTree = "<group>"; };
435 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */ = {isa = PBXFileRefe rence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h ; sourceTree = "<group>"; }; 433 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */ = {isa = PBXFileRefe rence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h ; sourceTree = "<group>"; };
436 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */ = {isa = PBXFileR eference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBasePri vate.h; sourceTree = "<group>"; }; 434 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */ = {isa = PBXFileR eference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBasePri vate.h; sourceTree = "<group>"; };
437 141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReferen ce; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minidom.c; path = tests/minidom.c; sourceTree = "<group>"; }; 435 141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReferen ce; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minidom.c; path = tests/minidom.c; sourceTree = "<group>"; };
438 1412110D0A48788700480255 /* minidom.js */ = {isa = PBXFileRefere nce; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = minidom .js; path = tests/minidom.js; sourceTree = "<group>"; }; 436 1412110D0A48788700480255 /* minidom.js */ = {isa = PBXFileRefere nce; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = minidom .js; path = tests/minidom.js; sourceTree = "<group>"; };
439 141211200A48793C00480255 /* minidom */ = {isa = PBXFileReference ; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mi nidom; sourceTree = BUILT_PRODUCTS_DIR; }; 437 141211200A48793C00480255 /* minidom */ = {isa = PBXFileReference ; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mi nidom; sourceTree = BUILT_PRODUCTS_DIR; };
440 1419D32C0CEA7CDE00FF507A /* RefCounted.h */ = {isa = PBXFileRefe rence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounted.h ; sourceTree = "<group>"; }; 438 1419D32C0CEA7CDE00FF507A /* RefCounted.h */ = {isa = PBXFileRefe rence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounted.h ; sourceTree = "<group>"; };
441 1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileRefere nce; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp ; sourceTree = "<group>"; }; 439 1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileRefere nce; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp ; sourceTree = "<group>"; };
442 142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReferenc e; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBase.h; source Tree = "<group>"; }; 440 142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReferenc e; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBase.h; source Tree = "<group>"; };
443 1429D77B0ED20D7300B89619 /* Interpreter.h */ = {isa = PBXFileRef erence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter .h; sourceTree = "<group>"; }; 441 1429D77B0ED20D7300B89619 /* Interpreter.h */ = {isa = PBXFileRef erence; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter .h; sourceTree = "<group>"; };
444 1429D7D30ED2128200B89619 /* Interpreter.cpp */ = {isa = PBXFileR eference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Inter preter.cpp; sourceTree = "<group>"; }; 442 1429D7D30ED2128200B89619 /* Interpreter.cpp */ = {isa = PBXFileR eference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Inter preter.cpp; sourceTree = "<group>"; };
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 ); 1085 );
1088 name = "Derived Sources"; 1086 name = "Derived Sources";
1089 path = DerivedSources/JavaScriptCore; 1087 path = DerivedSources/JavaScriptCore;
1090 sourceTree = BUILT_PRODUCTS_DIR; 1088 sourceTree = BUILT_PRODUCTS_DIR;
1091 tabWidth = 4; 1089 tabWidth = 4;
1092 usesTabs = 0; 1090 usesTabs = 0;
1093 }; 1091 };
1094 65162EF108E6A21C007556CD /* wtf */ = { 1092 65162EF108E6A21C007556CD /* wtf */ = {
1095 isa = PBXGroup; 1093 isa = PBXGroup;
1096 children = ( 1094 children = (
1097 0B330C260F38C62300692DE3 /* TypeTraits.cpp */,
1098 06D358A00DAAD9C4003B174E /* mac */, 1095 06D358A00DAAD9C4003B174E /* mac */,
1099 E195678D09E7CF1200B89D13 /* unicode */, 1096 E195678D09E7CF1200B89D13 /* unicode */,
1100 938C4F690CA06BC700D9310A /* ASCIICType.h */, 1097 938C4F690CA06BC700D9310A /* ASCIICType.h */,
1101 E1A596370DE3E1C300C17E37 /* AVLTree.h */, 1098 E1A596370DE3E1C300C17E37 /* AVLTree.h */,
1102 93AA4F770957251F0084B3A7 /* AlwaysInline.h */, 1099 93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
1103 65E217B808E7EECC0023E5F6 /* Assertions.cpp */, 1100 65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
1104 65E217B708E7EECC0023E5F6 /* Assertions.h */, 1101 65E217B708E7EECC0023E5F6 /* Assertions.h */,
1105 A7A1F7AA0F252B3C00E184E2 /* ByteArray.cpp */, 1102 A7A1F7AA0F252B3C00E184E2 /* ByteArray.cpp */,
1106 A7A1F7AB0F252B3C00E184E2 /* ByteArray.h */, 1103 A7A1F7AB0F252B3C00E184E2 /* ByteArray.h */,
1107 180B9AEF0F16C569009BDBC5 /* CurrentTime.cpp */, 1104 180B9AEF0F16C569009BDBC5 /* CurrentTime.cpp */,
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
2075 1429DA820ED2482900B89619 /* WRECFunctors.cpp in Sources */, 2072 1429DA820ED2482900B89619 /* WRECFunctors.cpp in Sources */,
2076 1429DAE10ED2645B00B89619 /* WRECGenerator.cpp in Sources */, 2073 1429DAE10ED2645B00B89619 /* WRECGenerator.cpp in Sources */,
2077 1429DAC00ED263E700B89619 /* WRECParser.cpp in So urces */, 2074 1429DAC00ED263E700B89619 /* WRECParser.cpp in So urces */,
2078 930754C108B0F68000AB3056 /* pcre_compile.cpp in Sources */, 2075 930754C108B0F68000AB3056 /* pcre_compile.cpp in Sources */,
2079 930754EB08B0F78500AB3056 /* pcre_exec.cpp in Sou rces */, 2076 930754EB08B0F78500AB3056 /* pcre_exec.cpp in Sou rces */,
2080 930754D008B0F74600AB3056 /* pcre_tables.cpp in S ources */, 2077 930754D008B0F74600AB3056 /* pcre_tables.cpp in S ources */,
2081 937013480CA97E0E00FA14D3 /* pcre_ucp_searchfuncs .cpp in Sources */, 2078 937013480CA97E0E00FA14D3 /* pcre_ucp_searchfuncs .cpp in Sources */,
2082 93E26BD408B1514100F85226 /* pcre_xclass.cpp in S ources */, 2079 93E26BD408B1514100F85226 /* pcre_xclass.cpp in S ources */,
2083 A7A1F7AC0F252B3C00E184E2 /* ByteArray.cpp in Sou rces */, 2080 A7A1F7AC0F252B3C00E184E2 /* ByteArray.cpp in Sou rces */,
2084 BC3135650F302FA3003DFD3A /* DebuggerActivation.c pp in Sources */, 2081 BC3135650F302FA3003DFD3A /* DebuggerActivation.c pp in Sources */,
2085 0B330C270F38C62300692DE3 /* TypeTraits.cpp in So urces */,
2086 ); 2082 );
2087 runOnlyForDeploymentPostprocessing = 0; 2083 runOnlyForDeploymentPostprocessing = 0;
2088 }; 2084 };
2089 932F5BDC0822A1C700736975 /* Sources */ = { 2085 932F5BDC0822A1C700736975 /* Sources */ = {
2090 isa = PBXSourcesBuildPhase; 2086 isa = PBXSourcesBuildPhase;
2091 buildActionMask = 2147483647; 2087 buildActionMask = 2147483647;
2092 files = ( 2088 files = (
2093 932F5BDD0822A1C700736975 /* jsc.cpp in Sources * /, 2089 932F5BDD0822A1C700736975 /* jsc.cpp in Sources * /,
2094 ); 2090 );
2095 runOnlyForDeploymentPostprocessing = 0; 2091 runOnlyForDeploymentPostprocessing = 0;
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
2436 defaultConfigurationName = Production; 2432 defaultConfigurationName = Production;
2437 }; 2433 };
2438 /* End XCConfigurationList section */ 2434 /* End XCConfigurationList section */
2439 }; 2435 };
2440 rootObject = 0867D690FE84028FC02AAC07 /* Project object */; 2436 rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
2441 } 2437 }
2442 2438
2443 2439
2444 2440
2445 2441
OLDNEW
« no previous file with comments | « third_party/WebKit/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj ('k') | third_party/WebKit/JavaScriptCore/JavaScriptCoreSources.bkl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698