diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 19:44:02 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 19:44:02 +0000 |
| commit | 154c671a50a862fc146857eb63081ae2e2a10470 (patch) | |
| tree | 828d1f636c6d82913726b42ca615d2a26e8aa624 /o3d | |
| parent | addd854ca14d6f52706998a172116de52e5592a8 (diff) | |
| download | chromium_src-154c671a50a862fc146857eb63081ae2e2a10470.zip chromium_src-154c671a50a862fc146857eb63081ae2e2a10470.tar.gz chromium_src-154c671a50a862fc146857eb63081ae2e2a10470.tar.bz2 | |
Make follow-up changes per r26302 review comments that were apparently not made
in r26302. Set Subversion properties, fix the O3D GYP invocation to work
properly, fix presubmit warnings, and do some additional cleanup.
Review URL: http://codereview.chromium.org/200144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS_gyp | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | o3d/build/gyp_o3d | 20 |
2 files changed, 16 insertions, 11 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index c8fef5c..43e1540 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -143,9 +143,8 @@ deps_os = { hooks = [ { - # A change to a .gyp, .gypi, or to GYP itself shound run the generator. - "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|MANIFEST$", - "action": ["python", "build/gyp_o3d", "build/all.gyp", "--depth", ".", - "-D", "mac_deployment_target=10.4"], + # A change to a .gyp, .gypi, or to GYP itself should run the generator. + "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", + "action": ["python", "o3d/build/gyp_o3d", "o3d/build/all.gyp"], }, ] diff --git a/o3d/build/gyp_o3d b/o3d/build/gyp_o3d index 2603b29e..598dd70 100644..100755 --- a/o3d/build/gyp_o3d +++ b/o3d/build/gyp_o3d @@ -1,24 +1,30 @@ #!/usr/bin/python -# This script is wrapper for O3D when compiling independently of chromium. -# Like in chromium, the gyp_chromium.gypi include is forced in. +# 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. + +# This script is wrapper for O3D when compiling independently of Chromium. +# Like in Chromium, the common.gypi include is forced in. -import glob import os -import shlex import sys +chrome_src = os.path.join(os.path.dirname(sys.argv[0]), os.pardir, os.pardir) + try: import gyp except ImportError, e: - sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../tools/gyp/pylib')) + sys.path.append(os.path.join(chrome_src, 'tools', 'gyp', 'pylib')) import gyp if __name__ == '__main__': args = sys.argv[1:] - # Always include gyp_chromium.gypi - args += ['-I', os.path.join(os.path.dirname(sys.argv[0]),'../../build/gyp_chromium.gypi')] + # Always include common.gypi + args += ['--depth', '.', + '-I', os.path.join(chrome_src, 'build', 'common.gypi'), + '-D', 'mac_deployment_target=10.4'] # Off we go... sys.exit(gyp.main(args)) |