Fix java command file in plugin

e43ef305d767fb94adc0f4f6e3901156fc3b7939

1 files changed, 10 insertions, 11 deletions

diff --git a/build/scripts/compile_java.py b/build/scripts/compile_java.py
index ef744afdbd..26cf8d69a7 100644
--- a/build/scripts/compile_java.py
+++ b/build/scripts/compile_java.py
@@ -1,6 +1,6 @@
 import argparse
 import contextlib
-from distutils import dir_util
+from shutil import copytree
 import os
 import shutil
 import subprocess as sp
@@ -9,6 +9,7 @@ import zipfile
 import sys
 
 import process_command_files as pcf
+import java_command_file as jcf
 
 
 def parse_args(args):
@@ -77,12 +78,10 @@ def main():
             ts.write(' '.join(srcs))
 
     if ktsrcs:
-        temp_kt_sources_file = 'temp.kt.sources.list'
-        with open(temp_kt_sources_file, 'w') as ts:
-            ts.write(' '.join(ktsrcs + srcs))
         kt_classes_dir = 'kt_cls'
         mkdir_p(kt_classes_dir)
-        sp.check_call(
+
+        jcf.call_java_with_command_file(
             [
                 opts.java_bin,
                 '-Didea.max.content.load.filesize=30720',
@@ -93,16 +92,16 @@ def main():
                 '-d',
                 kt_classes_dir,
             ]
-            + ktc_opts
-            + ['@' + temp_kt_sources_file]
+            + ktc_opts,
+            wrapped_args=ktsrcs + srcs,
         )
         classpath = os.pathsep.join([kt_classes_dir, classpath])
 
     if srcs:
-        sp.check_call(
+        jcf.call_java_with_command_file(
             [opts.javac_bin, '-nowarn', '-g', '-classpath', classpath, '-encoding', 'UTF-8', '-d', classes_dir]
-            + javac_opts
-            + ['@' + temp_sources_file]
+            + javac_opts,
+            wrapped_args=srcs,
         )
 
     for s in jsrcs:
@@ -115,7 +114,7 @@ def main():
                 zf.extractall(classes_dir)
 
     if ktsrcs:
-        dir_util.copy_tree(kt_classes_dir, classes_dir)
+        copytree(kt_classes_dir, classes_dir, dirs_exist_ok=True)
 
     if opts.vcs_mf:
         sp.check_call([opts.jar_bin, 'cfm', opts.jar_output, opts.vcs_mf, os.curdir], cwd=classes_dir)