summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-16 22:30:43 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-16 22:30:43 +0000
commit588c8676852990ee5b6d8e973adfd03fc445e579 (patch)
tree76b938722b474ad263735866da18f8ad69bdf281
parent91564fbfc9da218f1a181a334759777d8ec0b530 (diff)
downloadchromium_src-588c8676852990ee5b6d8e973adfd03fc445e579.zip
chromium_src-588c8676852990ee5b6d8e973adfd03fc445e579.tar.gz
chromium_src-588c8676852990ee5b6d8e973adfd03fc445e579.tar.bz2
Copy courgette.exe to courgette64.exe
Bot angry file not named way bot want. R=tommi@chromium.org,laforge@chromium.org BUG=273246 Review URL: https://chromiumcodereview.appspot.com/23050007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218108 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp2
-rw-r--r--courgette/courgette.gyp27
2 files changed, 28 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 80ed71d..5a0a39f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -755,6 +755,7 @@
'dependencies': [
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:policy_templates',
+ '../courgette/courgette.gyp:courgette64',
'../chrome/installer/mini_installer.gyp:mini_installer',
'../courgette/courgette.gyp:courgette',
'../cloud_print/cloud_print.gyp:cloud_print',
@@ -778,7 +779,6 @@
'dependencies': [
'../chrome/chrome.gyp:crash_service_win64',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
- '../courgette/courgette.gyp:courgette64',
# Omitting tests from Win64 to speed up cycle times.
'../chrome/chrome.gyp:automated_ui_tests',
'../chrome/chrome.gyp:chromedriver',
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index d6d4c15..5bed905 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -203,5 +203,32 @@
},
],
}],
+ # The build infrastructure needs courgette to be named courgette64.
+ ['OS=="win" and target_arch=="x64"', {
+ 'targets': [
+ {
+ 'target_name': 'courgette64',
+ 'type': 'none',
+ 'dependencies': [
+ 'courgette',
+ ],
+ 'actions': [{
+ 'action_name': 'courgette64',
+ 'inputs': [
+ '<(PRODUCT_DIR)/courgette.exe',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/courgette64.exe',
+ ],
+ 'action': [
+ 'python',
+ '../build/cp.py',
+ '<@(_inputs)',
+ '<@(_outputs)'
+ ],
+ }],
+ },
+ ],
+ }],
],
}