From 6e945ced1f3d61d2497626db9138127bcb302c77 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Thu, 4 Jan 2018 09:42:50 -0800 Subject: Update javac version to 9+181-r4173-1 Change-Id: I05fa85967317c4581081adfc620e24a7c6322669 --- scripts/bootstrap/compile.sh | 2 +- src/create_embedded_tools.py | 4 ++-- src/test/shell/testenv.sh | 4 ++-- third_party/java/jdk/README.md | 13 ------------- third_party/java/jdk/langtools/BUILD | 8 ++++---- .../java/jdk/langtools/javac-9+181-r4173-1.jar | Bin 0 -> 6885456 bytes .../java/jdk/langtools/javac-9+181-r4173-1.srcjar | Bin 0 -> 4394459 bytes .../java/jdk/langtools/javac-9-dev-r4023-3.jar | Bin 6848376 -> 0 bytes .../java/jdk/langtools/javac-9-dev-r4023-3.srcjar | Bin 4341922 -> 0 bytes third_party/java/jdk/langtools/javac.jar | Bin 2912761 -> 0 bytes third_party/java/jdk/langtools/javac.srcjar | Bin 9223603 -> 0 bytes 11 files changed, 9 insertions(+), 22 deletions(-) create mode 100644 third_party/java/jdk/langtools/javac-9+181-r4173-1.jar create mode 100644 third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar delete mode 100644 third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar delete mode 100644 third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar delete mode 100644 third_party/java/jdk/langtools/javac.jar delete mode 100644 third_party/java/jdk/langtools/javac.srcjar diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index c7b26ccc72..3fbd6333a8 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-4.jar | grep -Fv /javac-9-dev-4023-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ") +LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ") GRPC_JAVA_VERSION=1.7.0 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ") GUAVA_VERSION=23.1 diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py index 17d747fafc..352069c411 100644 --- a/src/create_embedded_tools.py +++ b/src/create_embedded_tools.py @@ -35,8 +35,8 @@ output_paths = [ ('*JacocoCoverage*_deploy.jar', lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'), ('*turbine_deploy.jar', lambda x: 'tools/jdk/turbine_deploy.jar'), - ('*javac-9-dev-r4023-3.jar', - lambda x: 'third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar'), + ('*javac-9+181-r4173-1.jar', + lambda x: 'third_party/java/jdk/langtools/javac-9+181-r4173-1.jar'), ('*SingleJar_deploy.jar', lambda x: 'tools/jdk/singlejar/SingleJar_deploy.jar'), ('*GenClass_deploy.jar', lambda x: 'tools/jdk/GenClass_deploy.jar'), diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index b8bc2e02b7..e0bca651c3 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -413,8 +413,8 @@ function create_new_workspace() { copy_tools_directory - [ -e third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar ] \ - || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar + [ -e third_party/java/jdk/langtools/javac-9+181-r4173-1.jar ] \ + || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9+181-r4173-1.jar touch WORKSPACE } diff --git a/third_party/java/jdk/README.md b/third_party/java/jdk/README.md index f158d77ee6..cfed43fd75 100644 --- a/third_party/java/jdk/README.md +++ b/third_party/java/jdk/README.md @@ -8,16 +8,3 @@ of the Java compiler code. This is the raw version of the Java compiler from [OpenJDK](https://openjdk.java.net) but compiled for a lower 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-r4023-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 -Java compiler (it depends on some internals of the Java compiler). - -To build a version of Bazel that can run on a JRE 7, we need to rely -on the version of JavaBuilder provided with Bazel 0.1.0 -(//third_party/java/jdk/javabuilder/JavaBuilder_0.1.0_deploy.jar) which works -with a Java compiler of OpenJDK 8 compiled to run on a JRE 7 -(//third_party/java/jdk/langtools/javac7.jar). diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD index 2e8422c192..cb1b4311db 100644 --- a/third_party/java/jdk/langtools/BUILD +++ b/third_party/java/jdk/langtools/BUILD @@ -12,17 +12,17 @@ filegroup( srcs = [ "BUILD", "LICENSE", - "javac-9-dev-r4023-3.jar", - "javac-9-dev-r4023-3.srcjar", + "javac-9+181-r4173-1.jar", + "javac-9+181-r4173-1.srcjar", ], ) java_import( name = "javac", - jars = ["javac-9-dev-r4023-3.jar"], + jars = ["javac-9+181-r4173-1.jar"], ) filegroup( name = "javac_jar", - srcs = ["javac-9-dev-r4023-3.jar"], + srcs = ["javac-9+181-r4173-1.jar"], ) diff --git a/third_party/java/jdk/langtools/javac-9+181-r4173-1.jar b/third_party/java/jdk/langtools/javac-9+181-r4173-1.jar new file mode 100644 index 0000000000..168633db13 Binary files /dev/null and b/third_party/java/jdk/langtools/javac-9+181-r4173-1.jar differ diff --git a/third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar b/third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar new file mode 100644 index 0000000000..8a1f20f606 Binary files /dev/null and b/third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar differ diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar b/third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar deleted file mode 100644 index 362885da49..0000000000 Binary files a/third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar deleted file mode 100644 index 6a9e39d52b..0000000000 Binary files a/third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac.jar b/third_party/java/jdk/langtools/javac.jar deleted file mode 100644 index cdb1db2ecd..0000000000 Binary files a/third_party/java/jdk/langtools/javac.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac.srcjar b/third_party/java/jdk/langtools/javac.srcjar deleted file mode 100644 index cab9de7905..0000000000 Binary files a/third_party/java/jdk/langtools/javac.srcjar and /dev/null differ -- cgit v1.2.3