Skip to content

Revert #1058 and #1059 #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Revert #1058 and #1059 #1061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions private/rules/jvm_import.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,17 @@ def _jvm_import_impl(ctx):
workspace_name = visible_name,
)

java_runtime = ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"].java_runtime
add_jar_manifest_entry_jar = ctx.file._add_jar_manifest_entry

injar = ctx.files.jars[0]
if ctx.attr._stamp_manifest[StampManifestProvider].stamp_enabled:
outjar = ctx.actions.declare_file("processed_" + injar.basename, sibling = injar)
args = ctx.actions.args()
args.add_all(["-jar", add_jar_manifest_entry_jar])
args.add_all(["--source", injar, "--output", outjar])
args.add_all(["--manifest-entry", "Target-Label:{target_label}".format(target_label = label)])
ctx.actions.run(
executable = java_runtime.java_executable_exec_path,
executable = ctx.executable._add_jar_manifest_entry,
arguments = [args],
inputs = [injar, add_jar_manifest_entry_jar],
inputs = [injar],
outputs = [outjar],
tools = java_runtime.files,
mnemonic = "StampJarManifest",
progress_message = "Stamping the manifest of %s" % ctx.label,
)
Expand All @@ -47,7 +42,6 @@ def _jvm_import_impl(ctx):

compilejar = ctx.actions.declare_file("header_" + injar.basename, sibling = injar)
args = ctx.actions.args()
args.add_all(["-jar", add_jar_manifest_entry_jar])
args.add_all(["--source", outjar, "--output", compilejar])

# We need to remove the `Class-Path` entry since bazel 4.0.0 forces `javac`
Expand All @@ -62,11 +56,10 @@ def _jvm_import_impl(ctx):
args.add("--make-safe")

ctx.actions.run(
executable = java_runtime.java_executable_exec_path,
executable = ctx.executable._add_jar_manifest_entry,
arguments = [args],
inputs = [outjar, add_jar_manifest_entry_jar],
inputs = [outjar],
outputs = [compilejar],
tools = java_runtime.files,
mnemonic = "CreateCompileJar",
progress_message = "Creating compile jar for %s" % ctx.label,
)
Expand Down Expand Up @@ -108,15 +101,14 @@ jvm_import = rule(
default = False,
),
"_add_jar_manifest_entry": attr.label(
allow_single_file = True,
executable = True,
cfg = "exec",
default = "//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:AddJarManifestEntry_deploy.jar",
default = "//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:AddJarManifestEntry",
),
"_stamp_manifest": attr.label(
default = "@rules_jvm_external//settings:stamp_manifest",
),
},
implementation = _jvm_import_impl,
provides = [JavaInfo],
toolchains = ["@bazel_tools//tools/jdk:runtime_toolchain_type"],
)