summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2015-12-02 14:31:56 -0500
committerNico Weber <thakis@chromium.org>2015-12-02 19:34:13 +0000
commite250e6adb0422773e60cdbef47014879fafb2506 (patch)
treefa8aad2933677c5b451dda219ae7dee36e1872b5
parenteaa4e86fe7d9154bde31181108180480e1d603c1 (diff)
downloadchromium_src-e250e6adb0422773e60cdbef47014879fafb2506.zip
chromium_src-e250e6adb0422773e60cdbef47014879fafb2506.tar.gz
chromium_src-e250e6adb0422773e60cdbef47014879fafb2506.tar.bz2
Remove stray references to update.sh from src/
BUG=494442 R=hans@chromium.org Review URL: https://codereview.chromium.org/1489223003 . Cr-Commit-Position: refs/heads/master@{#362772}
-rw-r--r--WATCHLISTS2
-rw-r--r--build/common.gypi2
-rw-r--r--docs/clang_static_analyzer.md2
-rw-r--r--docs/clang_tool_refactoring.md4
-rw-r--r--docs/updating_clang.md2
-rw-r--r--testing/buildbot/trybot_analyze_config.json1
-rwxr-xr-xtools/clang/scripts/update.py6
7 files changed, 9 insertions, 10 deletions
diff --git a/WATCHLISTS b/WATCHLISTS
index 77accd1..013e12f 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -246,7 +246,7 @@
'chrome/browser/resources/chromeos/',
},
'clang_update': {
- 'filepath': 'tools/clang/scripts/update.sh'
+ 'filepath': 'tools/clang/scripts/update.py'
},
'clipboard': {
'filepath': 'clipboard|dnd|drag|drop',
diff --git a/build/common.gypi b/build/common.gypi
index 3d12987..0974b49 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -443,7 +443,7 @@
'mac_want_real_dsym%': 'default',
# If this is set, the clang plugins used on the buildbot will be used.
- # Run tools/clang/scripts/update.sh to make sure they are compiled.
+ # Run tools/clang/scripts/update.py to make sure they are compiled.
# This causes 'clang_chrome_plugins_flags' to be set.
# Has no effect if 'clang' is not set as well.
'clang_use_chrome_plugins%': 1,
diff --git a/docs/clang_static_analyzer.md b/docs/clang_static_analyzer.md
index 0ddf786..ed9feab 100644
--- a/docs/clang_static_analyzer.md
+++ b/docs/clang_static_analyzer.md
@@ -13,7 +13,7 @@ You need an llvm checkout to get `scan-build` and `scan-view`; the easiest way
to get that is to run
```shell
-tools/clang/scripts/update.sh --force-local-build --without-android
+tools/clang/scripts/update.py --force-local-build --without-android
```
## With make
diff --git a/docs/clang_tool_refactoring.md b/docs/clang_tool_refactoring.md
index 929d8a2..48e7c60 100644
--- a/docs/clang_tool_refactoring.md
+++ b/docs/clang_tool_refactoring.md
@@ -25,7 +25,7 @@ Build your tool by running the following command (requires cmake version 2.8.10
or later):
```shell
-tools/clang/scripts/update.sh --force-local-build --without-android \
+tools/clang/scripts/update.py --force-local-build --without-android \
--with-chrome-tools <tools>
```
@@ -35,7 +35,7 @@ build. The resulting binary will end up in
plugin and the empty\_string tool, run the following:
```shell
-tools/clang/scripts/update.sh --force-local-build --without-android \
+tools/clang/scripts/update.py --force-local-build --without-android \
--with-chrome-tools "plugins;empty_string"
```
diff --git a/docs/updating_clang.md b/docs/updating_clang.md
index d8a8575..02dce25 100644
--- a/docs/updating_clang.md
+++ b/docs/updating_clang.md
@@ -2,7 +2,7 @@
1. Sync your Chromium tree to the latest revision to pick up any plugin
changes and test the new compiler against ToT
-1. Update clang revision in tools/clang/scripts/update.sh, upload CL to
+1. Update clang revision in tools/clang/scripts/update.py, upload CL to
rietveld
1. Run tools/clang/scripts/package.py to create a tgz of the binary (mac and
linux)
diff --git a/testing/buildbot/trybot_analyze_config.json b/testing/buildbot/trybot_analyze_config.json
index 16112d1..5d502d0 100644
--- a/testing/buildbot/trybot_analyze_config.json
+++ b/testing/buildbot/trybot_analyze_config.json
@@ -43,7 +43,6 @@
"third_party/hunspell_dictionaries/.*",
"third_party/zlib/google/test/data/.*",
"tools/clang/scripts/update.py",
- "tools/clang/scripts/update.sh",
"tools/mb/.*",
"tools/metrics/histograms/histograms.xml",
"tools/perf/.*",
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index aca7cb9..dd5283f 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -3,8 +3,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-"""Windows can't run .sh files, so this is a Python implementation of
-update.sh. This script should replace update.sh on all platforms eventually."""
+"""This script is used to download prebuilt clang binaries.
+
+It is also used by package.py to build the prebuilt clang binaries."""
import argparse
import cStringIO
@@ -26,7 +27,6 @@ import zipfile
# Do NOT CHANGE this if you don't know what you're doing -- see
# https://code.google.com/p/chromium/wiki/UpdatingClang
# Reverting problematic clang rolls is safe, though.
-# Note: this revision is only used for Windows. Other platforms use update.sh.
CLANG_REVISION = '254049'
use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ