Skip to content

Commit

Permalink
Remove ijar from the bazel binary.
Browse files Browse the repository at this point in the history
  • Loading branch information
iirina committed Mar 14, 2019
1 parent e0864d0 commit c1ba3bc
Show file tree
Hide file tree
Showing 15 changed files with 629 additions and 70 deletions.
29 changes: 21 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,25 @@ distdir_tar(
archives = [
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
"f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
"java_tools_pkg-0.6.tar.gz",
"java_tools_javac10_linux-x86_64-v1.0.tar.gz",
"java_tools_javac10_windows-x86_64-v1.0.zip",
"java_tools_javac10_darwin-x86_64-v1.0.tar.gz",
],
dirname = "derived/distdir",
sha256 = {
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
"f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
"java_tools_pkg-0.6.tar.gz": "81ed7c5231cd67df95dc4894a5cc32af67d29f388ee7117809531b948e61fca9",
"java_tools_javac10_linux-x86_64-v1.0.tar.gz": "1be7503530ce263f6c90139281f45e9ae4f681a8a362b93ad1ddef4f6db74ce5",
"java_tools_javac10_windows-x86_64-v1.0.zip": "15840585eb4db06c2ecc0e14749f96a0e253d9cee2c17b724fc60340d35c6a07",
"java_tools_javac10_darwin-x86_64-v1.0.tar.gz": "3cce2fa63c47a866eaa61359a8ae3f46da74d5e2ce1eda8ab102586f94b35892",
},
urls = {
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": ["https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"],
"f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": ["https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"],
"java_tools_pkg-0.6.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.6.tar.gz"],
"java_tools_pkg-0.5.1.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz"],
"java_tools_javac10_linux-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.tar.gz"],
"java_tools_javac10_windows-x86_64-v1.0.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0.zip"],
"java_tools_javac10_darwin-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-x86_64-v1.0.tar.gz"],
},
)

Expand Down Expand Up @@ -232,8 +239,8 @@ http_archive(
sha256 = "4b1468b254a572dbe134cc1fd7c6eab1618a72acd339749ea343bd8f55c3b7eb",
strip_prefix = "bazel-toolchains-d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
],
)

Expand Down Expand Up @@ -287,7 +294,9 @@ distdir_tar(
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip",
"jdk10-server-release-1804.tar.xz",
"java_tools_pkg-0.6.tar.gz",
"java_tools_javac10_linux-x86_64-v1.0.tar.gz",
"java_tools_javac10_windows-x86_64-v1.0.zip",
"java_tools_javac10_darwin-x86_64-v1.0.tar.gz",
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz",
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz",
"zulu11.2.3-jdk11.0.1-win_x64.zip",
Expand All @@ -305,7 +314,9 @@ distdir_tar(
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
"jdk10-server-release-1804.tar.xz": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
"java_tools_pkg-0.6.tar.gz": "81ed7c5231cd67df95dc4894a5cc32af67d29f388ee7117809531b948e61fca9",
"java_tools_javac10_linux-x86_64-v1.0.tar.gz": "1be7503530ce263f6c90139281f45e9ae4f681a8a362b93ad1ddef4f6db74ce5",
"java_tools_javac10_windows-x86_64-v1.0.zip": "15840585eb4db06c2ecc0e14749f96a0e253d9cee2c17b724fc60340d35c6a07",
"java_tools_javac10_darwin-x86_64-v1.0.tar.gz": "3cce2fa63c47a866eaa61359a8ae3f46da74d5e2ce1eda8ab102586f94b35892",
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75",
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb",
"zulu11.2.3-jdk11.0.1-win_x64.zip": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3",
Expand All @@ -322,7 +333,9 @@ distdir_tar(
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz"],
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip"],
"jdk10-server-release-1804.tar.xz": ["https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz"],
"java_tools_pkg-0.6.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.6.tar.gz"],
"java_tools_javac10_linux-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.tar.gz"],
"java_tools_javac10_windows-x86_64-v1.0.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0.zip"],
"java_tools_javac10_darwin-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-x86_64-v1.0.tar.gz"],
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz"],
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz"],
"zulu11.2.3-jdk11.0.1-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip"],
Expand Down
3 changes: 2 additions & 1 deletion scripts/bootstrap/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,9 @@ EOF
link_children "${PWD}" tools/python "${BAZEL_TOOLS_REPO}"
link_children "${PWD}" tools "${BAZEL_TOOLS_REPO}"

# The BUILD file needed for @remote_java_tools.
# The BUILD file needed for @remote_java_tools_*.
link_file "${PWD}/third_party/java/java_tools/BUILD.pkg" "${BAZEL_TOOLS_REPO}/tools/jdk/BUILD.pkg"
link_file "${PWD}/third_party/java/java_tools/BUILD-windows.pkg" "${BAZEL_TOOLS_REPO}/tools/jdk/BUILD-windows.pkg"

# Set up @bazel_tools//platforms properly
mkdir -p ${BAZEL_TOOLS_REPO}/platforms
Expand Down
3 changes: 1 addition & 2 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,8 @@ JAVA_TOOLS = [
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
"//src/tools/singlejar:embedded_tools",
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:embedded_tools",
"//third_party/ijar",
# TODO(#6316): Move this target to the remote java tools archive.
"//third_party/ijar:zipper",
"//third_party/ijar:embedded_tools",
"//third_party/java/jacoco:srcs",
] + select({
"//src/conditions:arm": [],
Expand Down
3 changes: 1 addition & 2 deletions src/create_embedded_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@
('*jarjar_command_deploy.jar',
lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
('*BUILD.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
('*BUILD-windows.pkg', lambda x: 'tools/jdk/BUILD-windows.pkg'),
('*BUILD.javalangtools', lambda x: 'third_party/java/jdk/langtools/BUILD'),
('*singlejar_local.exe', lambda x: 'tools/jdk/singlejar/singlejar.exe'),
('*singlejar_local', lambda x: 'tools/jdk/singlejar/singlejar'),
('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'),
('*def_parser.exe', lambda x: 'tools/def_parser/def_parser.exe'),
('*ijar.exe', lambda x: 'tools/jdk/ijar/ijar.exe'),
('*ijar', lambda x: 'tools/jdk/ijar/ijar'),
('*zipper.exe', lambda x: 'tools/zip/zipper/zipper.exe'),
('*zipper', lambda x: 'tools/zip/zipper/zipper'),
('*src/objc_tools/*',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,29 @@ http_archive(
)

http_archive(
name = "remote_java_tools",
name = "remote_java_tools_linux",
build_file = "@bazel_tools//tools/jdk:BUILD.pkg",
sha256 = "81ed7c5231cd67df95dc4894a5cc32af67d29f388ee7117809531b948e61fca9",
sha256 = "1be7503530ce263f6c90139281f45e9ae4f681a8a362b93ad1ddef4f6db74ce5",
urls = [
"https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.6.tar.gz",
"https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.tar.gz",
],
)

http_archive(
name = "remote_java_tools_windows",
build_file = "@bazel_tools//tools/jdk:BUILD-windows.pkg",
sha256 = "15840585eb4db06c2ecc0e14749f96a0e253d9cee2c17b724fc60340d35c6a07",
urls = [
"https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0.zip",
],
)

http_archive(
name = "remote_java_tools_darwin",
build_file = "@bazel_tools//tools/jdk:BUILD.pkg",
sha256 = "3cce2fa63c47a866eaa61359a8ae3f46da74d5e2ce1eda8ab102586f94b35892",
urls = [
"https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-x86_64-v1.0.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/bazel/bazel_java_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ EOF
cat > java/testrunners/BUILD <<EOF
java_library(name = "test_runner",
srcs = ['TestRunner.java'],
deps = ['@remote_java_tools//:java_tools/Runner_deploy.jar'],
deps = ['@bazel_tools//tools/jdk:TestRunner'],
)
java_test(name = "Tests",
Expand Down
1 change: 0 additions & 1 deletion src/test/shell/bazel/testdata/embedded_tools_srcs_deps
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//tools/test:tw_lib
//tools/test:xml
//third_party/ijar:zipper
//third_party/ijar:ijar
//third_party/ijar:zip
//third_party/ijar:zlib_client
//third_party/ijar:platform_utils
Expand Down
2 changes: 2 additions & 0 deletions third_party/java/java_tools/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ filegroup(
srcs = [
"BUILD.javalangtools",
"BUILD.pkg",
"BUILD-windows.pkg",
],
)

Expand All @@ -25,5 +26,6 @@ filegroup(
"//conditions:default": [],
}) + [
"BUILD.pkg",
"BUILD-windows.pkg",
],
)
223 changes: 223 additions & 0 deletions third_party/java/java_tools/BUILD-windows.pkg
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
package(default_visibility = ["//visibility:public"])

licenses(["notice"]) # Apache 2.0

filegroup(
name = "ExperimentalRunner",
srcs = ["java_tools/ExperimentalRunner_deploy.jar"],
)

filegroup(
name = "GenClass",
srcs = ["java_tools/GenClass_deploy.jar"],
)

filegroup(
name = "JacocoCoverage",
srcs = ["java_tools/JacocoCoverage_jarjar_deploy.jar"],
)

filegroup(
name = "JavaBuilder",
srcs = ["java_tools/JavaBuilder_deploy.jar"],
)

filegroup(
name = "Runner",
srcs = ["java_tools/Runner_deploy.jar"],
)

filegroup(
name = "VanillaJavaBuilder",
srcs = ["java_tools/VanillaJavaBuilder_deploy.jar"],
)

filegroup(
name = "SingleJar",
srcs = ["java_tools/bazel-singlejar_deploy.jar"],
)

filegroup(
name = "JarJar",
srcs = ["java_tools/jarjar_command_deploy.jar"],
)

filegroup(
name = "Turbine",
srcs = ["java_tools/turbine_deploy.jar"],
)

filegroup(
name = "TurbineDirect",
srcs = ["java_tools/turbine_direct_binary_deploy.jar"],
)

filegroup(
name = "javac_jar",
srcs = ["java_tools/javac-9+181-r4173-1.jar"],
)

filegroup(
name = "jdk_compiler_jar",
srcs = ["java_tools/jdk_compiler.jar"],
)

filegroup(
name = "java_compiler_jar",
srcs = ["java_tools/java_compiler.jar"],
)

config_setting(
name = "remote",
values = {"define": "EXECUTOR=remote"},
visibility = ["//visibility:public"],
)

alias(
name = "ijar",
actual = select({
":remote": ":ijar_cc_binary",
"//conditions:default": ":ijar_prebuilt_binary"
})
)

filegroup(
name = "ijar_prebuilt_binary",
srcs = ["java_tools/ijar/ijar.exe"],
)

cc_binary(
name = "ijar_cc_binary",
srcs = [
"java_tools/ijar/classfile.cc",
"java_tools/ijar/ijar.cc",
],
deps = [":zip"],
)

cc_library(
name = "zip",
srcs = [
"java_tools/ijar/zip.cc",
"java_tools/ijar/mapped_file_windows.cc",
],
hdrs = [
"java_tools/ijar/common.h",
"java_tools/ijar/mapped_file.h",
"java_tools/ijar/zip.h",
],
deps = [
":platform_utils",
":zlib_client",
":errors",
":filesystem",
":logging",
":strings",
],
)

cc_library(
name = "platform_utils",
srcs = ["java_tools/ijar/platform_utils.cc"],
hdrs = [
"java_tools/ijar/common.h",
"java_tools/ijar/platform_utils.h",
],
visibility = ["//visibility:private"],
deps = [
":errors",
":filesystem",
":logging",
],
)

cc_library(
name = "filesystem",
srcs = [
"java_tools/src/main/cpp/util/file.cc",
"java_tools/src/main/cpp/util/path.cc",
"java_tools/src/main/cpp/util/file_windows.cc",
"java_tools/src/main/cpp/util/path_windows.cc",
],
hdrs = [
"java_tools/src/main/cpp/util/file.h",
"java_tools/src/main/cpp/util/file_platform.h",
"java_tools/src/main/cpp/util/path.h",
"java_tools/src/main/cpp/util/path_platform.h",
],
deps = [
":blaze_exit_code",
":errors",
":logging",
":strings",
":lib-file"
],
)


cc_library(
name = "errors",
srcs = ["java_tools/src/main/cpp/errors_windows.cc"],
hdrs = ["java_tools/src/main/cpp/errors.h"],
deps = [
":logging",
":port",
":strings",
],
)

cc_library(
name = "strings",
srcs = ["java_tools/src/main/cpp/strings.cc"],
hdrs = ["java_tools/src/main/cpp/strings.h"],
# Automatically propagate the symbol definition to rules depending on this.
defines = [
"BLAZE_OPENSOURCE",
],
deps = [":blaze_exit_code"],
)

cc_library(
name = "blaze_exit_code",
hdrs = ["java_tools/src/main/cpp/exit_code.h"],
)


cc_library(
name = "port",
srcs = ["java_tools/src/main/cpp/port.cc"],
hdrs = ["java_tools/src/main/cpp/port.h"],
)

cc_library(
name = "logging",
srcs = ["java_tools/src/main/cpp/logging.cc"],
hdrs = ["java_tools/src/main/cpp/logging.h"],
deps = [
":blaze_exit_code",
":strings",
],
)

cc_library(
name = "zlib_client",
srcs = ["java_tools/ijar/zlib_client.cc"],
hdrs = [
"java_tools/ijar/common.h",
"java_tools/ijar/zlib_client.h",
],
deps = ["//java_tools/zlib"],
)

cc_library(
name = "lib-file",
srcs = ["java_tools/src/main/native/windows/file.cc"],
hdrs = ["java_tools/src/main/native/windows/file.h"],
deps = [":lib-util"],
)

cc_library(
name = "lib-util",
srcs = ["java_tools/src/main/native/windows/util.cc"],
hdrs = ["java_tools/src/main/native/windows/util.h"],
)
Loading

0 comments on commit c1ba3bc

Please sign in to comment.