Commit 9f3eb15c authored by dpapad's avatar dpapad Committed by Commit Bot

Closure compiler: Update roll_closure_compiler script to work with NPM.

The previous way of fetching the Closure compiler binary from [1] no
longer works (endpoint removed), and using NPM is the suggested
alternative.

[1] https://dl.google.com/closure-compiler/compiler-latest.zip

Bug: 1137293
Change-Id: I6047c760fa97e04b16258beee0dd59c78b231b32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2465685
Commit-Queue: dpapad <dpapad@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarcalamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816489}
parent e46cb3a8
......@@ -8,7 +8,7 @@
readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly TEMP_DIR=$(mktemp -d)
readonly EXTERNS_DIR_URL="https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs"
readonly EXTERNS_NPM_DIR="node_modules/google-closure-compiler/contrib/externs"
readonly EXTERNS_DIR="${SCRIPT_DIR}/externs"
readonly README="${SCRIPT_DIR}/README.chromium"
......@@ -29,21 +29,22 @@ old_mocha_sha1=$(get_sha1 "${EXTERNS_DIR}/mocha-2.5.js")
cd "${TEMP_DIR}"
# Check if NPM is installed.
command -v npm >/dev/null 2>&1 || {
echo >&2 "NPM is required to run this script. Aborting.";
exit 1;
}
echo "Downloading Closure Compiler latest..."
wget https://dl.google.com/closure-compiler/compiler-latest.zip
unzip compiler-latest.zip
npm install --prefix . --no-bin-links --only=prod google-closure-compiler
jar_file=$(basename $(find . -name '*.jar'))
new_version=$(basename $(echo ${jar_file} | cut -f3 -d-) .jar)
json_file=node_modules/google-closure-compiler-java/package.json
new_version=$(cat $json_file | grep version | cut -f2 -d ":" | tr -d '" ')
new_date="$(date --utc '+%Y/%m/%d %H:%M')"
jar_file=node_modules/google-closure-compiler-java/compiler.jar
cp "${jar_file}" "${SCRIPT_DIR}/compiler/compiler.jar"
wget ${EXTERNS_DIR_URL}/chrome.js
wget ${EXTERNS_DIR_URL}/chrome_extensions.js
wget ${EXTERNS_DIR_URL}/polymer-1.0.js
wget ${EXTERNS_DIR_URL}/mocha-2.5.js
readonly WARNING="$(cat <<EOT
// SSSSSSSSSSSSSSS TTTTTTTTTTTTTTTTTTTTTTT OOOOOOOOO PPPPPPPPPPPPPPPPP
// SS:::::::::::::::ST:::::::::::::::::::::T OO:::::::::OO P::::::::::::::::P
......@@ -64,10 +65,10 @@ readonly WARNING="$(cat <<EOT
EOT
)"
(echo "${WARNING}" && cat chrome.js) > "${EXTERNS_DIR}/chrome.js"
(echo "${WARNING}" && cat chrome_extensions.js) > "${EXTERNS_DIR}/chrome_extensions.js"
(echo "${WARNING}" && cat polymer-1.0.js) > "${EXTERNS_DIR}/polymer-1.0.js"
(echo "${WARNING}" && cat mocha-2.5.js) > "${EXTERNS_DIR}/mocha-2.5.js"
(echo "${WARNING}" && cat ${EXTERNS_NPM_DIR}/chrome.js) > "${EXTERNS_DIR}/chrome.js"
(echo "${WARNING}" && cat ${EXTERNS_NPM_DIR}/chrome_extensions.js) > "${EXTERNS_DIR}/chrome_extensions.js"
(echo "${WARNING}" && cat ${EXTERNS_NPM_DIR}/polymer-1.0.js) > "${EXTERNS_DIR}/polymer-1.0.js"
(echo "${WARNING}" && cat ${EXTERNS_NPM_DIR}/mocha-2.5.js) > "${EXTERNS_DIR}/mocha-2.5.js"
# Apply local Chromium patch.
cd "${SCRIPT_DIR}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment