diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 18e5c53..4c0a718 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -139,7 +139,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") + if ("1" != config.option("preinstalled-plugins")): + 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")): diff --git a/scripts/package_branding.py b/scripts/package_branding.py index dae370d..4aa2138 100644 --- a/scripts/package_branding.py +++ b/scripts/package_branding.py @@ -18,6 +18,7 @@ if utils.is_windows(): desktop_product_name_s = desktop_product_name.replace(" ","") desktop_package_name = company_name + "-" + desktop_product_name_s desktop_vcredist_list = ["2022"] + desktop_changes_dir = "desktop-apps/win-linux/package/windows/update/changes" desktop_changes_url = "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/changes" desktop_updates_url = "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/updates" diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index d86a60b..209eaf6 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -237,59 +237,12 @@ def make_inno(): def make_update_files(): utils.log_h2("desktop update files build") - # changes_dir = "update\\changes\\" + common.version - # if not branding.onlyoffice: - # changes_dir = "..\\..\\..\\..\\" + common.branding + "\\desktop-apps\\" + \ - # "win-linux\\package\\windows\\update\\changes\\" + common.version - # utils.copy_dir_content(changes_dir, "update") - - appcast_args = [ - "-Version", package_version, - "-Timestamp", common.timestamp - ] - if branding.onlyoffice: - appcast_args.append("-Multilang") - appcast_prod_args = [ - "-UpdatesUrlPrefix", branding.desktop_updates_url, - "-ReleaseNotesUrlPrefix", branding.desktop_changes_url - ] - appcast_test_base_url = "%s/desktop/win/update/%s/%s" % (branding.s3_base_url, common.version, common.build) - appcast_test_args = [ - "-UpdatesUrlPrefix", appcast_test_base_url, - "-ReleaseNotesUrlPrefix", appcast_test_base_url - ] - - # utils.log_h3("appcast prod json") - # utils.ps1( - # "update\\make_appcast.ps1", - # appcast_args + appcast_prod_args, - # creates="update\\appcast.json", verbose=True - # ) - utils.log_h3("appcast prod xml") - utils.ps1( - "update\\make_appcast_xml.ps1", - appcast_args + appcast_prod_args, - creates="update\\appcast.xml", verbose=True - ) - # utils.log_h3("appcast test json") - # utils.ps1( - # "update\\make_appcast.ps1", - # appcast_args + appcast_test_args + ["-OutFile", "appcast-test.json"], - # creates="update\\appcast-test.json", verbose=True - # ) - utils.log_h3("appcast test xml") - utils.ps1( - "update\\make_appcast_xml.ps1", - appcast_args + appcast_test_args + ["-OutFile", "appcast-test.xml"], - creates="update\\appcast-test.xml", verbose=True - ) + changes_dir = common.workspace_dir + "\\" + utils.get_path(branding.desktop_changes_dir) + "\\" + common.version if common.deploy: utils.log_h2("desktop update files deploy") ret = aws_s3_upload( - utils.glob_path("update\\*.json") \ - + utils.glob_path("update\\*.xml") \ - + utils.glob_path("update\\*.html"), + utils.glob_path(changes_dir + "\\*.html"), "win/update/%s/%s/" % (common.version, common.build), "Update" ) @@ -372,6 +325,7 @@ def make_advinst(): "NewSync CUSTOM_PATH " + viewer_dir, "UpdateFile CUSTOM_PATH\\ImageViewer.exe " + viewer_dir + "\\ImageViewer.exe", "UpdateFile CUSTOM_PATH\\VideoPlayer.exe " + viewer_dir + "\\VideoPlayer.exe", + "SetProperty ProductName=\"" + branding.desktop_product_name_full + "\"", "SetProperty ASCC_REG_PREFIX=" + branding.ascc_reg_prefix ] aic_content += [