| Index: build/all.xcodeproj/project.pbxproj
|
| ===================================================================
|
| --- build/all.xcodeproj/project.pbxproj (revision 6734)
|
| +++ build/all.xcodeproj/project.pbxproj (working copy)
|
| @@ -14,9 +14,11 @@
|
| );
|
| dependencies = (
|
| 7B82FA6E0E75DD23008F45CF /* PBXTargetDependency */,
|
| - 4D7B02580E9D5833009A6919 /* PBXTargetDependency */,
|
| 7B82FA720E75DD23008F45CF /* PBXTargetDependency */,
|
| + 4DCE997C0EF060B100682526 /* PBXTargetDependency */,
|
| 7B82FA700E75DD23008F45CF /* PBXTargetDependency */,
|
| + 4DCE997A0EF0609E00682526 /* PBXTargetDependency */,
|
| + 4D7B02580E9D5833009A6919 /* PBXTargetDependency */,
|
| );
|
| name = run_all_unittests;
|
| productName = run_all_unittests;
|
| @@ -44,7 +46,7 @@
|
| 7BA363940E8C40400023C8B9 /* PBXTargetDependency */,
|
| 7BF8964E0E75D705000BAF8A /* PBXTargetDependency */,
|
| 4D7B02320E9D57E4009A6919 /* PBXTargetDependency */,
|
| - 4DB045250EB165B800A5633C /* PBXTargetDependency */,
|
| + 4DCE99760EF0608200682526 /* PBXTargetDependency */,
|
| 7BF895DE0E75D5FB000BAF8A /* PBXTargetDependency */,
|
| 4DB042C40EB1536A00A5633C /* PBXTargetDependency */,
|
| 7BF896440E75D705000BAF8A /* PBXTargetDependency */,
|
| @@ -118,13 +120,6 @@
|
| remoteGlobalIDString = E45627B70E2691D0005E4685;
|
| remoteInfo = All;
|
| };
|
| - 4DB045240EB165B800A5633C /* PBXContainerItemProxy */ = {
|
| - isa = PBXContainerItemProxy;
|
| - containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */;
|
| - proxyType = 1;
|
| - remoteGlobalIDString = E45628C30E26B4FE005E4685;
|
| - remoteInfo = TestShell;
|
| - };
|
| 4DB6807E0EAF88B000AB2128 /* PBXContainerItemProxy */ = {
|
| isa = PBXContainerItemProxy;
|
| containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */;
|
| @@ -146,13 +141,48 @@
|
| remoteGlobalIDString = 4DB684920EAFDF7000AB2128;
|
| remoteInfo = xslt;
|
| };
|
| - 531CBD1B0ECB66670084F32D /* PBXContainerItemProxy */ = {
|
| + 4DCE994F0EF0603800682526 /* PBXContainerItemProxy */ = {
|
| isa = PBXContainerItemProxy;
|
| - containerPortal = 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */;
|
| + containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */;
|
| proxyType = 2;
|
| - remoteGlobalIDString = D2AAC046055464E500DB518D;
|
| - remoteInfo = dmg_fp;
|
| + remoteGlobalIDString = E45060E40EE87B86003BE099;
|
| + remoteInfo = app;
|
| };
|
| + 4DCE99510EF0603800682526 /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */;
|
| + proxyType = 2;
|
| + remoteGlobalIDString = B5FDBFAE0EE4623000BEC6E6;
|
| + remoteInfo = ipc_tests;
|
| + };
|
| + 4DCE99660EF0603800682526 /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */;
|
| + proxyType = 2;
|
| + remoteGlobalIDString = E45067A80EEF2776003BE099;
|
| + remoteInfo = test_shell_tests;
|
| + };
|
| + 4DCE99750EF0608200682526 /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */;
|
| + proxyType = 1;
|
| + remoteGlobalIDString = 4DCE98940EF0600700682526;
|
| + remoteInfo = All;
|
| + };
|
| + 4DCE99790EF0609E00682526 /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */;
|
| + proxyType = 1;
|
| + remoteGlobalIDString = E4506A340EF020E4003BE099;
|
| + remoteInfo = run_test_shell_tests;
|
| + };
|
| + 4DCE997B0EF060B100682526 /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */;
|
| + proxyType = 1;
|
| + remoteGlobalIDString = E4F325930EE837BF002533CE;
|
| + remoteInfo = run_ipc_tests;
|
| + };
|
| 7B262E390E82E508001CE27F /* PBXContainerItemProxy */ = {
|
| isa = PBXContainerItemProxy;
|
| containerPortal = 7BF895A30E75D5DA000BAF8A /* v8.xcodeproj */;
|
| @@ -565,7 +595,6 @@
|
| 4D7B021C0E9D57D9009A6919 /* sqlite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sqlite.xcodeproj; path = sqlite/sqlite.xcodeproj; sourceTree = "<group>"; };
|
| 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = chrome.xcodeproj; path = chrome/chrome.xcodeproj; sourceTree = "<group>"; };
|
| 4DB686590EAFE60400AB2128 /* libxslt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxslt.xcodeproj; path = libxslt/libxslt.xcodeproj; sourceTree = "<group>"; };
|
| - 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dmg_fp.xcodeproj; path = dmg_fp/dmg_fp.xcodeproj; sourceTree = "<group>"; };
|
| 7B262FE50E82F18D001CE27F /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = libevent/libevent.xcodeproj; sourceTree = "<group>"; };
|
| 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TestShell.xcodeproj; path = webkit/tools/test_shell/mac/TestShell.xcodeproj; sourceTree = "<group>"; };
|
| 7BA3638D0E8C402F0023C8B9 /* sdch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sdch.xcodeproj; path = sdch/sdch.xcodeproj; sourceTree = "<group>"; };
|
| @@ -603,9 +632,11 @@
|
| 4D7B02390E9D5816009A6919 /* Products */ = {
|
| isa = PBXGroup;
|
| children = (
|
| + 4DCE99500EF0603800682526 /* Chromium.app */,
|
| 4D7B02500E9D5816009A6919 /* libbrowser.a */,
|
| 4D7B02520E9D5816009A6919 /* libcommon.a */,
|
| 4DB6807F0EAF88B000AB2128 /* librenderer.a */,
|
| + 4DCE99520EF0603800682526 /* ipc_tests */,
|
| 4D7B02540E9D5816009A6919 /* unit_tests */,
|
| );
|
| name = Products;
|
| @@ -619,14 +650,6 @@
|
| name = Products;
|
| sourceTree = "<group>";
|
| };
|
| - 531CBD150ECB66670084F32D /* Products */ = {
|
| - isa = PBXGroup;
|
| - children = (
|
| - 531CBD1C0ECB66670084F32D /* libdmg_fp.a */,
|
| - );
|
| - name = Products;
|
| - sourceTree = "<group>";
|
| - };
|
| 7B262FE60E82F18D001CE27F /* Products */ = {
|
| isa = PBXGroup;
|
| children = (
|
| @@ -639,6 +662,7 @@
|
| isa = PBXGroup;
|
| children = (
|
| 7BA354A50E89784F0023C8B9 /* TestShell.app */,
|
| + 4DCE99670EF0603800682526 /* test_shell_tests */,
|
| );
|
| name = Products;
|
| sourceTree = "<group>";
|
| @@ -764,7 +788,6 @@
|
| isa = PBXGroup;
|
| children = (
|
| 7BF895E90E75D666000BAF8A /* bzip2.xcodeproj */,
|
| - 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */,
|
| 7BF895EF0E75D673000BAF8A /* icu.xcodeproj */,
|
| 7B262FE50E82F18D001CE27F /* libevent.xcodeproj */,
|
| 7BF896080E75D68B000BAF8A /* libjpeg.xcodeproj */,
|
| @@ -875,10 +898,6 @@
|
| ProjectRef = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */;
|
| },
|
| {
|
| - ProductGroup = 531CBD150ECB66670084F32D /* Products */;
|
| - ProjectRef = 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */;
|
| - },
|
| - {
|
| ProductGroup = 7BF895A10E75D5DA000BAF8A /* Products */;
|
| ProjectRef = 7BF895A00E75D5DA000BAF8A /* googleurl.xcodeproj */;
|
| },
|
| @@ -1009,13 +1028,27 @@
|
| remoteRef = 4DB686620EAFE60400AB2128 /* PBXContainerItemProxy */;
|
| sourceTree = BUILT_PRODUCTS_DIR;
|
| };
|
| - 531CBD1C0ECB66670084F32D /* libdmg_fp.a */ = {
|
| + 4DCE99500EF0603800682526 /* Chromium.app */ = {
|
| isa = PBXReferenceProxy;
|
| - fileType = archive.ar;
|
| - path = libdmg_fp.a;
|
| - remoteRef = 531CBD1B0ECB66670084F32D /* PBXContainerItemProxy */;
|
| + fileType = wrapper.application;
|
| + path = Chromium.app;
|
| + remoteRef = 4DCE994F0EF0603800682526 /* PBXContainerItemProxy */;
|
| sourceTree = BUILT_PRODUCTS_DIR;
|
| };
|
| + 4DCE99520EF0603800682526 /* ipc_tests */ = {
|
| + isa = PBXReferenceProxy;
|
| + fileType = "compiled.mach-o.executable";
|
| + path = ipc_tests;
|
| + remoteRef = 4DCE99510EF0603800682526 /* PBXContainerItemProxy */;
|
| + sourceTree = BUILT_PRODUCTS_DIR;
|
| + };
|
| + 4DCE99670EF0603800682526 /* test_shell_tests */ = {
|
| + isa = PBXReferenceProxy;
|
| + fileType = "compiled.mach-o.executable";
|
| + path = test_shell_tests;
|
| + remoteRef = 4DCE99660EF0603800682526 /* PBXContainerItemProxy */;
|
| + sourceTree = BUILT_PRODUCTS_DIR;
|
| + };
|
| 7B262E3A0E82E508001CE27F /* libv8-arm.a */ = {
|
| isa = PBXReferenceProxy;
|
| fileType = archive.ar;
|
| @@ -1312,16 +1345,26 @@
|
| name = All;
|
| targetProxy = 4DB042C30EB1536A00A5633C /* PBXContainerItemProxy */;
|
| };
|
| - 4DB045250EB165B800A5633C /* PBXTargetDependency */ = {
|
| - isa = PBXTargetDependency;
|
| - name = TestShell;
|
| - targetProxy = 4DB045240EB165B800A5633C /* PBXContainerItemProxy */;
|
| - };
|
| 4DB686790EAFE61A00AB2128 /* PBXTargetDependency */ = {
|
| isa = PBXTargetDependency;
|
| name = xslt;
|
| targetProxy = 4DB686780EAFE61A00AB2128 /* PBXContainerItemProxy */;
|
| };
|
| + 4DCE99760EF0608200682526 /* PBXTargetDependency */ = {
|
| + isa = PBXTargetDependency;
|
| + name = All;
|
| + targetProxy = 4DCE99750EF0608200682526 /* PBXContainerItemProxy */;
|
| + };
|
| + 4DCE997A0EF0609E00682526 /* PBXTargetDependency */ = {
|
| + isa = PBXTargetDependency;
|
| + name = run_test_shell_tests;
|
| + targetProxy = 4DCE99790EF0609E00682526 /* PBXContainerItemProxy */;
|
| + };
|
| + 4DCE997C0EF060B100682526 /* PBXTargetDependency */ = {
|
| + isa = PBXTargetDependency;
|
| + name = run_ipc_tests;
|
| + targetProxy = 4DCE997B0EF060B100682526 /* PBXContainerItemProxy */;
|
| + };
|
| 7B2630020E82F19B001CE27F /* PBXTargetDependency */ = {
|
| isa = PBXTargetDependency;
|
| name = libevent;
|
|
|