diff options
| author | nbarth@chromium.org <nbarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 04:21:14 +0000 |
|---|---|---|
| committer | nbarth@chromium.org <nbarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 04:21:14 +0000 |
| commit | 2dff117085cdfa2b7254f763d95badc80d4a693f (patch) | |
| tree | 5852da4ee917110c3681886a2151ba73276e3276 | |
| parent | 51a9b8ce230a736bcb85776cfff951e4a0cc70a3 (diff) | |
| download | chromium_src-2dff117085cdfa2b7254f763d95badc80d4a693f.zip chromium_src-2dff117085cdfa2b7254f763d95badc80d4a693f.tar.gz chromium_src-2dff117085cdfa2b7254f763d95badc80d4a693f.tar.bz2 | |
Cleanup sanitize build sed and sh scripts.
Minor cleanup:
* switch regexes to extended regexes,
which remove a few gratuitous backslashes
(and makes them less confusing, since basic regexes are so rarely used)
* fix . -> \. (which *does* need escaping in either case)
* make sed files non-executable,
since if executed they just say "don't execute this"
* delete blank line
(Just noticed these scripts when working on Blink IDL bindings, and made
necessary fixes for my changes, but cleaning up while I'm here.)
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=211564
R=scottbyer@chromium.org
Review URL: https://codereview.chromium.org/19052002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231995 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r--[-rwxr-xr-x] | build/sanitize-mac-build-log.sed | 12 | ||||
| -rwxr-xr-x | build/sanitize-mac-build-log.sh | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | build/sanitize-win-build-log.sed | 8 | ||||
| -rwxr-xr-x | build/sanitize-win-build-log.sh | 3 |
4 files changed, 10 insertions, 16 deletions
diff --git a/build/sanitize-mac-build-log.sed b/build/sanitize-mac-build-log.sed index 3312eac..b4111c7 100755..100644 --- a/build/sanitize-mac-build-log.sed +++ b/build/sanitize-mac-build-log.sed @@ -1,5 +1,3 @@ -#!/bin/echo Use sanitize-mac-build-log.sh or sed -f - # 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. @@ -17,8 +15,8 @@ # Xcode prints a short "compiling foobar.o" line followed by the lengthy # full command line. These deletions drop the command line. \|^ /Developer/usr/bin/|d -\|^ /Developer/Library/PrivateFrameworks/DevToolsCore.framework/|d -\|^ /Developer/Library/Xcode/Plug-ins/CoreBuildTasks.xcplugin/|d +\|^ /Developer/Library/PrivateFrameworks/DevToolsCore\.framework/|d +\|^ /Developer/Library/Xcode/Plug-ins/CoreBuildTasks\.xcplugin/|d # Drop any goma command lines as well. \|^ .*/gomacc |d @@ -28,8 +26,8 @@ \|^ /Users/[^/]*/bin/|d # There's already a nice note for bindings, don't need the command line. -\|^python scripts/rule_binding.py|d +\|^python scripts/rule_binding\.py|d # Shorten the "compiling foobar.o" line. -s|^Distributed-CompileC \(.*\) normal i386 c++ com.apple.compilers.gcc.4_2| CC \1| -s|^CompileC \(.*\) normal i386 c++ com.apple.compilers.gcc.4_2| CC \1| +s|^Distributed-CompileC (.*) normal i386 c\+\+ com\.apple\.compilers\.gcc\.4_2| CC \1| +s|^CompileC (.*) normal i386 c\+\+ com\.apple\.compilers\.gcc\.4_2| CC \1| diff --git a/build/sanitize-mac-build-log.sh b/build/sanitize-mac-build-log.sh index dc743fa..df5a7af 100755 --- a/build/sanitize-mac-build-log.sh +++ b/build/sanitize-mac-build-log.sh @@ -2,5 +2,4 @@ # Copyright (c) 2010 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. -sed -f `dirname "${0}"`/`basename "${0}" sh`sed - +sed -r -f `dirname "${0}"`/`basename "${0}" sh`sed diff --git a/build/sanitize-win-build-log.sed b/build/sanitize-win-build-log.sed index ce51654..4691b76 100755..100644 --- a/build/sanitize-win-build-log.sed +++ b/build/sanitize-win-build-log.sed @@ -1,5 +1,3 @@ -#!/bin/echo Use sanitize-win-build-log.sh or sed -f - # 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. @@ -11,8 +9,8 @@ /The operation completed successfully\./d # Drop parallelization indicators on lines. -s/^[0-9]\+>// +s/^[0-9]+>// # Shorten bindings generation lines -s/^.*"\(perl\|[^"]\+perl\.exe\)".*deprecated_generate_bindings\.pl".*\("[^"]\+\.idl"\).*$/ deprecated_generate_bindings \2/ -s/^.*"python".*idl_compiler\.py".*\("[^"]\+\.idl"\).*$/ idl_compiler \1/ +s/^.*"(perl|[^"]+perl\.exe)".*deprecated_generate_bindings\.pl".*("[^"]+\.idl").*$/ deprecated_generate_bindings \2/ +s/^.*"python".*idl_compiler\.py".*("[^"]+\.idl").*$/ idl_compiler \1/ diff --git a/build/sanitize-win-build-log.sh b/build/sanitize-win-build-log.sh index dc743fa..df5a7af 100755 --- a/build/sanitize-win-build-log.sh +++ b/build/sanitize-win-build-log.sh @@ -2,5 +2,4 @@ # Copyright (c) 2010 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. -sed -f `dirname "${0}"`/`basename "${0}" sh`sed - +sed -r -f `dirname "${0}"`/`basename "${0}" sh`sed |