Switching to v8.gyp in the v8 project (so they can maintain it themselves).

Rolling forward v8 version to pull in one with v8.gyp.

Review URL: http://codereview.chromium.org/100076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14786 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 23 deletions

diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 2b068e0..3fc685f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -3991,10 +3991,10 @@
       'conditions': [
         ['javascript_engine=="v8"', {
           'dependencies': [
-            '../build/temp_gyp/v8.gyp:v8',
+            '../v8/tools/gyp/v8.gyp:v8',
           ],
           'export_dependent_settings': [
-            '../build/temp_gyp/v8.gyp:v8',
+            '../v8/tools/gyp/v8.gyp:v8',
           ],
         }],
         ['OS=="linux"', {
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index da0adcc..7194672 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -101,7 +101,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "tools\test_sh
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}

 		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}

 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366} = {E40E86D3-78D3-D269-7A4A-B4FB74CA4366}

 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}

 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}

 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}

@@ -135,7 +134,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "tools\t
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}

 		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}

 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366} = {E40E86D3-78D3-D269-7A4A-B4FB74CA4366}

 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}

 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}

 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}

@@ -191,17 +189,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Bindings_prebuild", "buil
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\testing\gtest.vcproj", "{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\build\temp_gyp\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\v8\tools\gyp\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8", "..\build\temp_gyp\v8.vcproj", "{21E22961-22BF-4493-BD3A-868F93DA5179}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8", "..\v8\tools\gyp\v8.vcproj", "{21E22961-22BF-4493-BD3A-868F93DA5179}"

 	ProjectSection(ProjectDependencies) = postProject

+		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {82BC22B5-1D58-28BA-8735-58B591E1D154}

 		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {865575D0-37E2-405E-8CBA-5F6C485B5A26}

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827} = {9DA4FACA-4A4D-3A23-B349-475C2237F827}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mksnapshot", "..\build\temp_gyp\mksnapshot.vcproj", "{865575D0-37E2-405E-8CBA-5F6C485B5A26}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mksnapshot", "..\v8\tools\gyp\mksnapshot.vcproj", "{865575D0-37E2-405E-8CBA-5F6C485B5A26}"

 	ProjectSection(ProjectDependencies) = postProject

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366} = {E40E86D3-78D3-D269-7A4A-B4FB74CA4366}

+		{879286C0-3234-D14B-BB2C-32D4D1B809CE} = {879286C0-3234-D14B-BB2C-32D4D1B809CE}

 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}

 	EndProjectSection

 EndProject

@@ -245,18 +243,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "tools\test_s
 		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}

 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}

 		{D6047981-23AE-4623-9373-514FDAFAE60F} = {D6047981-23AE-4623-9373-514FDAFAE60F}

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366} = {E40E86D3-78D3-D269-7A4A-B4FB74CA4366}

 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}

 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}

 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}

 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js2c", "..\build\temp_gyp\js2c.vcproj", "{9DA4FACA-4A4D-3A23-B349-475C2237F827}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js2c", "..\v8\tools\gyp\js2c.vcproj", "{82BC22B5-1D58-28BA-8735-58B591E1D154}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_nosnapshot", "..\build\temp_gyp\v8_nosnapshot.vcproj", "{E40E86D3-78D3-D269-7A4A-B4FB74CA4366}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_nosnapshot", "..\v8\tools\gyp\v8_nosnapshot.vcproj", "{879286C0-3234-D14B-BB2C-32D4D1B809CE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827} = {9DA4FACA-4A4D-3A23-B349-475C2237F827}

+		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {82BC22B5-1D58-28BA-8735-58B591E1D154}

 	EndProjectSection

 EndProject

 Global

@@ -353,6 +350,10 @@ Global
 		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.Build.0 = Debug|Win32

 		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.ActiveCfg = Release|Win32

 		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.Build.0 = Release|Win32

+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Win32.ActiveCfg = Debug|Win32

+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Win32.Build.0 = Debug|Win32

+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Win32.ActiveCfg = Release|Win32

+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Win32.Build.0 = Release|Win32

 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.ActiveCfg = Debug|Win32

 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.Build.0 = Debug|Win32

 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.ActiveCfg = Release|Win32

@@ -361,6 +362,10 @@ Global
 		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.Build.0 = Debug|Win32

 		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.ActiveCfg = Release|Win32

 		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.Build.0 = Release|Win32

+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Win32.ActiveCfg = Debug|Win32

+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Win32.Build.0 = Debug|Win32

+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Win32.ActiveCfg = Release|Win32

+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Win32.Build.0 = Release|Win32

 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32

 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32

 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32

@@ -369,10 +374,6 @@ Global
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32

 		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32

 		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.Build.0 = Release|Win32

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827}.Debug|Win32.Build.0 = Debug|Win32

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827}.Release|Win32.ActiveCfg = Release|Win32

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827}.Release|Win32.Build.0 = Release|Win32

 		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.Build.0 = Debug|Win32

 		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.ActiveCfg = Release|Win32

@@ -421,10 +422,6 @@ Global
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.Build.0 = Debug|Win32

 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.ActiveCfg = Release|Win32

 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.Build.0 = Release|Win32

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366}.Debug|Win32.Build.0 = Debug|Win32

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366}.Release|Win32.ActiveCfg = Release|Win32

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366}.Release|Win32.Build.0 = Release|Win32

 		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Win32.Build.0 = Debug|Win32

 		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.ActiveCfg = Release|Win32

@@ -488,11 +485,12 @@ Global
 		{6AE76406-B03B-11DD-94B1-80B556D89593} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

+		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

+		{879286C0-3234-D14B-BB2C-32D4D1B809CE} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{8C27D792-2648-4F5E-9ED0-374276327308} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

-		{9DA4FACA-4A4D-3A23-B349-475C2237F827} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

@@ -505,7 +503,6 @@ Global
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{D6047981-23AE-4623-9373-514FDAFAE60F} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

-		{E40E86D3-78D3-D269-7A4A-B4FB74CA4366} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{E6766F81-1FCD-4CD7-BC16-E36964A14867} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}

 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}

 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}