From aa07168ca4ff53d0b2521e0899492e236d7daec9 Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Wed, 8 Sep 2021 17:50:02 +0800 Subject: [PATCH 1/5] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 0c82c7b..40bdb37 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -86,3 +86,81 @@ 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/common/bin" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/bin" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/config/default" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/config/images" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/config/font.bin", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/glyphs.bin", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/line_cj.brk", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/RobotoCondensed-Regular.ttf", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/SourceHanSansSc-Regular.otf", + ] + } + else{ + sources = [ + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/font.bin", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/glyphs.bin", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/line_cj.brk", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/RobotoCondensed-Regular.ttf", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/SourceHanSansSc-Regular.otf", + ] + } + outputs = [ target_out_dir + "/liteWearable/config/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/liteWearable/config" + module_install_name = "" +} + -- Gitee From 8aeaadf9838b61d9ea859b1863760b16224b61c1 Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Wed, 8 Sep 2021 17:50:02 +0800 Subject: [PATCH 2/5] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 0c82c7b..40bdb37 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -86,3 +86,81 @@ 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/common/bin" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/bin" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/config/default" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/config/images" ] + } + else{ + sources = [ "//prebuilts/previewer/2.2.0.3/windows/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/liteWearable/config/font.bin", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/glyphs.bin", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/line_cj.brk", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/RobotoCondensed-Regular.ttf", + "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/SourceHanSansSc-Regular.otf", + ] + } + else{ + sources = [ + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/font.bin", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/glyphs.bin", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/line_cj.brk", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/RobotoCondensed-Regular.ttf", + "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/SourceHanSansSc-Regular.otf", + ] + } + outputs = [ target_out_dir + "/liteWearable/config/{{source_file_part}}" ] + module_source_dir = target_out_dir + "/liteWearable/config" + module_install_name = "" +} + -- Gitee From ddad6d364f1ad7ba4a2573b50fdf8eb0fa8f6eca Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Wed, 8 Sep 2021 21:00:12 +0800 Subject: [PATCH 3/5] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 40bdb37..9762f2d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -90,10 +90,10 @@ ohos_copy("ace_loader_library") { # copy common_bin ohos_copy("common_bin") { if(host_os == "mac"){ - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/common/bin" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/common/bin" ] } else{ - sources = [ "//prebuilts/previewer/2.2.0.3/windows/common/bin" ] + 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" @@ -103,10 +103,10 @@ ohos_copy("common_bin") { # copy liteWearable_bin ohos_copy("liteWearable_bin") { if(host_os == "mac"){ - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/bin" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/bin" ] } else{ - sources = [ "//prebuilts/previewer/2.2.0.3/windows/liteWearable/bin" ] + 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" @@ -116,10 +116,10 @@ ohos_copy("liteWearable_bin") { # copy liteWearable_default ohos_copy("liteWearable_default") { if(host_os == "mac"){ - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/default" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/default" ] } else{ - sources = [ "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/default" ] + 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" @@ -129,10 +129,10 @@ ohos_copy("liteWearable_default") { # copy liteWearable_images ohos_copy("liteWearable_images") { if(host_os == "mac"){ - sources = [ "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/images" ] + sources = [ "//prebuilts/previewer/2.2.0.3/darwin/previewer/liteWearable/config/images" ] } else{ - sources = [ "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/images" ] + 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" @@ -143,24 +143,23 @@ ohos_copy("liteWearable_images") { ohos_copy("liteWearable_font") { if(host_os == "mac"){ sources = [ - "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/font.bin", - "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/glyphs.bin", - "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/line_cj.brk", - "//prebuilts/previewer/2.2.0.3/darwin/liteWearable/config/RobotoCondensed-Regular.ttf", - "//prebuilts/previewer/2.2.0.3/darwin/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", + "//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", ] } else{ sources = [ - "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/font.bin", - "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/glyphs.bin", - "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/line_cj.brk", - "//prebuilts/previewer/2.2.0.3/windows/liteWearable/config/RobotoCondensed-Regular.ttf", - "//prebuilts/previewer/2.2.0.3/windows/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", + "//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", ] } outputs = [ target_out_dir + "/liteWearable/config/{{source_file_part}}" ] module_source_dir = target_out_dir + "/liteWearable/config" module_install_name = "" } - -- Gitee From 036ee5167b14aab83b50d4e11aaa1bc7bfecb007 Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Wed, 8 Sep 2021 21:17:45 +0800 Subject: [PATCH 4/5] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index 9762f2d..92abcc3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -139,6 +139,7 @@ ohos_copy("liteWearable_images") { module_install_name = "" } + # copy liteWearable_font ohos_copy("liteWearable_font") { if(host_os == "mac"){ -- Gitee From 2ea766b3f52c70946466bad628f1329bc4d5539f Mon Sep 17 00:00:00 2001 From: fupengfei001 Date: Wed, 8 Sep 2021 21:26:36 +0800 Subject: [PATCH 5/5] fupengfei6@huawei.com Signed-off-by: fupengfei001 --- BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 92abcc3..9762f2d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -139,7 +139,6 @@ ohos_copy("liteWearable_images") { module_install_name = "" } - # copy liteWearable_font ohos_copy("liteWearable_font") { if(host_os == "mac"){ -- Gitee