diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 21:30:08 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 21:30:08 +0000 |
| commit | cca66ef63dfb375edd9e5f1a8cb63d48e098550c (patch) | |
| tree | bd69553b0be38d0de3e558f1661e6d0c9f7a7365 | |
| parent | e7500b2b4d7bd6fe654dc6c870594d6bf005dbd9 (diff) | |
| download | chromium_src-cca66ef63dfb375edd9e5f1a8cb63d48e098550c.zip chromium_src-cca66ef63dfb375edd9e5f1a8cb63d48e098550c.tar.gz chromium_src-cca66ef63dfb375edd9e5f1a8cb63d48e098550c.tar.bz2 | |
Move remoting version info into separate .gypi file.
BUG=
Review URL: https://codereview.chromium.org/137623007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247297 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/remoting.gyp | 21 | ||||
| -rw-r--r-- | remoting/remoting_version.gypi | 27 |
2 files changed, 28 insertions, 20 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 82c5d3a..eeb9882 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -22,26 +22,6 @@ 'remoting_localize_path': 'tools/build/remoting_localize.py', - # The |major|, |build| and |patch| versions are inherited from Chrome. - # Since Chrome's |minor| version is always '0', we replace it with a - # Chromoting-specific patch version. - # Note that we check both the |chrome_version_path| file and the - # |remoting_version_path| so that we can override the Chrome version - # numbers if needed. - 'version_py_path': '../chrome/tools/build/version.py', - 'remoting_version_path': '../remoting/VERSION', - 'chrome_version_path': '../chrome/VERSION', - 'version_major': - '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@MAJOR@")', - 'version_minor': - '<!(python <(version_py_path) -f <(remoting_version_path) -t "@REMOTING_PATCH@")', - 'version_short': - '<(version_major).<(version_minor).' - '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@BUILD@")', - 'version_full': - '<(version_short).' - '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@PATCH@")', - 'branding_path': '../remoting/branding_<(branding)', 'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales', @@ -145,6 +125,7 @@ '../chrome/js_unittest_vars.gypi', 'remoting_android.gypi', 'remoting_webapp.gypi', + 'remoting_version.gypi', ], 'target_defaults': { diff --git a/remoting/remoting_version.gypi b/remoting/remoting_version.gypi new file mode 100644 index 0000000..2ce1409 --- /dev/null +++ b/remoting/remoting_version.gypi @@ -0,0 +1,27 @@ +# Copyright 2014 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. + +{ + 'variables': { + # The |major|, |build| and |patch| versions are inherited from Chrome. + # Since Chrome's |minor| version is always '0', we replace it with a + # Chromoting-specific patch version. + # Note that we check both the |chrome_version_path| file and the + # |remoting_version_path| so that we can override the Chrome version + # numbers if needed. + 'version_py_path': '../chrome/tools/build/version.py', + 'remoting_version_path': '../remoting/VERSION', + 'chrome_version_path': '../chrome/VERSION', + 'version_major': + '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@MAJOR@")', + 'version_minor': + '<!(python <(version_py_path) -f <(remoting_version_path) -t "@REMOTING_PATCH@")', + 'version_short': + '<(version_major).<(version_minor).' + '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@BUILD@")', + 'version_full': + '<(version_short).' + '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@PATCH@")', + }, +} |