From 6fd25147cc38305a5d0c92013d14d1f3704cdc41 Mon Sep 17 00:00:00 2001 From: hufeng Date: Thu, 14 Oct 2021 17:29:13 +0800 Subject: [PATCH 1/2] fix framework compiling issue Signed-off-by: hufeng Change-Id: I1e7cc4cebde6077a263a0651d9f4d4e92fc889a3 --- ts2panda/scripts/generate_plugin.py | 42 +++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/ts2panda/scripts/generate_plugin.py b/ts2panda/scripts/generate_plugin.py index 306e9696d2..263c4f5a74 100755 --- a/ts2panda/scripts/generate_plugin.py +++ b/ts2panda/scripts/generate_plugin.py @@ -104,17 +104,36 @@ def gen_java_method(input_arguments): # write method: getJsCode with open(js_src_file, "r") as input_src: - output.write(" public static String getJsCode() {%s" - % os.linesep) - output.write(" return%s" % os.linesep) lines = input_src.readlines() - for line in lines[:-1]: + # seperate lines into blocks + single_block_len = 1024 + total_len = len(lines) + for index, line in enumerate(lines): + block_index = index // single_block_len line = line.strip(os.linesep) line = line.replace("\"", "\\\"") - output.write(" \"%s\\n\" +%s" % (line, os.linesep)) - - last_line = lines[-1].replace("\"", "\\\"").strip(os.linesep) - output.write(" \"%s\";%s" % (last_line, os.linesep)) + # generate getJsCode%s + if (index % single_block_len == 0): + output.write(" private static String getJsCode%s(){%s" + % (block_index, os.linesep)) + output.write(" return%s" % os.linesep) + if (index % single_block_len == single_block_len - 1 or index == total_len -1): + output.write(" \"%s\";%s" % (line, os.linesep)) + output.write(" }%s" % os.linesep) + else: + output.write(" \"%s\\n\" +%s" % (line, os.linesep)) + block_num = (total_len // single_block_len) + 1 + if total_len % single_block_len == 0: + block_num = total_len // single_block_len + # generate getJsCode + output.write(" public static String getJsCode(){%s" % os.linesep) + output.write(" return%s" % os.linesep) + # let getJsCode call getJsCode%s + for index in range(block_num): + if (index != block_num - 1): + output.write(" getJsCode%s() +%s" % (index, os.linesep)) + else: + output.write(" getJsCode%s() ;%s" % (index, os.linesep)) output.write(" }%s" % os.linesep) output.write("%s" % os.linesep) @@ -147,15 +166,16 @@ def gen_java_method(input_arguments): % os.linesep) output.write(" byte[] allByteCode = new byte[%s];%s" % (len(byte_str), os.linesep)) - for idx, method_len in enumerate(method_len_list): + for idx in range(0, len(method_len_list)): output.write(" System.arraycopy(getJsByteCode_%s(), " "0, allByteCode, %s, %s);%s" - % (idx, cur_pos, method_len, os.linesep)) - cur_pos = cur_pos + method_len + % (idx, cur_pos, method_len_list[idx], os.linesep)) + cur_pos = cur_pos + method_len_list[idx] output.write(" return allByteCode;%s" % os.linesep) output.write(" }%s" % os.linesep) output.write("}") + return def operate_file(input_arguments): -- Gitee From 6522f6139ca9990fd1103e320475e255c0dd2760 Mon Sep 17 00:00:00 2001 From: hufeng Date: Fri, 15 Oct 2021 15:19:08 +0800 Subject: [PATCH 2/2] fix code-style Signed-off-by: hufeng Change-Id: I25df266a39b0afc58c8d6a53a80d1790fbb9f5e8 --- ts2panda/scripts/generate_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts2panda/scripts/generate_plugin.py b/ts2panda/scripts/generate_plugin.py index 263c4f5a74..3218691c77 100755 --- a/ts2panda/scripts/generate_plugin.py +++ b/ts2panda/scripts/generate_plugin.py @@ -117,7 +117,7 @@ def gen_java_method(input_arguments): output.write(" private static String getJsCode%s(){%s" % (block_index, os.linesep)) output.write(" return%s" % os.linesep) - if (index % single_block_len == single_block_len - 1 or index == total_len -1): + if (index % single_block_len == single_block_len - 1 or index == total_len - 1): output.write(" \"%s\";%s" % (line, os.linesep)) output.write(" }%s" % os.linesep) else: -- Gitee