Skip to content

Commit

Permalink
Add Oracle JDK 7/8 as optional dependencies.
Browse files Browse the repository at this point in the history
With this change, `oracle-java7-installer` and `oracle-java8-installer` become
alternatives to satisfy the JDK dependency and thus can be implicitly installed
when someone just asks to install Bazel by itself.

Resolves issue bazelbuild#1821.
  • Loading branch information
mbrukman committed Nov 25, 2016
1 parent 034de95 commit 03395e9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/packages/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ pkg_deb(
data = ":debian-data",
depends = select({
"//tools/jdk:jdk7": [
"java7-jdk | java7-sdk",
"java7-jdk | java7-sdk | oracle-java7-installer",
],
"//conditions:default": [
"google-jdk | java8-jdk | java8-sdk",
"google-jdk | java8-jdk | java8-sdk | oracle-java8-installer",
],
}) + [
"g++",
Expand Down
2 changes: 1 addition & 1 deletion scripts/packages/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Package: bazel
Section: contrib/devel
Priority: optional
Architecture: amd64
Depends: google-jdk | java8-jdk | java8-sdk, g++, zlib1g-dev, bash-completion
Depends: google-jdk | java8-jdk | java8-sdk | oracle-java8-installer, g++, zlib1g-dev, bash-completion
Conflicts: openjdk-9-jdk
Description: Bazel is a tool that automates software builds and tests.
Supported build tasks include running compilers and linkers to produce
Expand Down

0 comments on commit 03395e9

Please sign in to comment.