From 74c15af762089426b2751215120633a9d2c83fe6 Mon Sep 17 00:00:00 2001 From: Kulikova Svetlana Date: Fri, 3 Dec 2021 13:40:59 +0300 Subject: [PATCH 1/2] DocxRenderer --- build.pro | 2 ++ scripts/base.py | 3 ++- scripts/deploy_builder.py | 1 + scripts/deploy_core.py | 1 + scripts/deploy_desktop.py | 1 + scripts/deploy_mobile.py | 1 + scripts/deploy_server.py | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.pro b/build.pro index 1843781..213586e 100644 --- a/build.pro +++ b/build.pro @@ -47,6 +47,8 @@ addSubProject(htmlrenderer, $$CORE_ROOT_DIR/HtmlRenderer/htmlrenderer.pro,\ kernel unicodeconverter graphics pdfwriter) addSubProject(pdfreader, $$CORE_ROOT_DIR/PdfReader/PdfReader.pro,\ kernel unicodeconverter graphics pdfwriter htmlrenderer) +addSubProject(docxrenderer, $$CORE_ROOT_DIR/DocxRenderer/DocxRenderer.pro,\ + kernel unicodeconverter graphics) addSubProject(htmlfile2, $$CORE_ROOT_DIR/HtmlFile2/HtmlFile2.pro,\ kernel unicodeconverter graphics network) addSubProject(doctrenderer, $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/doctrenderer.pro,\ diff --git a/scripts/base.py b/scripts/base.py index bd0e5ff..80fe30c 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -982,9 +982,10 @@ def mac_correct_rpath_x2t(dir): mac_correct_rpath_library("DjVuFile", ["kernel", "UnicodeConverter", "graphics", "PdfWriter"]) mac_correct_rpath_library("PdfReader", ["kernel", "UnicodeConverter", "graphics", "PdfWriter", "HtmlRenderer"]) mac_correct_rpath_library("XpsFile", ["kernel", "UnicodeConverter", "graphics", "PdfWriter"]) + mac_correct_rpath_library("DocxRenderer", ["kernel", "UnicodeConverter", "graphics"]) cmd("chmod", ["-v", "+x", "./x2t"]) cmd("install_name_tool", ["-add_rpath", "@executable_path", "./x2t"], True) - mac_correct_rpath_binary("./x2t", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfWriter", "HtmlRenderer", "PdfReader", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer"]) + mac_correct_rpath_binary("./x2t", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfWriter", "HtmlRenderer", "PdfReader", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer"]) if is_file("./allfontsgen"): cmd("chmod", ["-v", "+x", "./allfontsgen"]) cmd("install_name_tool", ["-add_rpath", "@executable_path", "./allfontsgen"], True) diff --git a/scripts/deploy_builder.py b/scripts/deploy_builder.py index 97c4eaf..eabaaf8 100644 --- a/scripts/deploy_builder.py +++ b/scripts/deploy_builder.py @@ -44,6 +44,7 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlRenderer") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "Fb2File") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "EpubFile") + base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DocxRenderer") if ("ios" == platform): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "x2t") diff --git a/scripts/deploy_core.py b/scripts/deploy_core.py index 10692db..db04aa9 100644 --- a/scripts/deploy_core.py +++ b/scripts/deploy_core.py @@ -39,6 +39,7 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "UnicodeConverter") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "Fb2File") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "EpubFile") + base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "DocxRenderer") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2t") base.copy_dir(base_dir + "/js/" + branding + "/builder/sdkjs", archive_dir + "/sdkjs") diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index 701bd77..ee6385a 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -55,6 +55,7 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "HtmlRenderer") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "Fb2File") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "EpubFile") + base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "DocxRenderer") if ("ios" == platform): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "x2t") diff --git a/scripts/deploy_mobile.py b/scripts/deploy_mobile.py index f7b3ba2..50b6501 100644 --- a/scripts/deploy_mobile.py +++ b/scripts/deploy_mobile.py @@ -46,6 +46,7 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "doctrenderer") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "Fb2File") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "EpubFile") + base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DocxRenderer") if (0 == platform.find("win") or 0 == platform.find("linux") or 0 == platform.find("mac")): base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir, "x2t") diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index a0e8143..d1c669d 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -84,6 +84,7 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "doctrenderer") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "Fb2File") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "EpubFile") + base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "DocxRenderer") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, converter_dir, "x2t") base.generate_doctrenderer_config(converter_dir + "/DoctRenderer.config", "../../../", "server") From 2dd8142b9d30bc9cae21af9a0ddb1a429f2d290c Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Sun, 5 Dec 2021 21:02:29 +0300 Subject: [PATCH 2/2] Add dependence docxrenderer to x2tconverter in tools --- build.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.pro b/build.pro index 213586e..a782f21 100644 --- a/build.pro +++ b/build.pro @@ -70,7 +70,7 @@ addSubProject(epubfile, $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\ addSubProject(xlsformat, $$CORE_ROOT_DIR/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro) addSubProject(xlsbformat, $$CORE_ROOT_DIR/Common/DocxFormat/DocxFormatLib/XlsbFormatLib.pro) addSubProject(x2t, $$CORE_ROOT_DIR/X2tConverter/build/Qt/X2tConverter.pro,\ - docxformat pptxformat docxfile txtxmlformat rtfformat pptformat docformat odffilereader odffilewriter xlsformat xlsbformat fb2file epubfile) + docxformat pptxformat docxfile txtxmlformat rtfformat pptformat docformat odffilereader odffilewriter xlsformat xlsbformat fb2file epubfile docxrenderer) } !no_use_common_binary { addSubProject(allfontsgen, $$CORE_ROOT_DIR/DesktopEditor/AllFontsGen/AllFontsGen.pro,\