From ca7d92703e9011241cff3220868bdc0c9959de7f Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 29 Sep 2022 14:53:39 +0300 Subject: [PATCH 1/7] Keep desktop local help for windows xp (#532) --- scripts/deploy_desktop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index 6089eb6..7b307e7 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -195,7 +195,7 @@ def make(): base_dir + "/js/" + branding + "/desktop/web-apps/apps/%s/main/resources/help" % i, root_help_dir + "/editors/web-apps/apps/%s/main/resources/help" % i) - if ("1" != config.option("preinstalled-help")): + if ("1" != config.option("preinstalled-help") and not isWindowsXP): # remove help from install until web-apps containes help base.delete_dir(root_dir + "/editors/web-apps/apps/documenteditor/main/resources/help") base.delete_dir(root_dir + "/editors/web-apps/apps/presentationeditor/main/resources/help") From 59ad11b0f4c920d70ebb750d641021243640ca15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 29 Sep 2022 13:14:56 +0000 Subject: [PATCH 2/7] Update hard-coded version to v7.2.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 0ee843c..b26a34e 100644 --- a/version +++ b/version @@ -1 +1 @@ -7.2.0 +7.2.1 From 9bf3985fb2195d466c80696efc2b533efd87cbda Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Mon, 3 Oct 2022 11:49:59 +0300 Subject: [PATCH 3/7] Fix notes_dst variable (#533) --- scripts/package_desktop.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index f8db96b..8fde2ee 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -324,8 +324,8 @@ def make_sparkle_updates(): if "en" in update_changes_list: notes_src = "%s/%s/%s.html" % (changes_dir, app_version, update_changes_list["en"]) + notes_dst = "%s/%s.html" % (updates_dir, zip_filename) if is_file(notes_src): - notes_dst = "%s/%s.html" % (updates_dir, zip_filename) copy_file(notes_src, notes_dst) cur_date = sh_output("env LC_ALL=en_US.UTF-8 date -u \"+%B %e, %Y\"", verbose=True) replace_in_file(notes_dst, @@ -336,11 +336,11 @@ def make_sparkle_updates(): if "ru" in update_changes_list: notes_src = "%s/%s/%s.html" % (changes_dir, app_version, update_changes_list["ru"]) + if update_changes_list["ru"] != "ReleaseNotes": + notes_dst = "%s/%s.ru.html" % (updates_dir, zip_filename) + else: + notes_dst = "%s/%s.html" % (updates_dir, zip_filename) if is_file(notes_src): - if update_changes_list["ru"] != "ReleaseNotes": - notes_dst = "%s/%s.ru.html" % (updates_dir, zip_filename) - else: - notes_dst = "%s/%s.html" % (updates_dir, zip_filename) copy_file(notes_src, notes_dst) cur_date = sh_output("env LC_ALL=ru_RU.UTF-8 date -u \"+%e %B %Y\"", verbose=True) replace_in_file(notes_dst, From e830cb91410066106c4d23bed054f7bc2e4ffa8d Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 4 Oct 2022 15:27:07 +0300 Subject: [PATCH 4/7] Add embed worker to deploy --- scripts/deploy_server.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 7614038..160038b 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -115,6 +115,9 @@ def make(): js_dir = root_dir base.copy_dir(base_dir + "/js/" + branding + "/builder/sdkjs", js_dir + "/sdkjs") base.copy_dir(base_dir + "/js/" + branding + "/builder/web-apps", js_dir + "/web-apps") + + # add embed worker code + base.cmd_in_dir(git_dir + "/sdkjs/common/embed", "python", ["make.py", js_dir + "/web-apps/apps/api/documents/api.js"]) # plugins base.create_dir(js_dir + "/sdkjs-plugins") From a2fcf85e3be07a9a597a43d473290bf1e011bf99 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 12 Oct 2022 10:12:38 +0300 Subject: [PATCH 5/7] Add move_dir method --- scripts/base.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/base.py b/scripts/base.py index 0b564cc..fc3599a 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -175,6 +175,14 @@ def create_dir(path): os.makedirs(path2) return +def move_dir(src, dst): + if is_dir(dst): + delete_dir(dst) + if is_dir(src): + copy_dir(src, dst) + delete_dir(src) + return + def copy_dir(src, dst): if is_dir(dst): delete_dir(dst) From aced6c5119afaaeb6ec6eaace571c2dd7cc9471b Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Tue, 18 Oct 2022 16:58:24 +0300 Subject: [PATCH 6/7] Fix server document-templates files (#540) --- scripts/deploy_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py index 160038b..fc309b7 100644 --- a/scripts/deploy_server.py +++ b/scripts/deploy_server.py @@ -167,8 +167,8 @@ def make(): #document-templates document_templates_files = server_dir + '/../document-templates' document_templates = build_server_dir + '/../document-templates' - base.create_dir(document_templates) - base.copy_dir_content(document_templates_files, document_templates, "", ".git") + base.copy_dir(document_templates_files + '/new', document_templates + '/new') + base.copy_dir(document_templates_files + '/sample', document_templates + '/sample') #license license_file1 = server_dir + '/LICENSE.txt' From fe098a7ee70ed74bb1f694550377cc88db68fa67 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Tue, 18 Oct 2022 18:33:27 +0300 Subject: [PATCH 7/7] Add desktop help installer build / Fix bug 58536 (#541) --- scripts/package_desktop.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index fd4aada..3f5ce80 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -26,8 +26,9 @@ def make(): # def make_windows(): - global package_version, sign, machine, arch, xp, iscc_args, source_dir, \ - innosetup_file, innosetup_update_file, advinst_file, portable_zip_file + global package_version, sign, machine, arch, xp, iscc_args, \ + source_dir, source_help_dir, innosetup_file, innosetup_help_file, \ + innosetup_update_file, advinst_file, portable_zip_file set_cwd(get_abspath(git_dir, build_dir)) @@ -58,6 +59,7 @@ def make_windows(): suffix = arch + ("_xp" if xp else "") source_prefix = "win_" + machine + ("_xp" if xp else "") source_dir = get_path("%s/%s/%s/%s" % (out_dir, source_prefix, company_name_l, product_name_s)) + source_help_dir = source_dir + "-help" if target.startswith('innosetup'): for year in vcredist_list: @@ -73,6 +75,10 @@ def make_windows(): if 'winsparkle-files' in targets: make_winsparkle_files() + if target.startswith('innosetup-help'): + innosetup_help_file = "%s_Help_%s_%s.exe" % (package_name, package_version, suffix) + make_innosetup_help() + if target.startswith('advinst'): advinst_file = "%s_%s_%s.msi" % (package_name, package_version, suffix) make_advinst() @@ -119,6 +125,29 @@ def make_innosetup(): cmd("iscc", iscc_args + ["common.iss"]) return +def make_innosetup_help(): + log("\n=== Build innosetup help project\n") + global iscc_args + iscc_args = [ + "/Qp", + "/DsAppVersion=" + package_version, + "/DDEPLOY_PATH=" + source_help_dir, + "/D_ARCH=" + machine + ] + if onlyoffice: + iscc_args.append("/D_ONLYOFFICE=1") + else: + iscc_args.append("/DsBrandingFolder=" + get_abspath(git_dir, branding_dir)) + if sign: + iscc_args.append("/DENABLE_SIGNING=1") + iscc_args.append("/Sbyparam=signtool.exe sign /v /n $q" + cert_name + "$q /t " + tsa_server + " $f") + log("--- " + innosetup_help_file) + if is_file(innosetup_help_file): + log("! file exist, skip") + return + cmd("iscc", iscc_args + ["help.iss"]) + return + def make_innosetup_update(): log("\n=== Build innosetup update project\n") log("--- " + innosetup_update_file)