diff --git a/build.pro b/build.pro index d66a387..a58b50a 100644 --- a/build.pro +++ b/build.pro @@ -83,6 +83,8 @@ addSubProject(epubfile, $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\ kernel unicodeconverter graphics) addSubProject(docbuilder, $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/app_builder/docbuilder.pro,\ kernel unicodeconverter graphics doctrenderer) + addSubProject(pluginsmanager, $$CORE_ROOT_DIR/DesktopEditor/pluginsmanager/pluginsmanager.pro,\ + kernel) } !no_tests { diff --git a/scripts/base.py b/scripts/base.py index e58e171..b42d3b3 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -1067,6 +1067,10 @@ def mac_correct_rpath_x2t(dir): cmd("chmod", ["-v", "+x", "./allthemesgen"]) cmd("install_name_tool", ["-add_rpath", "@executable_path", "./allthemesgen"], True) mac_correct_rpath_binary("./allthemesgen", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "graphics", "kernel_network", "doctrenderer"]) + if is_file("./pluginsmanager"): + cmd("chmod", ["-v", "+x", "./pluginsmanager"]) + cmd("install_name_tool", ["-add_rpath", "@executable_path", "./pluginsmanager"], True) + mac_correct_rpath_binary("./pluginsmanager", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network"]) os.chdir(cur_dir) return diff --git a/scripts/deploy_core.py b/scripts/deploy_core.py index b9bd761..6eda38a 100644 --- a/scripts/deploy_core.py +++ b/scripts/deploy_core.py @@ -55,6 +55,7 @@ def make(): base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "allfontsgen") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "allthemesgen") + base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "pluginsmanager") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "standardtester") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2ttester") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "ooxml_crypt") diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 9b1b1b3..9b14d51 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -136,7 +136,8 @@ def make(): base.create_dir(tools_dir) base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "allfontsgen") base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "allthemesgen") - + base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "pluginsmanager") + branding_dir = server_dir + "/branding" if("" != config.option("branding") and "onlyoffice" != config.option("branding")): branding_dir = git_dir + '/' + config.option("branding") + '/server'