aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2016-01-18 11:30:10 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2016-01-18 14:34:58 +0000
commit50fce86f11f4fc5a372d008be903842576e72403 (patch)
tree079f11b04816d783e1f8a06870b512575b5dc79f /scripts
parent5fd0d622d14d608389a176a2f6fa2b129aec81e4 (diff)
Inline bazel_bootstrap in compile.sh
This method is used only once now so inline. -- MOS_MIGRATED_REVID=112396086
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap/bootstrap.sh29
1 files changed, 0 insertions, 29 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index 05af3583cd..cf48f75437 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -18,7 +18,6 @@
# Configuration:
# BAZEL: path to the bazel binary
# EMBED_LABEL: the label to embed in tools using --embed_label (optional)
-# BAZEL_ARGS: list of other arguments to pass to bazel (optional)
# BAZELRC: the rc file to use
: ${BAZELRC:="/dev/null"}
@@ -30,34 +29,6 @@ if [ -n "${EMBED_LABEL}" ]; then
fi
: ${JAVA_VERSION:="1.8"}
-: ${BAZEL_ARGS="--singlejar_top=//src/java_tools/singlejar:bootstrap_deploy.jar \
- --javabuilder_top=//src/java_tools/buildjar:bootstrap_deploy.jar \
- --genclass_top=//src/java_tools/buildjar:bootstrap_genclass_deploy.jar \
- --ijar_top=//third_party/ijar \
- --strategy=Javac=worker --worker_quit_after_build \
- --genrule_strategy=standalone --spawn_strategy=standalone \
- ${EXTRA_BAZEL_ARGS-}"}
-
-function bazel_bootstrap() {
- local mode=${3:-"0644"}
- if [[ ! ${BAZEL_SKIP_TOOL_COMPILATION-} =~ "$2" ]]; then
- log "Building $2"
- if [ -n "${4-}" ]; then
- ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} --batch \
- build ${BAZEL_ARGS} \
- --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \
- "${EMBED_LABEL_ARG[@]}" $1
- else
- run_silent ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} --batch \
- build ${BAZEL_ARGS} \
- --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \
- "${EMBED_LABEL_ARG[@]}" $1
- fi
- local file=bazel-bin/${1##//}
- cp -f ${file/:/\/} $2
- chmod ${mode} $2
- fi
-}
function md5_outputs() {
[ -n "${BAZEL_TEST_XTRACE:-}" ] && set +x # Avoid garbage in the output