commit 4580e49ad88c74ced5c699edbed943aea482f498
author Damien Martin-Guillerez <dmarting@google.com> Thu Jan 07 18:10:21 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Thu Jan 07 21:48:52 2016 +0100
tree ef30255998f91138bf5c52ac8f339c354f4cfbda
parent 40ea9a27c0724108c357dd18ca19a80996e25582

Use openjdk7 as dependency for debian package of jdk7 flavor

Fixes #752.

--
MOS_MIGRATED_REVID=111614541

scripts/ci/build.sh

diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 5da4dfd..ac1d520 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -119,12 +119,13 @@
   export BAZEL_SKIP_TOOL_COMPILATION=tools/jdk/JavaBuilder_deploy.jar
   # Ignore JDK8 tests
   export BAZEL_TEST_FILTERS="-jdk8"
-  # And more ugly hack. Overwrite the BUILD file of JavaBuilder
-  # so we use the pre-built version in integration tests.
-  sed -i.bak 's/name = \"JavaBuilder\"/name = \"RealJavaBuilder\"/' \
-      src/java_tools/buildjar/BUILD
-  rm -f src/java_tools/buildjar/BUILD.bak
-  cat >>src/java_tools/buildjar/BUILD <<'EOF'
+  if ! grep -Fq 'RealJavaBuilder' src/java_tools/buildjar/BUILD; then
+    # And more ugly hack. Overwrite the BUILD file of JavaBuilder
+    # so we use the pre-built version in integration tests.
+    sed -i.bak 's/name = \"JavaBuilder\"/name = \"RealJavaBuilder\"/' \
+        src/java_tools/buildjar/BUILD
+    rm -f src/java_tools/buildjar/BUILD.bak
+    cat >>src/java_tools/buildjar/BUILD <<'EOF'
 genrule(
     name = "JavaBuilder",
     outs = ["JavaBuilder_deploy.jar"],
@@ -133,6 +134,7 @@
     visibility = ["//visibility:public"],
 )
 EOF
+  fi
 }
 
 # Main entry point for building bazel.
@@ -148,8 +150,11 @@
   fi
 
   if [[ "${JAVA_VERSION-}" =~ ^(1\.)?7$ ]]; then
+    JAVA_VERSION=1.7
     setup_jdk7
     release_label="${release_label}-jdk7"
+  else
+    JAVA_VERSION=1.8
   fi
 
   setup_android_repositories
@@ -165,6 +170,7 @@
   ./output/bazel --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc build \
       --embed_label=${release_label} --stamp \
       --workspace_status_command=scripts/ci/build_status_command.sh \
+      --define JAVA_VERSION=${JAVA_VERSION} \
       //scripts/packages/... || exit $?
 
   if [ -n "${1-}" ]; then

scripts/packages/BUILD

diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index fcc6a7d..15b39c4 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -151,14 +151,26 @@
     stamp = 1,
 )
 
+config_setting(
+    name = "jdk7",
+    values = {"define": "JAVA_VERSION=1.7"},
+)
+
 pkg_deb(
     name = "bazel-debian",
     architecture = "amd64",
     built_using = "bazel (HEAD)",
     data = ":debian-data",
-    depends = [
-        "openjdk-8-jdk",
-        "openjdk-8-source",
+    depends = select({
+        ":jdk7": [
+            "openjdk-7-jdk",
+            "openjdk-7-source",
+        ],
+        "//conditions:default": [
+            "openjdk-8-jdk",
+            "openjdk-8-source",
+        ],
+    }) + [
         "pkg-config",
         "zip",
         "g++",