From 279a061eb0873df4e8ea71755684037b4bdd511f Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <aehlig@google.com>
Date: Fri, 11 Nov 2016 09:51:44 +0000
Subject: Add the distribution artifact to the list of release files

--
Change-Id: I09053cbd476e5f8bb5bdb9f272ad414d165f6d9f
Reviewed-on: https://bazel-review.googlesource.com/#/c/7131
MOS_MIGRATED_REVID=138855685
---
 BUILD                  | 2 ++
 scripts/ci/build.sh    | 4 +++-
 scripts/packages/BUILD | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BUILD b/BUILD
index e6e2a2a000..15d5460c0e 100644
--- a/BUILD
+++ b/BUILD
@@ -68,4 +68,6 @@ genrule(
     outs = ["bazel-distfile.zip"],
     cmd = "$(location :combine_distfiles.sh) $@ $(SRCS)",
     tools = ["combine_distfiles.sh"],
+    # Public but bazel-only visibility.
+    visibility = ["//:__subpackages__"],
 )
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 06c10261e2..1adaffeab1 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -149,6 +149,7 @@ function bazel_build() {
     fi
     cp bazel-genfiles/site/jekyll-tree.tar $1/www.bazel.build.tar
     cp bazel-genfiles/scripts/packages/README.md $1/README.md
+    cp bazel-genfiles/bazel-distfile.zip $1/bazel-${release_label}-dist.zip
   fi
 }
 
@@ -441,7 +442,8 @@ function bazel_release() {
     for file in $folder/*; do
       local filename=$(basename $file)
       if [ "$filename" != README.md ]; then
-        if [ "$filename" == "bazel.dsc" ] || [ "$filename" == "bazel.tar.gz" ] ; then
+          if [ "$filename" == "bazel.dsc" ] || [ "$filename" == "bazel.tar.gz" ] \
+                 || [ "$filename" =~ "bazel-(.*)-dist.zip" ]  ; then
           local destfile=${tmpdir}/$filename
         elif [[ "$file" =~ /([^/]*)(\.[^\./]+)$ ]]; then
           local destfile=${tmpdir}/${BASH_REMATCH[1]}-${platform}${BASH_REMATCH[2]}
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index f80fad42e8..ca73a8f2a7 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -22,6 +22,7 @@ filegroup(
             ":generate-package-info",
             ":bazel-debian",
             ":bazel-debian-src",
+            "//:bazel-distfile",
         ],
     }),
 )
-- 
cgit v1.2.3