diff --git a/README.md b/README.md index c57df85502e4382262d9f654492ac9eec0590992..d39b2d4af631b1663e3ed2816d9e4585022b00a2 100755 --- a/README.md +++ b/README.md @@ -528,7 +528,7 @@ var result = pro.entries(); import util from '@ohos.util' var pro = new util.LruBuffer(); pro.put(2,10); -var result = aa[symbol.iterator](); +var result = pro[symbol.iterator](); ``` 50.afterRemoval() ``` diff --git a/README_zh.md b/README_zh.md index 3f2d966b53fbbcfd37af76ce60719e8f86bb4633..a60319233717897cbec90fdc1ae1a2e7e9bf7961 100644 --- a/README_zh.md +++ b/README_zh.md @@ -529,7 +529,7 @@ var result = pro.entries(); import util from '@ohos.util' var pro = new util.LruBuffer(); pro.put(2,10); -var result = aa[symbol.iterator](); +var result = pro[symbol.iterator](); ``` 50.afterRemoval() ``` diff --git a/util/build_ts_js.py b/util/build_ts_js.py index e9762124152b0e833b30b083caedf2026eb29db7..cb4d8eba0f61dd5f29b8c6e6a250916b5f41b843 100755 --- a/util/build_ts_js.py +++ b/util/build_ts_js.py @@ -17,33 +17,39 @@ import platform import argparse import subprocess -def run_command(cmd): - print(" ".join(cmd)) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, universal_newlines=True) - out, err = proc.communicate() - if out != "": - print(out) +def run_command(in_cmd): + print(" ".join(in_cmd)) + proc = subprocess.Popen(in_cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + universal_newlines=True, + shell=False) + stdout, stderr = proc.communicate() + if stdout != "": + print(stdout) exit(1) + if __name__ == '__main__': - - build_path = os.path.abspath(os.path.join(os.getcwd(), "../..")) - os.chdir("%s/base/compileruntime/js_util_module/util" % build_path) - parser = argparse.ArgumentParser() - parser.add_argument('--dst-file', + BUILD_PATH = os.path.abspath(os.path.join(os.getcwd(), "../..")) + os.chdir("%s/base/compileruntime/js_util_module/util" % BUILD_PATH) + + PARSER_INST = argparse.ArgumentParser() + PARSER_INST.add_argument('--dst-file', help='the converted target file') - input_arguments = parser.parse_args() + INPUT_ARGUMENTS = PARSER_INST.parse_args() + - node = '../../../../prebuilts/build-tools/common/nodejs/\ + NODE_PATH = '../../../../prebuilts/build-tools/common/nodejs/\ node-v12.18.4-linux-x64/bin/node' - tsc = '../../../../ark/ts2abc/ts2panda/node_modules/typescript/bin/tsc' - cmd = [node, tsc] - run_command(cmd) + TSC_PATH = '../../../../ark/ts2abc/ts2panda/node_modules/\ +typescript/bin/tsc' + CMD_INST = [NODE_PATH, TSC_PATH] + run_command(CMD_INST) - cmd = ['cp', "-r", './out/util_js.js', input_arguments.dst_file] - run_command(cmd) + CMD_INST = ['cp', "-r", './out/util_js.js', INPUT_ARGUMENTS.dst_file] + run_command(CMD_INST) - cmd = ['rm', "-rf", './out'] - run_command(cmd) \ No newline at end of file + CMD_INST = ['rm', "-rf", './out'] + run_command(CMD_INST) + exit(0)