Add a 'cygwin' target to execute setup_mount.bat explicitly as a

dependency of targets that need it (that is, any target with
'rules' or 'actions').
Review URL: http://codereview.chromium.org/115154

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

7 files changed, 74 insertions, 1 deletions

diff --git a/DEPS b/DEPS
index fe7d4f3..1788922 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@468",
+    "http://gyp.googlecode.com/svn/trunk@470",
 
   "src/v8":
     "http://v8.googlecode.com/svn/trunk@1909",
diff --git a/build/win/system.gyp b/build/win/system.gyp
new file mode 100644
index 0000000..48dc985
--- /dev/null
+++ b/build/win/system.gyp
@@ -0,0 +1,29 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'includes': [
+    '../common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'cygwin',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'setup_mount',
+          'inputs': [
+            '../../third_party/cygwin/setup_mount.bat',
+          ],
+          # Visual Studio requires an output file, or else the
+          # custom build step won't run.
+          'outputs': [
+            '../../third_party/cygwin/_always_run_setup_mount.marker',
+          ],
+          'action': ['<@(_inputs)'],
+        },
+      ],
+    },
+  ],
+}
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 65b3e22..ff526a1 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -71,6 +71,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
@@ -109,6 +114,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
     {
       # TODO(beng): rename to 'app' when moves to top level.
@@ -232,6 +242,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
     {
       'target_name': 'common',
diff --git a/chrome/installer/util/prebuild/util_prebuild.gyp b/chrome/installer/util/prebuild/util_prebuild.gyp
index 1379e64..13ac74e 100644
--- a/chrome/installer/util/prebuild/util_prebuild.gyp
+++ b/chrome/installer/util/prebuild/util_prebuild.gyp
@@ -29,6 +29,11 @@
            '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../../../../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
   ],
 }
diff --git a/net/net.gyp b/net/net.gyp
index c36932d..a87029c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -601,6 +601,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/net',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
   ],
   'conditions': [
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index e46bc7e..0b069c8 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -69,6 +69,7 @@
               ],
             },
           },
+          'dependencies': ['../../build/win/system.gyp:cygwin'],
           'rules': [
             {
               'rule_name': 'generate_libs',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index f32c3a7..76a26b9 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -195,6 +195,7 @@
       },
       'conditions': [
         ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
           'direct_dependent_settings': {
             'defines': [
               '__STD_C',
@@ -416,6 +417,11 @@
       'export_dependent_settings': [
         'wtf',
       ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
     {
       'target_name': 'webcore',
@@ -4115,6 +4121,7 @@
           },
         }],
         ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
           'sources/': [
             ['exclude', 'Posix\\.cpp$'],
             ['include', '/opentype/'],
@@ -4278,6 +4285,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/webkit',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
     {
       'target_name': 'webkit_strings',
@@ -4316,6 +4328,11 @@
           '<(SHARED_INTERMEDIATE_DIR)/webkit',
         ],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
     },
     {
       'target_name': 'glue',
@@ -4600,6 +4617,7 @@
         }, {  # else: OS=="win"
           'sources/': [['exclude', '_posix\\.cc$']],
           'dependencies': [
+            '../build/win/system.gyp:cygwin',
             'activex_shim/activex_shim.gyp:activex_shim',
             'default_plugin/default_plugin.gyp:default_plugin',
           ],