From 202dee0077b3756f5fad43c521ceec4f7349c91e Mon Sep 17 00:00:00 2001
From: "bradnelson@google.com"
<bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 23 Mar 2009 00:38:22 +0000
Subject: [PATCH] Switching sandbox to gyp on windows. Rolling forward deps on
gyp to get 'copies' support. This time handled wow_helper.
Review URL: http://codereview.chromium.org/42355
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12270 0039d316-1c4b-4281-b951-d872f2087c98
---
DEPS | 2 +-
build/all.gyp | 5 +++++
chrome/chrome.sln | 2 +-
sandbox/sandbox.gyp | 9 +++++++++
sandbox/{sandbox.sln => sandbox_standalone.sln} | 0
5 files changed, 16 insertions(+), 2 deletions(-)
rename sandbox/{sandbox.sln => sandbox_standalone.sln} (100%)
diff --git a/DEPS b/DEPS
index b7c2e988960d4..efeb0c0ecc6dc 100644
--- a/DEPS
+++ b/DEPS
@@ -26,7 +26,7 @@ deps = {
# TODO(mark): Remove once this has moved into depot_tools.
"src/tools/gyp":
- "http://gyp.googlecode.com/svn/trunk@388",
+ "http://gyp.googlecode.com/svn/trunk@390",
"src/v8":
"http://v8.googlecode.com/svn/trunk@1564",
diff --git a/build/all.gyp b/build/all.gyp
index 627541074b6da..a55b2c0375937 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -25,6 +25,11 @@
'../net/net.gyp:*',
],
'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ '../sandbox/sandbox.gyp:*',
+ ],
+ }],
['all_gyps', {
'dependencies': [
'../chrome/chrome.gyp:*',
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 91bbe2574dae6..ce5bea1aa1b8e 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -423,7 +423,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_test
{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "..\sandbox\src\sandbox.vcproj", "{881F6A97-D539-4C48-B401-DF04385B2343}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "..\sandbox\sandbox.vcproj", "{881F6A97-D539-4C48-B401-DF04385B2343}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{846901FD-A619-4BD5-A303-38174730CDD6}"
EndProject
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index ff07643f25b82..505dc9b1f1c1b 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -142,6 +142,15 @@
'include_dirs': [
'..',
],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [
+ 'wow_helper/wow_helper.exe',
+ 'wow_helper/wow_helper.pdb',
+ ],
+ },
+ ],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'src/stdafx.h',
diff --git a/sandbox/sandbox.sln b/sandbox/sandbox_standalone.sln
similarity index 100%
rename from sandbox/sandbox.sln
rename to sandbox/sandbox_standalone.sln
--
GitLab