Fix the installer and fixing the package shiped into binary version o…

…f Bazel. -- MOS_MIGRATED_REVID=102567966
bazelbuild · Sep 8, 2015 · 2c2e70d · 2c2e70d
1 parent 17ef915
commit 2c2e70d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/scripts/packages/template_bin.sh b/scripts/packages/template_bin.sh
@@ -135,7 +135,7 @@ echo -n "Uncompressing."
 if [ -f "${bin}/bazel" ]; then
   rm -f "${bin}/bazel"
 fi
-if [ -d "${base}" && -x "${base}/bin/bazel" ]; then
+if [ -d "${base}" -a -x "${base}/bin/bazel" ]; then
   rm -fr "${base}"
 fi
 

diff --git a/tools/BUILD b/tools/BUILD
@@ -22,8 +22,7 @@ filegroup(
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]) + [
-        "//tools/android:srcs",
-        "//tools/android/jack:srcs",
+        "//tools/build_defs/d:srcs",
         "//tools/build_defs/docker:srcs",
         "//tools/build_rules/appengine:srcs",
         "//tools/build_rules/closure:srcs",

diff --git a/tools/build_defs/d/BUILD b/tools/build_defs/d/BUILD
@@ -1,5 +1,10 @@
 package(default_visibility = ["//visibility:public"])
 
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
+
 config_setting(
     name = "darwin",
     values = {"host_cpu": "darwin"},