diff options
author | Liam Miller-Cushon <cushon@google.com> | 2017-02-16 00:11:49 -0800 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-02-22 13:03:53 +0100 |
commit | 2e689c29d5fc8a747216563235e905b1b62d63b0 (patch) | |
tree | 15528ba474239e0aface6489ada06a5c6100df92 | |
parent | 2fe062bf34657e1794dd83d09edbf6b2f6b4979f (diff) |
Add javac-9-dev-r3297-3
https://github.com/google/error-prone-javac/archive/9-dev-r3297-3.zip
Change-Id: I78b073c8db4a525d19b73650ed8d3a12b10ff86a
-rwxr-xr-x | scripts/bootstrap/compile.sh | 2 | ||||
-rwxr-xr-x | src/create_embedded_tools.sh | 6 | ||||
-rwxr-xr-x | src/test/shell/testenv.sh | 4 | ||||
-rw-r--r-- | third_party/README.md | 2 | ||||
-rw-r--r-- | third_party/java/jdk/README.md | 2 | ||||
-rw-r--r-- | third_party/java/jdk/langtools/BUILD | 8 | ||||
-rw-r--r-- | third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar | bin | 0 -> 5096086 bytes | |||
-rw-r--r-- | third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar | bin | 0 -> 3693828 bytes |
8 files changed, 12 insertions, 12 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index 03880a2679..95b59d3556 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -17,7 +17,7 @@ # Script for building bazel from scratch without bazel PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto) -LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-1.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") +LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") GRPC_JAVA_VERSION=0.15.0 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ") LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}" diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index a3f0ed76d8..f478b9f3ab 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -44,7 +44,7 @@ for i in $*; do *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;; *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;; *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;; - *javac-9-dev-r3297-1.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ;; + *javac-9-dev-r3297-3.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ;; *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;; *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;; *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;; @@ -68,9 +68,9 @@ for i in $*; do chmod u+w "${PACKAGE_DIR}/${OUTPUT_PATH}" done -if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ]; then +if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ]; then cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \ - ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar + ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar fi cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index ec04b64dbc..1a59e06c56 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -354,8 +354,8 @@ function create_new_workspace() { copy_tools_directory - [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ] \ - || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar + [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ] \ + || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar touch WORKSPACE } diff --git a/third_party/README.md b/third_party/README.md index cf9a7d2b87..afa5e049e8 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -166,7 +166,7 @@ a minimal set of extra dependencies. ## [javac](https://github.com/google/error-prone-javac) -* Version: 1.9.0-dev-r2973-2 (javac7.jar) and 1.9.0-dev-r2644-2 (javac-9-dev-r3297-1.jar) +* Version: 9-dev-r3297-3 (javac-9-dev-r3297-3.jar) * License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file). ## [jarjar](https://code.google.com/p/jarjar/) diff --git a/third_party/java/jdk/README.md b/third_party/java/jdk/README.md index 96881e66b8..84e59cf35b 100644 --- a/third_party/java/jdk/README.md +++ b/third_party/java/jdk/README.md @@ -10,7 +10,7 @@ version of the JRE. Those builds are vendored in //third_party/java/jdk/langtools. Currently Bazel supports running on a JRE 8 only because the default Java -compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar) is the +compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar) is the Java compiler of OpenJDK 9 compiled to run on a JRE 8. This cannot be built to run on a JRE 7 because of code incompatibility. Bazel's JavaBuilder at HEAD cannot be linked with earlier version of the diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD index b529d2a45d..579adf4256 100644 --- a/third_party/java/jdk/langtools/BUILD +++ b/third_party/java/jdk/langtools/BUILD @@ -19,22 +19,22 @@ filegroup( "//conditions:default": [ "BUILD", "LICENSE", - "javac-9-dev-r3297-1.jar", - "javac-9-dev-r3297-1.srcjar", + "javac-9-dev-r3297-3.jar", + "javac-9-dev-r3297-3.srcjar", ], }), ) java_import( name = "javac", - jars = ["javac-9-dev-r3297-1.jar"], + jars = ["javac-9-dev-r3297-3.jar"], ) filegroup( name = "javac_jar", srcs = select({ "//tools/jdk:jdk7": ["javac7.jar"], - "//conditions:default": ["javac-9-dev-r3297-1.jar"], + "//conditions:default": ["javac-9-dev-r3297-3.jar"], }), ) diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar b/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar Binary files differnew file mode 100644 index 0000000000..9f612cd3bb --- /dev/null +++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar Binary files differnew file mode 100644 index 0000000000..2dea0ddabe --- /dev/null +++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar |