summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-23 20:25:00 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-23 20:25:00 +0000
commit4082e1377730605689afbd7c2c8c54743e77e509 (patch)
tree0043268d74c7944e18b98a3155f1b380a80f7ea9
parentced522c8f636f3b0841d3e9c49bd3958f4a352b5 (diff)
downloadchromium_src-4082e1377730605689afbd7c2c8c54743e77e509.zip
chromium_src-4082e1377730605689afbd7c2c8c54743e77e509.tar.gz
chromium_src-4082e1377730605689afbd7c2c8c54743e77e509.tar.bz2
Remove last traces of third_party/clang_format
R=nick@chromium.org TBR=brettw@chromium.org,nick@chromium.org BUG=none Review URL: https://codereview.chromium.org/371313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285030 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--.gitignore3
-rw-r--r--DEPS9
-rw-r--r--third_party/clang_format/README.chromium15
-rw-r--r--third_party/clang_format/bin/rm_binaries.py38
4 files changed, 0 insertions, 65 deletions
diff --git a/.gitignore b/.gitignore
index 17b5caf..440dc9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,9 +234,6 @@ v8.log
/third_party/chromeos_login_manager
/third_party/chromeos_text_input
/third_party/chromite
-/third_party/clang_format/bin/*/*
-/third_party/clang_format/script
-!/third_party/clang_format/bin/*/*.sha1
/third_party/cld_2/src
/third_party/colorama/src
/third_party/cros
diff --git a/DEPS b/DEPS
index 2aca744..51a87b0 100644
--- a/DEPS
+++ b/DEPS
@@ -749,15 +749,6 @@ hooks = [
"-s", "src/buildtools/linux64/clang-format.sha1",
],
},
- {
- # Remove clang-format binaries from third_party/clang_format/bin that
- # aren't used anymore.
- # TODO(jochen) remove this and the .gitignore entry after the end of July,
- # 2014.
- "name": "remove_old_clang_format_binaries",
- "pattern": ".",
- "action": ["python", "src/third_party/clang_format/bin/rm_binaries.py"],
- },
# Pull binutils for linux, enabled debug fission for faster linking /
# debugging when used with clang on Ubuntu Precise.
# https://code.google.com/p/chromium/issues/detail?id=352046
diff --git a/third_party/clang_format/README.chromium b/third_party/clang_format/README.chromium
deleted file mode 100644
index 56cc631..0000000
--- a/third_party/clang_format/README.chromium
+++ /dev/null
@@ -1,15 +0,0 @@
-Name: clang-format
-Short Name: clang-format
-URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/
-Version: 3.5
-Date: 11 April 2014
-Revision: See DEPS
-License: University of Illinois/NCSA Open Source License
-License File: NOT_SHIPPED
-Security Critical: No
-
-Description:
-A tool for formatting C++ code to style.
-
-Local Modifications:
-None
diff --git a/third_party/clang_format/bin/rm_binaries.py b/third_party/clang_format/bin/rm_binaries.py
deleted file mode 100644
index 3730dbd..0000000
--- a/third_party/clang_format/bin/rm_binaries.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.
-
-# This script removes the platform-specific clang_format binaries from
-# third_party/clang_format/bin* now that the binaries have been moved to
-# src/buildtools. Keeping the old ones around will be pretty confusing since
-# the version will be out-of-date.
-#
-# This script assumes it is located in third_party/clang_format/bin and locates
-# the binaries relative to itself.
-#
-# TODO(jochen) remove this script when people have likely been updated.
-# End of July 2014 would be good.
-
-import os
-import sys
-
-bin_dir = os.path.dirname(__file__)
-
-# Typically only one platform will have binaries. Remove them all just in case,
-# but ignore all errors.
-
-try:
- os.remove(os.path.join(bin_dir, "linux", "clang-format"))
-except:
- pass
-
-try:
- os.remove(os.path.join(bin_dir, "mac", "clang-format"))
-except:
- pass
-
-try:
- os.remove(os.path.join(bin_dir, "win", "clang-format.exe"))
-except:
- pass
-