summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authormad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 03:14:02 +0000
committermad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 03:14:02 +0000
commitbcd8453776860362c5ee105ccba2761bebe02a7c (patch)
tree4318febc203af09e81501197bd41d9cfeba9e6fb /remoting
parenta5e4efd40cf3894d2b5594af7d8187f221412279 (diff)
downloadchromium_src-bcd8453776860362c5ee105ccba2761bebe02a7c.zip
chromium_src-bcd8453776860362c5ee105ccba2761bebe02a7c.tar.gz
chromium_src-bcd8453776860362c5ee105ccba2761bebe02a7c.tar.bz2
Moving version script and gypi file to build\util.
BUG=343792 OK, it's been almost a week now, with regular pings to OWNERs, so I guess it's OK to TBR... It's only Gyp/script changes anyway... Feel free to uncheck the CQ box if you disagree... TBR=beng@chromium.org, darin@chromium.org Review URL: https://codereview.chromium.org/165893002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rwxr-xr-xremoting/host/installer/linux/build-deb.sh2
-rw-r--r--remoting/remoting_version.gypi2
-rwxr-xr-xremoting/tools/build/remoting_localize.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/installer/linux/build-deb.sh b/remoting/host/installer/linux/build-deb.sh
index 5c85e56..6f27d46 100755
--- a/remoting/host/installer/linux/build-deb.sh
+++ b/remoting/host/installer/linux/build-deb.sh
@@ -20,7 +20,7 @@ get_version_full() {
src_root=${src_root:-./../../../..}
remoting_version_path=$src_root/remoting/VERSION
chrome_version_path=$src_root/chrome/VERSION
- version_helper=$src_root/chrome/tools/build/version.py
+ version_helper=$src_root/build/util/version.py
# TODO(lambroslambrou): Refactor to share the logic with remoting.gyp.
version_major=$($version_helper -f $chrome_version_path \
diff --git a/remoting/remoting_version.gypi b/remoting/remoting_version.gypi
index 2ce1409..6ff247f 100644
--- a/remoting/remoting_version.gypi
+++ b/remoting/remoting_version.gypi
@@ -10,7 +10,7 @@
# 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',
+ 'version_py_path': '../build/util/version.py',
'remoting_version_path': '../remoting/VERSION',
'chrome_version_path': '../chrome/VERSION',
'version_major':
diff --git a/remoting/tools/build/remoting_localize.py b/remoting/tools/build/remoting_localize.py
index 5c4eeb1..466a86e 100755
--- a/remoting/tools/build/remoting_localize.py
+++ b/remoting/tools/build/remoting_localize.py
@@ -656,7 +656,7 @@ def Localize(source, locales, options):
# Load the localized messages.
message_map = MessageMap(languages, options.locale_dir)
- # Add OFFICIAL_BUILD variable the same way chrome/tools/build/version.py
+ # Add OFFICIAL_BUILD variable the same way build/util/version.py
# does.
if os.environ.get('CHROME_BUILD_TYPE') == '_official':
context['official_build'] = '1'