diff options
| author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 19:35:17 +0000 |
|---|---|---|
| committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 19:35:17 +0000 |
| commit | ace8e41ba9d0d295e9bacfd8230262538f300d3b (patch) | |
| tree | f5a46a6a84cd6f49ac2882c04978b07ef9172466 /build | |
| parent | a7fe767c34ca6bc34f3413dc68869c78081209eb (diff) | |
| download | chromium_src-ace8e41ba9d0d295e9bacfd8230262538f300d3b.zip chromium_src-ace8e41ba9d0d295e9bacfd8230262538f300d3b.tar.gz chromium_src-ace8e41ba9d0d295e9bacfd8230262538f300d3b.tar.bz2 | |
run cygwin mount setup in runhooks, and remove some references to it
BUG=111731
Review URL: https://chromiumcodereview.appspot.com/9223028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/grit_target.gypi | 3 | ||||
| -rw-r--r-- | build/win/setup_cygwin_mount.py | 20 |
2 files changed, 20 insertions, 3 deletions
diff --git a/build/grit_target.gypi b/build/grit_target.gypi index e05f927..fe9900b 100644 --- a/build/grit_target.gypi +++ b/build/grit_target.gypi @@ -26,8 +26,5 @@ ], }, }], - ['OS=="win"', { - 'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'], - }], ], } diff --git a/build/win/setup_cygwin_mount.py b/build/win/setup_cygwin_mount.py new file mode 100644 index 0000000..5b0db35 --- /dev/null +++ b/build/win/setup_cygwin_mount.py @@ -0,0 +1,20 @@ +# Copyright (c) 2012 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. + +import os +import sys + +def main(): + if len(sys.argv) != 2 or sys.argv[1] != '--win-only': + return 1 + if 'win' in sys.platform: + self_dir = os.path.dirname(sys.argv[0]) + mount_path = os.path.join(self_dir, "..\\..\\third_party\\cygwin") + batch_path = os.path.join(mount_path, "setup_mount.bat") + return os.system(os.path.normpath(batch_path) + ">nul") + return 0 + + +if __name__ == "__main__": + sys.exit(main()) |