diff options
| author |  philwo <philwo@google.com> | 2017-04-24 17:57:48 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-24 18:00:50 +0200 |
| commit | 40f5c71180ce22c0bd469d1ba089d2bfb517e830 (patch) | |
| tree | 8344cec7b7abb2b06bc14849c689e6eb6926c785 /scripts/packages | |
| parent | aac13242c1e2bb6d1870e1284795bd3ca370984c (diff) | |
Automated g4 rollback of commit 2c4dd1f3176371473667c551cd5a5ae5992f8154.
*** Reason for rollback ***
Breaks CI because //scripts/packages/debian:bazel-bin still references //scripts/packages:bazel-real.
*** Original change description ***
Bundled JDK changes for the release process.
- Make the default Bazel release artifacts include the bundled JDK.
- Create additional Bazel release artifacts without a bundled JDK.
Change-Id: If87c986507ae8e7dbbf0e8f163dd0073a206b265
PiperOrigin-RevId: 154054435
Diffstat (limited to 'scripts/packages')
| -rw-r--r-- | scripts/packages/BUILD | 29 | ||||
| -rw-r--r-- | scripts/packages/self_extract_binary.bzl | 25 |
2 files changed, 20 insertions, 34 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 191f2701d7..1ebe901a77 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -17,20 +17,16 @@ filegroup( srcs = select({ "//src:windows": [], "//src:windows_msvc": [], - "//src:freebsd": [], "//src:darwin": [ - ":with-jdk/install.sh", - ":without-jdk/install.sh", + ":install.sh", ":generate-package-info", ], "//src:darwin_x86_64": [ - ":with-jdk/install.sh", - ":without-jdk/install.sh", + ":install.sh", ":generate-package-info", ], "//conditions:default": [ - ":with-jdk/install.sh", - ":without-jdk/install.sh", + ":install.sh", ":generate-package-info", "//:bazel-distfile", "//scripts/packages/debian:bazel-debian", @@ -68,16 +64,9 @@ genrule( genrule( name = "rename-bazel-bin", - srcs = ["//src:bazel_with_jdk"], - outs = ["with-jdk/bazel-real"], - cmd = "mkdir -p $$(dirname $@); cp $< $@", -) - -genrule( - name = "rename-bazel-bin-without-jdk", srcs = ["//src:bazel"], - outs = ["without-jdk/bazel-real"], - cmd = "mkdir -p $$(dirname $@); cp $< $@", + outs = ["bazel-real"], + cmd = "cp $< $@", ) genrule( @@ -89,15 +78,15 @@ genrule( load(":self_extract_binary.bzl", "self_extract_binary") -[self_extract_binary( - name = "%s/install.sh" % kind, +self_extract_binary( + name = "install.sh", flatten_resources = [ - ":%s/bazel-real" % kind, + ":bazel-real", ":bazel", "//scripts:bash_completion", ], launcher = ":launcher_bin.sh", -) for kind in ("with-jdk", "without-jdk")] +) genrule( name = "embedded_label", diff --git a/scripts/packages/self_extract_binary.bzl b/scripts/packages/self_extract_binary.bzl index 75f19279c3..425a203b36 100644 --- a/scripts/packages/self_extract_binary.bzl +++ b/scripts/packages/self_extract_binary.bzl @@ -75,21 +75,18 @@ def _self_extract_binary(ctx): self_extract_binary = rule( _self_extract_binary, + executable = True, attrs = { "launcher": attr.label( - mandatory = True, - allow_files = True, - single_file = True, - ), - "empty_files": attr.string_list(default = []), + mandatory=True, + allow_files=True, + single_file=True), + "empty_files": attr.string_list(default=[]), "resources": attr.label_list( - default = [], - allow_files = True, - ), + default=[], + allow_files=True), "flatten_resources": attr.label_list( - default = [], - allow_files = True, - ), - }, - executable = True, -) + default=[], + allow_files=True), + }, + ) |