summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 12:40:52 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 12:40:52 +0000
commitb36574a58e05f1d0ac14916dbf014dce2a680ee7 (patch)
treec1468e8e3105b9ce33d7d50653a46ba235b1d5d4
parentf80f4ad38f48e88ed8f4bf44a185e76eb4e8fc3f (diff)
downloadchromium_src-b36574a58e05f1d0ac14916dbf014dce2a680ee7.zip
chromium_src-b36574a58e05f1d0ac14916dbf014dce2a680ee7.tar.gz
chromium_src-b36574a58e05f1d0ac14916dbf014dce2a680ee7.tar.bz2
Remove the grd clobber script on Windows.
Now that we have more and more proper grd dependencies in place, this script may just do more harm than good by causing spurious rebuilds. Additionally, it horked the build today. TEST=none BUG=17706 Review URL: http://codereview.chromium.org/1019007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41947 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS7
-rw-r--r--build/win/clobber_generated_headers.py67
2 files changed, 0 insertions, 74 deletions
diff --git a/DEPS b/DEPS
index 90d97b3..d434367 100644
--- a/DEPS
+++ b/DEPS
@@ -232,13 +232,6 @@ hooks = [
"action": ["python", "src/build/gyp_chromium"],
},
{
- # Workaround IncrediBuild problem. http://crbug.com/17706.
- "pattern": "\\.grd$",
- "action": ["python",
- "src/build/win/clobber_generated_headers.py",
- "$matching_files"],
- },
- {
# Workaround XCode dependecies problem.
# TODO(bradnelson): remove this when fixed.
"pattern": ".",
diff --git a/build/win/clobber_generated_headers.py b/build/win/clobber_generated_headers.py
deleted file mode 100644
index d6bae89..0000000
--- a/build/win/clobber_generated_headers.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/python
-# 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 helps workaround IncrediBuild problem on Windows.
-# See http://crbug.com/17706.
-
-import os
-import sys
-
-_SRC_PATH = os.path.join(os.path.dirname(__file__), '..', '..')
-
-sys.path.append(os.path.join(_SRC_PATH, 'tools', 'grit'))
-import grit.exception
-import grit.grd_reader
-
-# We need to apply the workaround only on Windows.
-if os.name != 'nt':
- sys.exit(0)
-
-def total_split(path):
- components = []
- while path:
- head, tail = os.path.split(path)
- if not tail:
- break
- components.append(tail)
- path = head
- return list(reversed(components))
-
-for path in sys.argv[1:]:
- path_components = total_split(path)
- try:
- root = grit.grd_reader.Parse(path)
- except grit.exception.Base, exc:
- # This hook exploded badly a few times on the buildbot with exception
- # at this point. Do not exit with an error, just print more information
- # for debugging.
- # TODO(phajdan.jr): Make exception fatal when the root cause is fixed.
- print 'Unexpected GRIT exception while processing ' + path
- print exc
- continue
- output_files = [node.GetOutputFilename() for node in root.GetOutputFiles()]
- output_headers = [file for file in output_files if file.endswith('.h')]
- # Build output can be in any subdirectory of src.
- paths = [d for d in os.listdir(_SRC_PATH) if
- os.path.isdir(os.path.join(_SRC_PATH, d))]
- for out_dir in paths:
- for build_type in ('Debug', 'Release'):
- build_path = os.path.join(_SRC_PATH, out_dir, build_type)
-
- # We guess target file output based on path of the grd file (the first
- # path component after 'src').
- intermediate_path = os.path.join(build_path, 'obj',
- 'global_intermediate', path_components[1])
-
- for header in output_headers:
- full_path = os.path.normpath(os.path.join(intermediate_path, header))
- if os.path.exists(full_path):
- try:
- os.remove(full_path)
- except OSError, e:
- fmt = 'Could not remove %s: %s. Continuing.\n'
- sys.stderr.write(fmt % (full_path, e))
- else:
- print 'Clobbered ' + full_path