diff options
author | 2015-08-21 13:35:10 +0000 | |
---|---|---|
committer | 2015-08-24 14:01:46 +0000 | |
commit | c8db70c7bc8f9cf916daac42010a4886b825fc63 (patch) | |
tree | 380733a12ad64d39fa1e1656b9845631942668c2 /src/main | |
parent | f99bb1c2c0de9e5e3c7b16e7e7a982a7c0bad815 (diff) |
Improve the JDK and JRE filegroups to include all the necessary parts. Then fix the Skylark rules and tests that so far failed to declare dependencies on the JVM.
--
MOS_MIGRATED_REVID=101215495
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE | 5 | ||||
-rw-r--r-- | src/main/tools/jdk.BUILD | 45 |
2 files changed, 49 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE index af4bf316a1..82def355d0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE @@ -45,6 +45,11 @@ bind( ) bind( + name = "jre-default", + actual = "@local-jdk//:jre-default", +) + +bind( name = "jdk-default", actual = "@local-jdk//:jdk-default", ) diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD index 871fd9e32a..f67ac2f838 100644 --- a/src/main/tools/jdk.BUILD +++ b/src/main/tools/jdk.BUILD @@ -49,8 +49,51 @@ filegroup( ) filegroup( + name = "jre-bin", + srcs = glob(["jre/bin/**"]), +) + +filegroup( + name = "jre-lib", + srcs = glob(["jre/lib/**"]), +) + +filegroup( + name = "jre-default", + srcs = [ + ":jre-bin", + ":jre-lib", + ], +) + +filegroup( + name = "jdk-bin", + srcs = glob(["bin/**"]), +) + +filegroup( + name = "jdk-include", + srcs = glob(["include/**"]), +) + +filegroup( + name = "jdk-lib", + srcs = glob( + ["lib/**"], + exclude= [ + "lib/missioncontrol/**", + "lib/visualvm/**", + ]), +) + +filegroup( name = "jdk-default", - srcs = glob(["bin/*"]), + srcs = [ + ":jdk-bin", + ":jdk-include", + ":jdk-lib", + ":jre-default", + ], ) filegroup( |