From 443dfe4e863dd2616cb2cd2ada2004dbd5ca09d8 Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Thu, 9 Sep 2021 11:17:19 +0800 Subject: [PATCH 1/3] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 0c82c7b..5d150c5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -86,3 +86,79 @@ ohos_copy("ace_loader_library") { module_install_name = "" license_file = "//third_party/weex-loader/NOTICE" } + +# copy common_bin +ohos_copy("common_bin") { + if (host_os == "mac") { + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/common/bin" ] + } else { + sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/common/bin" ] + } + outputs = [ target_out_dir + "/common/bin/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/common/bin" + module_install_name = "" +} + +# copy liteWearable_bin +ohos_copy("liteWearable_bin") { + if (host_os == "mac") { + sources = + [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/bin" ] + } else { + sources = + [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/bin" ] + } + outputs = [ target_out_dir + "/liteWearable/bin/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/liteWearable/bin" + module_install_name = "" +} + +# copy liteWearable_default +ohos_copy("liteWearable_default") { + if (host_os == "mac") { + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/default" ] + } else { + sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/default" ] + } + outputs = + [ target_out_dir + "/liteWearable/config/default/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/liteWearable/config/default" + module_install_name = "" +} + +# copy liteWearable_images +ohos_copy("liteWearable_images") { + if (host_os == "mac") { + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/images" ] + } else { + sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/images" ] + } + outputs = + [ target_out_dir + "/liteWearable/config/images/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/liteWearable/config/images" + module_install_name = "" +} + +# copy liteWearable_font +ohos_copy("liteWearable_font") { + if (host_os == "mac") { + sources = [ + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/RobotoCondensed-Regular.ttf", + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/SourceHanSansSc-Regular.otf", + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/font.bin", + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/glyphs.bin", + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/line_cj.brk", + ] + } else { + sources = [ + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/RobotoCondensed-Regular.ttf", + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/SourceHanSansSc-Regular.otf", + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/font.bin", + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/glyphs.bin", + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/line_cj.brk", + ] + } + outputs = [ target_out_dir + "/liteWearable/config/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/liteWearable/config" + module_install_name = "" +} -- Gitee From 0b008a3b8d82e5f42401df88eb248e91318ff5ce Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Thu, 9 Sep 2021 15:34:18 +0800 Subject: [PATCH 2/3] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 5d150c5..69fdcc8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -90,9 +90,9 @@ ohos_copy("ace_loader_library") { # copy common_bin ohos_copy("common_bin") { if (host_os == "mac") { - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/common/bin" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/common/bin/bin" ] } else { - sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/common/bin" ] + sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/common/bin/bin" ] } outputs = [ target_out_dir + "/common/bin/{{source_file_part}}" ] module_source_dir = target_out_dir + "/common/bin" @@ -103,10 +103,10 @@ ohos_copy("common_bin") { ohos_copy("liteWearable_bin") { if (host_os == "mac") { sources = - [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/bin" ] + [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/bin/bin" ] } else { sources = - [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/bin" ] + [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/bin/bin" ] } outputs = [ target_out_dir + "/liteWearable/bin/{{source_file_part}}" ] module_source_dir = target_out_dir + "/liteWearable/bin" @@ -116,9 +116,9 @@ ohos_copy("liteWearable_bin") { # copy liteWearable_default ohos_copy("liteWearable_default") { if (host_os == "mac") { - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/default" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/default/default" ] } else { - sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/default" ] + sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/default/default" ] } outputs = [ target_out_dir + "/liteWearable/config/default/{{source_file_part}}" ] @@ -129,9 +129,9 @@ ohos_copy("liteWearable_default") { # copy liteWearable_images ohos_copy("liteWearable_images") { if (host_os == "mac") { - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/images" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/images/images" ] } else { - sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/images" ] + sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/images/images" ] } outputs = [ target_out_dir + "/liteWearable/config/images/{{source_file_part}}" ] @@ -144,7 +144,7 @@ ohos_copy("liteWearable_font") { if (host_os == "mac") { sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/RobotoCondensed-Regular.ttf", - "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/SourceHanSansSc-Regular.otf", + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/SourceHanSansSC-Regular.otf", "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/font.bin", "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/glyphs.bin", "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/line_cj.brk", @@ -152,7 +152,7 @@ ohos_copy("liteWearable_font") { } else { sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/RobotoCondensed-Regular.ttf", - "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/SourceHanSansSc-Regular.otf", + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/SourceHanSansSC-Regular.otf", "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/font.bin", "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/glyphs.bin", "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/config/line_cj.brk", -- Gitee From 61168b31ade0cde7603411bb7e442f85132718ca Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Thu, 9 Sep 2021 15:42:40 +0800 Subject: [PATCH 3/3] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 69fdcc8..55b1cb1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -90,9 +90,11 @@ ohos_copy("ace_loader_library") { # copy common_bin ohos_copy("common_bin") { if (host_os == "mac") { - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/common/bin/bin" ] + sources = + [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/common/bin/bin" ] } else { - sources = [ "//prebuilts/previewer/2.2.0.3/windows/previewer/common/bin/bin" ] + sources = + [ "//prebuilts/previewer/2.2.0.3/windows/previewer/common/bin/bin" ] } outputs = [ target_out_dir + "/common/bin/{{source_file_part}}" ] module_source_dir = target_out_dir + "/common/bin" @@ -102,11 +104,13 @@ ohos_copy("common_bin") { # copy liteWearable_bin ohos_copy("liteWearable_bin") { if (host_os == "mac") { - sources = - [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/bin/bin" ] + sources = [ + "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/bin/bin", + ] } else { - sources = - [ "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/bin/bin" ] + sources = [ + "//prebuilts/previewer/2.2.0.3/windows/previewer/liteWearable/bin/bin", + ] } outputs = [ target_out_dir + "/liteWearable/bin/{{source_file_part}}" ] module_source_dir = target_out_dir + "/liteWearable/bin" -- Gitee