diff --git a/scripts/base.py b/scripts/base.py index 3dc54fe..07e6de1 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -1223,7 +1223,6 @@ def mac_correct_rpath_x2t(dir): mac_correct_rpath_library("HtmlFile2", ["UnicodeConverter", "kernel", "kernel_network", "graphics"]) mac_correct_rpath_library("EpubFile", ["UnicodeConverter", "kernel", "HtmlFile2", "graphics"]) mac_correct_rpath_library("Fb2File", ["UnicodeConverter", "kernel", "graphics"]) - mac_correct_rpath_library("HtmlRenderer", ["UnicodeConverter", "kernel", "graphics"]) mac_correct_rpath_library("PdfFile", ["UnicodeConverter", "kernel", "graphics", "kernel_network"]) mac_correct_rpath_library("DjVuFile", ["UnicodeConverter", "kernel", "graphics", "PdfFile"]) mac_correct_rpath_library("XpsFile", ["UnicodeConverter", "kernel", "graphics", "PdfFile"]) @@ -1231,7 +1230,7 @@ def mac_correct_rpath_x2t(dir): mac_correct_rpath_library("IWorkFile", ["UnicodeConverter", "kernel"]) 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", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer", "IWorkFile"]) + mac_correct_rpath_binary("./x2t", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer", "IWorkFile"]) if is_file("./allfontsgen"): cmd("chmod", ["-v", "+x", "./allfontsgen"]) cmd("install_name_tool", ["-add_rpath", "@executable_path", "./allfontsgen"], True) @@ -1256,7 +1255,7 @@ def mac_correct_rpath_docbuilder(dir): os.chdir(dir) cmd("chmod", ["-v", "+x", "./docbuilder"]) cmd("install_name_tool", ["-add_rpath", "@executable_path", "./docbuilder"], True) - mac_correct_rpath_binary("./docbuilder", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "IWorkFile", "doctrenderer", "DocxRenderer"]) + mac_correct_rpath_binary("./docbuilder", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "IWorkFile", "doctrenderer", "DocxRenderer"]) mac_correct_rpath_library("docbuilder.c", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"]) def add_loader_path_to_rpath(libs): @@ -1273,9 +1272,9 @@ def mac_correct_rpath_desktop(dir): os.chdir(dir) mac_correct_rpath_library("hunspell", []) mac_correct_rpath_library("ooxmlsignature", ["kernel"]) - mac_correct_rpath_library("ascdocumentscore", ["UnicodeConverter", "kernel", "graphics", "kernel_network", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"]) + mac_correct_rpath_library("ascdocumentscore", ["UnicodeConverter", "kernel", "graphics", "kernel_network", "PdfFile", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"]) cmd("install_name_tool", ["-change", "@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework", "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework", "libascdocumentscore.dylib"]) - mac_correct_rpath_binary("./editors_helper.app/Contents/MacOS/editors_helper", ["ascdocumentscore", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"]) + mac_correct_rpath_binary("./editors_helper.app/Contents/MacOS/editors_helper", ["ascdocumentscore", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "hunspell", "ooxmlsignature"]) cmd("install_name_tool", ["-add_rpath", "@executable_path/../../../../Frameworks", "./editors_helper.app/Contents/MacOS/editors_helper"], True) cmd("install_name_tool", ["-add_rpath", "@executable_path/../../../../Resources/converter", "./editors_helper.app/Contents/MacOS/editors_helper"], True) cmd("chmod", ["-v", "+x", "./editors_helper.app/Contents/MacOS/editors_helper"]) diff --git a/scripts/deploy_builder.py b/scripts/deploy_builder.py index 6fe20bd..6a3a73c 100644 --- a/scripts/deploy_builder.py +++ b/scripts/deploy_builder.py @@ -40,7 +40,6 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DjVuFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "XpsFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlFile2") - 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, "IWorkFile") diff --git a/scripts/deploy_core.py b/scripts/deploy_core.py index 5ef1f6a..5ab0c2b 100644 --- a/scripts/deploy_core.py +++ b/scripts/deploy_core.py @@ -30,7 +30,6 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "kernel_network") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "graphics") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "doctrenderer") - base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "HtmlRenderer") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "DjVuFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "XpsFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "PdfFile") diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index 5ee511f..25de14c 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -66,7 +66,6 @@ def make(): base.copy_lib(build_libraries_path, root_dir + "/converter", "DjVuFile") base.copy_lib(build_libraries_path, root_dir + "/converter", "XpsFile") base.copy_lib(build_libraries_path, root_dir + "/converter", "HtmlFile2") - base.copy_lib(build_libraries_path, root_dir + "/converter", "HtmlRenderer") base.copy_lib(build_libraries_path, root_dir + "/converter", "Fb2File") base.copy_lib(build_libraries_path, root_dir + "/converter", "EpubFile") base.copy_lib(build_libraries_path, root_dir + "/converter", "IWorkFile") diff --git a/scripts/deploy_mobile.py b/scripts/deploy_mobile.py index 2f5d3d3..d8d7f9a 100644 --- a/scripts/deploy_mobile.py +++ b/scripts/deploy_mobile.py @@ -58,7 +58,6 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DjVuFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "XpsFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlFile2") - base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HtmlRenderer") 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") diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 9d7e3d9..e57461b 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -78,7 +78,6 @@ def make(): base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "DjVuFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "XpsFile") base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "HtmlFile2") - base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "HtmlRenderer") 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") diff --git a/sln.json b/sln.json index 8f7afea..20e4d82 100644 --- a/sln.json +++ b/sln.json @@ -25,7 +25,6 @@ "core/Apple/IWork.pro", - "core/HtmlRenderer/htmlrenderer.pro", "core/DocxRenderer/DocxRenderer.pro", "core/DesktopEditor/doctrenderer/doctrenderer.pro",