Merge pull request #574 from ONLYOFFICE/release/v7.3.0

Fix previous commit
Merge pull request #572 from ONLYOFFICE/release/v7.3.0
2026-04-07 14:06:31 +08:00 · 2022-11-23 14:02:48 +03:00 · 2022-11-23 10:52:33 +03:00 · 2022-11-18 18:20:00 +03:00 · 2022-11-11 15:42:04 +03:00 · 2022-11-11 15:39:31 +03:00
4 changed files with 15 additions and 4 deletions
--- 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)
--- a/scripts/deploy_desktop.py
+++ b/scripts/deploy_desktop.py
@ -194,7 +194,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")
--- a/scripts/deploy_server.py
+++ b/scripts/deploy_server.py
@ -114,6 +114,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")
@ -163,8 +166,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'
--- a/2
+++ b/2
@ -1 +1 @@
-7.2.0
+7.2.1
Author	SHA1	Message	Date
Oleg Korshul	1ad42f671a	Merge pull request #574 from ONLYOFFICE/release/v7.3.0 Fix previous commit	2022-11-23 14:02:48 +03:00
Oleg Korshul	b3ab757416	Merge pull request #572 from ONLYOFFICE/release/v7.3.0 Release/v7.3.0	2022-11-23 10:52:33 +03:00
Semyon Bezrukov	65571cfa06	Release/v7.3.0 (#569 ) * Delete quotes in AddUpgradeCode action (#555) * Add feature switches (#553) * Update vcredist checksums (#556) * Fix macos package script (#558) * Fix macos package script * Small fix * Small fix * [desktop] skip WinSparkle from deploy * Fix macos package build (#561) * Add build mobile package (#562) * Fix packages build (#563) * Fix macOS ARM package build (#564) * Updated script for generation plugin macros documentation. * Fix core archive * Small fix * Add macOS ARM core archive build (#568) Co-authored-by: Eugene Kozyrev <67453079+EugeneKozyrev@users.noreply.github.com> Co-authored-by: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com> Co-authored-by: Nikita Khromov <nikita.khromov@onlyoffice.com> Co-authored-by: Oleg Korshul <Oleg.Korshul@onlyoffice.com>	2022-11-18 18:20:00 +03:00
papacarlo	4fd5d6a814	Merge pull request #560 from ONLYOFFICE/feature/merge-hotfix Merge branch hotfix/v7.2.1 into develop	2022-11-11 15:42:04 +03:00
Semyon Bezrukov	c68c365261	Merge branch 'hotfix/v7.2.1' into develop	2022-11-11 15:39:31 +03:00
Semyon Bezrukov	d2d7dc0717	Update vcredist checksums (#557 )	2022-11-09 18:33:47 +03:00
Eugene Kozyrev	e50a0e84f2	Delete quotes in AddUpgradeCode action (#555 )	2022-11-07 16:00:15 +03:00
Semyon Bezrukov	fe098a7ee7	Add desktop help installer build / Fix bug 58536 (#541 )	2022-10-18 18:33:27 +03:00
Semyon Bezrukov	aced6c5119	Fix server document-templates files (#540 )	2022-10-18 16:58:24 +03:00
papacarlo	94cd21189e	Merge branch release/v7.2.0 into hotfix/v7.2.1	2022-10-12 12:26:08 +00:00
Oleg Korshul	a2fcf85e3b	Add move_dir method	2022-10-12 10:12:38 +03:00
Oleg Korshul	e830cb9141	Add embed worker to deploy	2022-10-04 15:27:07 +03:00
Semyon Bezrukov	9bf3985fb2	Fix notes_dst variable (#533 )	2022-10-03 11:49:59 +03:00
github-actions[bot]	59ad11b0f4	Update hard-coded version to v7.2.1	2022-09-29 13:14:56 +00:00
Semyon Bezrukov	ca7d92703e	Keep desktop local help for windows xp (#532 )	2022-09-29 14:53:39 +03:00
 @ -1 +1 @@
 .2.0
 .2.1