diff options
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | base/base.gypi | 1 | ||||
| -rw-r--r-- | build/all.gyp | 1 | ||||
| -rw-r--r-- | build/all_android.gyp | 1 | ||||
| -rw-r--r-- | build/util/build_util.gyp | 36 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 6 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 1 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 3 | ||||
| -rwxr-xr-x | tools/export_tarball/export_tarball.py | 8 |
9 files changed, 9 insertions, 51 deletions
@@ -539,7 +539,8 @@ hooks = [ "action": ["python", "src/build/win/setup_cygwin_mount.py", "--win-only"], }, { - # Update LASTCHANGE. + # Update LASTCHANGE. This is also run by export_tarball.py in + # src/tools/export_tarball - please keep them in sync. "pattern": ".", "action": ["python", "src/build/util/lastchange.py", "-o", "src/build/util/LASTCHANGE"], diff --git a/base/base.gypi b/base/base.gypi index 101cdf9..7d8c594 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -633,7 +633,6 @@ ], 'dependencies': [ 'symbolize', - '../build/util/build_util.gyp:lastchange#target', '../build/linux/system.gyp:glib', '../build/linux/system.gyp:x11', 'xdg_mime', diff --git a/build/all.gyp b/build/all.gyp index 753edd3..0f8ef6a 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -56,7 +56,6 @@ '../v8/tools/gyp/v8.gyp:*', '../webkit/support/webkit_support.gyp:*', '../webkit/webkit.gyp:*', - 'util/build_util.gyp:*', 'temp_gyp/googleurl.gyp:*', '<(libjpeg_gyp_path):*', ], diff --git a/build/all_android.gyp b/build/all_android.gyp index 12498e1..dfd4479 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -13,7 +13,6 @@ 'type': 'none', 'dependencies': [ '../content/content.gyp:content_shell_apk', - 'util/build_util.gyp:*', 'android_builder_tests', ], }, # target_name: All diff --git a/build/util/build_util.gyp b/build/util/build_util.gyp deleted file mode 100644 index a7a5a4b..0000000 --- a/build/util/build_util.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2011 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. - -{ - 'targets': [ - { - 'target_name': 'lastchange', - 'type': 'none', - 'variables': { - 'lastchange_out_path': '<(DEPTH)/build/util/LASTCHANGE', - 'default_lastchange_path': '../LASTCHANGE.in', - }, - 'actions': [ - { - 'action_name': 'lastchange', - 'inputs': [ - # Note: <(default_lastchange_path) is optional, - # so it doesn't show up in inputs. - './lastchange.py', - ], - 'outputs': [ - '<(lastchange_out_path)', - ], - 'action': [ - 'python', '<@(_inputs)', - '-o', '<(lastchange_out_path)', - '-d', '<(default_lastchange_path)', - ], - 'message': 'Extracting last change to <(lastchange_out_path)', - 'process_outputs_as_sources': '1', - }, - ], - }, - ] -} diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 11578fd..2d0f383 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -850,9 +850,6 @@ { 'target_name': 'chrome_version_resources', 'type': 'none', - 'dependencies': [ - '../build/util/build_util.gyp:lastchange#target', - ], 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/chrome_version', @@ -911,9 +908,6 @@ 'target_name': 'chrome_version_header', 'type': 'none', 'hard_dependency': 1, - 'dependencies': [ - '../build/util/build_util.gyp:lastchange#target', - ], 'actions': [ { 'action_name': 'version_header', diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index f21d4cd..d222ce2 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -221,7 +221,6 @@ 'installer_util_strings', '../base/base.gyp:base', '../build/temp_gyp/googleurl.gyp:googleurl', - '../build/util/build_util.gyp:lastchange#target', '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../breakpad/breakpad.gyp:breakpad_handler', diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index eebfb79..561531d 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -587,9 +587,6 @@ { 'target_name': 'remoting_version_resources', 'type': 'none', - 'dependencies': [ - '../build/util/build_util.gyp:lastchange#target', - ], 'inputs': [ 'chromium_branding', 'google_chrome_branding', diff --git a/tools/export_tarball/export_tarball.py b/tools/export_tarball/export_tarball.py index 861503e..ac366db 100755 --- a/tools/export_tarball/export_tarball.py +++ b/tools/export_tarball/export_tarball.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# 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. @@ -101,6 +101,12 @@ def main(argv): print 'Cannot find the src directory.' return 1 + # This command is from src/DEPS; please keep them in sync. + if subprocess.call(['python', 'build/util/lastchange.py', '-o', + 'build/util/LASTCHANGE'], cwd=GetSourceDirectory()) != 0: + print 'Could not run build/util/lastchange.py to update LASTCHANGE.' + return 1 + output_fullname = args[0] + '.tar.bz2' output_basename = os.path.basename(args[0]) |