wip

bazeltools · Jul 18, 2024 · 9faeddb · 9faeddb
1 parent 79b881b
commit 9faeddb
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/jar_jar_aspect.bzl b/jar_jar_aspect.bzl
@@ -19,6 +19,7 @@ def merge_shaded_jars_info(shaded_jars):
 # To name the files in a helpful manner
 # we strip off from the last '.' and will then append '-shaded.jar'
 def __get_no_ext_name(jar_path):
+    print("jar_path_type: ", type(jar_path))
     fname = jar_path.basename
     last_indx = fname.rindex(".")
     if last_indx <= 0:
@@ -76,17 +77,19 @@ def _jar_jar_aspect_impl(target, ctx):
     java_info_runtime_deps = []
 
     if ConfigJavaInfo in target:
-        print("target: ", target)
-        print("target[ConfigJavaInfo]")
-        print(target[ConfigJavaInfo])
+        # print("target: ", target)
+        # print("target[ConfigJavaInfo]
+        # print(target[ConfigJavaInfo])
         #print([e.config_java_info for e in target[ConfigJavaInfo].config_java_info])
         #current_jars.extend([e.config_java_info.runtime_output_jars for e in target[ConfigJavaInfo].config_java_info])
         #current_jars.extend(target[ConfigJavaInfo].config_java_info.runtime_output_jars)
         java_info_runtime_deps.append(target[ConfigJavaInfo].config_java_info)
-        print("target[ConfigJavaInfo].config_java_info.runtime_output_jars")
+        current_jars.extend([e.class_jar for e in target[ConfigJavaInfo].config_java_info.java_outputs])
+        #current_jars.extend([e.class_jar for e in target[JavaInfo].java_outputs])
+        #print("target[ConfigJavaInfo].config_java_info.runtime_output_jars")
         #print(target[ConfigJavaInfo].config_java_info.runtime_output_jars)
-    print("current jars after if statement")
-    print(current_jars)
+    # print("current jars after if statement")
+    # print(current_jars)
     toolchain_cfg = ctx.toolchains["//toolchains:toolchain_type"]
     rules = toolchain_cfg.rules.files.to_list()[0]
     duplicate_to_warn = toolchain_cfg.duplicate_class_to_warn
@@ -100,11 +103,11 @@ def _jar_jar_aspect_impl(target, ctx):
 
     transitive_shaded=[]
     #java_info_runtime_deps = []
-    print("ctx.rule: ", ctx.rule)
-    print("ctx.rule: ", dir(ctx.rule))
+    # print("ctx.rule: ", ctx.rule)
+    # print("ctx.rule: ", dir(ctx.rule))
     if hasattr(ctx.rule.attr, "runtime_deps"):
-        print("target has runtime_deps: ")
-        print(target)
+        #print("target has runtime_deps: ")
+        #print(target)
         for d in ctx.rule.attr.runtime_deps:
             if ShadedJars in d:
                 shaded_jars = d[ShadedJars]
@@ -133,7 +136,6 @@ def _jar_jar_aspect_impl(target, ctx):
     java_outputs = []
     output_files = []
     for input_jar in current_jars:
-        print("input_jar: ", input_jar)
         output_file_name = "{prefix}-shaded.jar".format(prefix = __get_no_ext_name(input_jar))
         output_file = ctx.actions.declare_file(output_file_name)
         output_files.append(output_file)