Another go at adding a bazel_notools binary that doesn't contain the embedded tools.
The previous change got the order of the parameters of package-bazel.sh wrong, thus building a non-functional bazel binary.
--
MOS_MIGRATED_REVID=105742752
diff --git a/src/BUILD b/src/BUILD
index 8f30ecb..adcaf26 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -15,8 +15,8 @@
],
)
-genrule(
- name = "install_base_key-file",
+[genrule(
+ name = "install_base_key-file" + suffix,
srcs = [
"//src/main/java:bazel-main_deploy.jar",
"//src/main/cpp:client",
@@ -25,14 +25,16 @@
"//src/main/tools:process-wrapper",
"//src/main/tools:namespace-sandbox",
"//src/main/tools:build_interface_so",
- ":embedded_tools",
- ],
- outs = ["install_base_key"],
+ ] + embedded_tools,
+ outs = ["install_base_key" + suffix],
cmd = select({
":darwin": md5_cmd % "/sbin/md5",
"//conditions:default": md5_cmd % "md5sum",
}),
-)
+) for suffix, embedded_tools in {
+ "": [":embedded_tools"],
+ "_notools": [],
+}.items()]
# Try to grab the java version from the java_toolchain.
# Unfortunately, we don't have access to the javac options
@@ -92,10 +94,14 @@
]),
)
-genrule(
- name = "package-zip",
- srcs = [
+[genrule(
+ name = "package-zip" + suffix,
+ srcs = ([":embedded_tools.zip"] if embed else []) + [
+ # The script assumes that the embedded tools zip (if exists) is the
+ # first item here, the deploy jar the second and install base key is the
+ # third
"//src/main/java:bazel-main_deploy.jar",
+ "install_base_key" + suffix,
"//src/main/cpp:client",
":libunix",
"//src/main/tools:build-runfiles",
@@ -103,35 +109,24 @@
"//src/main/tools:jdk-support",
"//src/main/tools:namespace-sandbox",
"//src/main/tools:build_interface_so",
- "install_base_key",
":java-version",
- ":embedded_tools.zip",
],
- outs = ["package.zip"],
- # Terrible hack to remove timestamps in the zip file
- cmd = "\n".join([
- "mkdir -p $(@D)/package-zip",
- "cp $(SRCS) $(@D)/package-zip",
- # TODO(dmarting): we should change the client to connect to server.jar
- # instead of the first binary in the list.
- "mv $(@D)/package-zip/bazel-main_deploy.jar $(@D)/package-zip/A-server.jar",
- "touch -t 198001010000.00 $(@D)/package-zip/*",
- "mkdir $(@D)/package-zip/embedded_tools",
- "(cd $(@D)/package-zip/embedded_tools && unzip -q ../embedded_tools.zip)",
- "rm $(@D)/package-zip/embedded_tools.zip",
- "P=$$PWD; (cd $(@D)/package-zip && zip -qrD $$P/$@ *)",
- "rm -fr $(@D)/package-zip",
- ]),
-)
+ outs = ["package" + suffix + ".zip"],
+ cmd = "$(location :package-bazel.sh) $@ " + ("" if embed else "''") + " $(SRCS)",
+ tools = ["package-bazel.sh"],
+) for suffix, embed in [
+ ("", True),
+ ("_notools", False),
+]]
-genrule(
- name = "bazel-bin",
+[genrule(
+ name = "bazel-bin" + suffix,
srcs = [
"//src/main/cpp:client",
- "package-zip",
+ "package-zip" + suffix,
],
- outs = ["bazel"],
- cmd = "cat $(location //src/main/cpp:client) $(location :package-zip) > $@ && zip -qA $@",
+ outs = ["bazel" + suffix],
+ cmd = "cat $(location //src/main/cpp:client) $(location :package-zip" + suffix + ") > $@ && zip -qA $@",
executable = 1,
output_to_bindir = 1,
visibility = [
@@ -139,7 +134,10 @@
"//scripts/packages:__pkg__", # For installer generation
"//src/test:__subpackages__", # For integration tests
],
-)
+) for suffix in [
+ "",
+ "_notools",
+]]
config_setting(
name = "darwin",
diff --git a/src/package-bazel.sh b/src/package-bazel.sh
new file mode 100755
index 0000000..9181d81
--- /dev/null
+++ b/src/package-bazel.sh
@@ -0,0 +1,45 @@
+#!/bin/bash -eu
+#
+# Copyright 2015 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script bootstraps building a Bazel binary without Bazel then
+# use this compiled Bazel to bootstrap Bazel itself. It can also
+# be provided with a previous version of Bazel to bootstrap Bazel
+# itself.
+
+WORKDIR=$(pwd)
+OUT=$1
+EMBEDDED_TOOLS=$2
+DEPLOY_JAR=$3
+INSTALL_BASE_KEY=$4
+shift 4
+
+TMP_DIR=${TMPDIR:-/tmp}
+PACKAGE_DIR="$(mktemp -d ${TMP_DIR%%/}/bazel.XXXXXXXX)"
+mkdir -p "${PACKAGE_DIR}"
+trap "rm -fr ${PACKAGE_DIR}" EXIT
+
+cp $* ${PACKAGE_DIR}
+cp ${DEPLOY_JAR} ${PACKAGE_DIR}/A-server.jar
+cp ${INSTALL_BASE_KEY} ${PACKAGE_DIR}/install_base_key
+# The timestamp of embedded tools should already be zeroed out in the input zip
+touch -t 198001010000.00 ${PACKAGE_DIR}/*
+
+if [[ ${EMBEDDED_TOOLS} != "" ]]; then
+ mkdir ${PACKAGE_DIR}/embedded_tools
+ (cd ${PACKAGE_DIR}/embedded_tools && unzip -q ${WORKDIR}/${EMBEDDED_TOOLS})
+fi
+
+(cd ${PACKAGE_DIR}; zip -qrD ${WORKDIR}/${OUT} *)
