diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 20:32:56 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 20:32:56 +0000 |
| commit | bbf362b447de9cdd023e933ae219731fc01d0571 (patch) | |
| tree | 86c70036905763d6e4718fcd7bb6e731536e2d7a /o3d/core | |
| parent | 9776400c727f886197fb538546edca2331252fb2 (diff) | |
| download | chromium_src-bbf362b447de9cdd023e933ae219731fc01d0571.zip chromium_src-bbf362b447de9cdd023e933ae219731fc01d0571.tar.gz chromium_src-bbf362b447de9cdd023e933ae219731fc01d0571.tar.bz2 | |
Axe the o3d_version.py script and turn it into a .gypi file. This fixes a bug where bumping the version wasn't always picked up by the build slaves because hooks are only re-run when a GYP file changes.
Also axe the o3d_kill_version.py and the separate SDK version logic, which was not used anymore.
TEST=built on Linux; trybots
BUG=none
Review URL: http://codereview.chromium.org/2017004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
| -rw-r--r-- | o3d/core/core.gyp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index d6c70cb..9b4237c 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -8,6 +8,10 @@ # Whether to enable the English-only, Win/Mac-only fullscreen message. 'plugin_enable_fullscreen_msg%': '1', }, + 'includes': [ + '../build/common.gypi', + '../plugin/version.gypi', + ], 'target_defaults': { 'include_dirs': [ # The internal dir is first so that headers in internal can replace those @@ -19,7 +23,7 @@ '../../<(nacldir)', ], 'defines': [ - 'O3D_PLUGIN_VERSION="<!(python ../plugin/version_info.py --version)"', + 'O3D_PLUGIN_VERSION="<(plugin_version)"', ], 'conditions': [ ['<(plugin_enable_fullscreen_msg) != 0', @@ -76,9 +80,6 @@ }], ], }, - 'includes': [ - '../build/common.gypi', - ], 'targets': [ { 'target_name': 'o3dCore', |