From a4c587641136694771dc7e2dd664eb25fbb558e9 Mon Sep 17 00:00:00 2001 From: wangchun17 Date: Wed, 20 Oct 2021 11:46:18 +0800 Subject: [PATCH 1/4] chunn.wang@huawei.com Signed-off-by: wangchun17 Change-Id: I2e1628bd4f8d44aa2c5fa07c571ce7145d9b9865 --- BUILD.gn | 26 +++++++++++++++++++------- ace-loader/module-source.js | 6 +++--- ace-loader/third_party/parse5 | 1 + build_ace_loader_library.py | 12 +++++++++--- 4 files changed, 32 insertions(+), 13 deletions(-) create mode 120000 ace-loader/third_party/parse5 diff --git a/BUILD.gn b/BUILD.gn index 98b23e9..29a23c4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -8,18 +8,23 @@ ace_loader_lib_dir = get_label_info(":build_ace_loader_library", "target_out_dir") + "/lib" action("build_ace_loader_library") { - script = "//developtools/ace-js2bundle/build_ace_loader_library.py" + script = "build_ace_loader_library.py" depfile = "$target_gen_dir/$target_name.d" outputs = [ ace_loader_lib_dir ] - _ace_loader_dir = "//developtools/ace-js2bundle/ace-loader" + _ace_loader_dir = "ace-loader" _module_source_js = _ace_loader_dir + "/module-source.js" - - _babel_js = _ace_loader_dir + "/node_modules/@babel/cli/bin/babel.js" _babel_config_js = _ace_loader_dir + "/babel.config.js" _uglify_source_js = _ace_loader_dir + "/uglify-source.js" + if (is_standard_system) { + _ace_config_dir = "ace-loader" + } else { + _ace_config_dir = "//prebuilts/ace-toolkit/ace-loader/linux-x64" + } + _babel_js = _ace_config_dir + "/node_modules/@babel/cli/bin/babel.js" + inputs = [ _babel_config_js, _babel_js, @@ -29,10 +34,17 @@ action("build_ace_loader_library") { # different host platform nodejs tool directory if (host_os == "linux") { - nodejs_path = - "//prebuilts/build-tools/common/nodejs/node-v12.18.4-linux-x64/bin/node" + if (is_standard_system) { + nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-linux-x64/bin/node" + } else { + nodejs_path = "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-linux-x64/bin/node" + } } else if (host_os == "mac") { - nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-darwin-x64/bin/node" + if (is_standard_system) { + nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-darwin-x64/bin/node" + } else { + nodejs_path = "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-darwin-x64/bin/node" + } } else { assert(false, "Unsupported host_os: $host_os") } diff --git a/ace-loader/module-source.js b/ace-loader/module-source.js index 02a17a3..05644ed 100644 --- a/ace-loader/module-source.js +++ b/ace-loader/module-source.js @@ -68,6 +68,6 @@ function copyResource(src, dist) { copyResource(path.resolve(__dirname, './plugin/templater'), process.argv[2] + '/templater'); copyResource(path.resolve(__dirname, './plugin/theme'), process.argv[2] + '/theme'); copyResource(path.resolve(__dirname, './plugin/codegen'), process.argv[2] + '/codegen'); -copyResource(path.resolve(__dirname, '../../../third_party/weex-loader/deps/weex-scripter'), process.argv[2] + '/scripter'); -copyResource(path.resolve(__dirname, '../../../third_party/weex-loader/deps/weex-styler'), process.argv[2] + '/styler'); -copyResource(path.resolve(__dirname, '../../../third_party/parse5/packages/parse5/lib'), process.argv[2] + '/parse'); +copyResource(path.resolve(__dirname, './third_party/weex-loader/deps/weex-scripter'), process.argv[2] + '/scripter'); +copyResource(path.resolve(__dirname, './third_party/weex-loader/deps/weex-styler'), process.argv[2] + '/styler'); +copyResource(path.resolve(__dirname, './third_party/parse5/packages/parse5/lib'), process.argv[2] + '/parse'); diff --git a/ace-loader/third_party/parse5 b/ace-loader/third_party/parse5 new file mode 120000 index 0000000..279d4f2 --- /dev/null +++ b/ace-loader/third_party/parse5 @@ -0,0 +1 @@ +../../../../third_party/parse5/ \ No newline at end of file diff --git a/build_ace_loader_library.py b/build_ace_loader_library.py index d04e374..7b249d8 100755 --- a/build_ace_loader_library.py +++ b/build_ace_loader_library.py @@ -18,9 +18,15 @@ import sys import subprocess import argparse -sys.path.append( - os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'build')) -from scripts.util import build_utils # noqa: E402 +standard_system_build_dir = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'build') +build_dir = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, + os.pardir, os.pardir, os.pardir, 'build') +if os.path.exists(standard_system_build_dir): + sys.path.append(standard_system_build_dir) + from scripts.util import build_utils # noqa: E402 +if os.path.exists(build_dir): + sys.path.append(build_dir) + from maple.java.util import build_utils # noqa: E402 def parse_args(): -- Gitee From 5a6bf41e51f62c72ee1382f4a3dc932c7a16aacf Mon Sep 17 00:00:00 2001 From: wangchun17 Date: Wed, 20 Oct 2021 15:14:50 +0800 Subject: [PATCH 2/4] chunn.wang@huawei.com Signed-off-by: wangchun17 Change-Id: I75ba26cb27cb0c3e0c0afbda1a447730dc3e06ba --- BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 29a23c4..f6e60b7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -37,13 +37,15 @@ action("build_ace_loader_library") { if (is_standard_system) { nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-linux-x64/bin/node" } else { - nodejs_path = "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-linux-x64/bin/node" + nodejs_path = + "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-linux-x64/bin/node" } } else if (host_os == "mac") { if (is_standard_system) { nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-darwin-x64/bin/node" } else { - nodejs_path = "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-darwin-x64/bin/node" + nodejs_path = + "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-darwin-x64/bin/node" } } else { assert(false, "Unsupported host_os: $host_os") -- Gitee From 05a85e2f6dfa597cce082011052691a811e116b7 Mon Sep 17 00:00:00 2001 From: wangchun17 Date: Wed, 20 Oct 2021 15:38:46 +0800 Subject: [PATCH 3/4] chunn.wang@huawei.com Signed-off-by: wangchun17 Change-Id: I3326d5e8137d15d86f517f957b4f140331efd873 --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f6e60b7..a416f8c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -15,8 +15,6 @@ action("build_ace_loader_library") { _ace_loader_dir = "ace-loader" _module_source_js = _ace_loader_dir + "/module-source.js" - _babel_config_js = _ace_loader_dir + "/babel.config.js" - _uglify_source_js = _ace_loader_dir + "/uglify-source.js" if (is_standard_system) { _ace_config_dir = "ace-loader" @@ -24,6 +22,8 @@ action("build_ace_loader_library") { _ace_config_dir = "//prebuilts/ace-toolkit/ace-loader/linux-x64" } _babel_js = _ace_config_dir + "/node_modules/@babel/cli/bin/babel.js" + _babel_config_js = _ace_config_dir + "/babel.config.js" + _uglify_source_js = _ace_config_dir + "/uglify-source.js" inputs = [ _babel_config_js, -- Gitee From 8096e0ea7b9e01a79de7f3cc3b73e94a04b7b0c3 Mon Sep 17 00:00:00 2001 From: wangchun17 Date: Wed, 20 Oct 2021 15:43:12 +0800 Subject: [PATCH 4/4] chunn.wang@huawei.com Signed-off-by: wangchun17 Change-Id: Id8711ee4e1a794aa77e055650798ecbdbb94cb17 --- build_ace_loader_library.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_ace_loader_library.py b/build_ace_loader_library.py index 7b249d8..d43ca00 100755 --- a/build_ace_loader_library.py +++ b/build_ace_loader_library.py @@ -18,7 +18,8 @@ import sys import subprocess import argparse -standard_system_build_dir = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'build') +standard_system_build_dir = os.path.join(os.path.dirname(__file__), + os.pardir, os.pardir, 'build') build_dir = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, 'build') if os.path.exists(standard_system_build_dir): -- Gitee