Merge branch hotfix/v7.3.2 into develop

Update hard-coded version to v7.3.2
Merge remote-tracking branch 'origin/hotfix/v7.3.2' into develop
2026-04-07 14:06:31 +08:00 · 2023-02-14 07:52:35 +00:00 · 2023-02-08 08:31:39 +00:00 · 2023-02-06 23:28:38 +03:00 · 2023-02-05 13:11:07 +05:00 · 2023-02-05 10:06:11 +03:00
7 changed files with 93 additions and 47 deletions
--- a/scripts/base.py
+++ b/scripts/base.py
@ -769,7 +769,7 @@ def generate_doctrenderer_config(path, root, product, vendor = ""):
  file.close()
  return

-def generate_plist(path):
+def generate_plist_framework_folder(file):
  bundle_id_url = "com.onlyoffice."
  if ("" != get_env("PUBLISHER_BUNDLE_ID")):
    bundle_id_url = get_env("PUBLISHER_BUNDLE_ID")
@ -782,43 +782,52 @@ def generate_plist(path):
  for n in bundle_version_natural:
    bundle_version.append(n)

-  for file in glob.glob(path + '/**/*.framework', recursive=True):
-    if not is_dir(file):
-      continue
-    name = os.path.basename(file)
-    name = name.replace(".framework", "")
+  name = os.path.basename(file)
+  name = name.replace(".framework", "")

-    content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    content += "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-    content += "<plist version=\"1.0\">\n"
-    content += "<dict>\n"
-    content += "\t<key>CFBundleExecutable</key>\n"
-    content += ("\t<string>" + name + "</string>\n")
-    content += "\t<key>CFBundleGetInfoString</key>\n"
-    content += "\t<string>Created by " + bundle_creator + "</string>\n"
-    content += "\t<key>CFBundleIdentifier</key>\n"
-    content += "\t<string>" + bundle_id_url + correct_bundle_identifier(name) + "</string>\n"
-    content += "\t<key>CFBundlePackageType</key>\n"
-    content += "\t<string>FMWK</string>\n"
-    content += "\t<key>CFBundleShortVersionString</key>\n"
-    content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "</string>\n"
-    content += "\t<key>CFBundleSignature</key>\n"
-    content += "\t<string>????</string>\n"
-    content += "\t<key>CFBundleVersion</key>\n"
-    content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "." + bundle_version[2] + "</string>\n"
-    content += "\t<key>MinimumOSVersion</key>\n"
-    content += "\t<string>13.0</string>\n"
-    content += "</dict>\n"
-    content += "</plist>"
+  content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+  content += "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+  content += "<plist version=\"1.0\">\n"
+  content += "<dict>\n"
+  content += "\t<key>CFBundleExecutable</key>\n"
+  content += ("\t<string>" + name + "</string>\n")
+  content += "\t<key>CFBundleGetInfoString</key>\n"
+  content += "\t<string>Created by " + bundle_creator + "</string>\n"
+  content += "\t<key>CFBundleIdentifier</key>\n"
+  content += "\t<string>" + bundle_id_url + correct_bundle_identifier(name) + "</string>\n"
+  content += "\t<key>CFBundlePackageType</key>\n"
+  content += "\t<string>FMWK</string>\n"
+  content += "\t<key>CFBundleShortVersionString</key>\n"
+  content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "</string>\n"
+  content += "\t<key>CFBundleSignature</key>\n"
+  content += "\t<string>????</string>\n"
+  content += "\t<key>CFBundleVersion</key>\n"
+  content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "." + bundle_version[2] + "</string>\n"
+  content += "\t<key>MinimumOSVersion</key>\n"
+  content += "\t<string>13.0</string>\n"
+  content += "</dict>\n"
+  content += "</plist>"

-    fileDst = file + "/Info.plist"
-    if is_file(fileDst):
-      delete_file(fileDst)
+  fileDst = file + "/Info.plist"
+  if is_file(fileDst):
+    delete_file(fileDst)

-    fileInfo = codecs.open(fileDst, "w", "utf-8")
-    fileInfo.write(content)
-    fileInfo.close()
-      
+  fileInfo = codecs.open(fileDst, "w", "utf-8")
+  fileInfo.write(content)
+  fileInfo.close()
+  return
+
+def generate_plist(path):
+  src_folder = path
+  if ("/" != path[-1:]):
+    src_folder += "/"
+  src_folder += "*"
+  for file in glob.glob(src_folder):
+    if (is_dir(file)):
+      if file.endswith(".framework"):
+        generate_plist_framework_folder(file)
+      else:
+        generate_plist(file)
  return

 def correct_bundle_identifier(bundle_identifier):
--- a/scripts/core_common/make_common.py
+++ b/scripts/core_common/make_common.py
@ -20,7 +20,6 @@ import hunspell
 import glew
 import harfbuzz
 import hyphen
-import socket_io

 def check_android_ndk_macos_arm(dir):
  if base.is_dir(dir + "/darwin-x86_64") and not base.is_dir(dir + "/darwin-arm64"):
@ -44,10 +43,10 @@ def make():
  hunspell.make(False)
  harfbuzz.make()
  glew.make()
-  hyphen.make()
-  socket_io.make()
+  hyphen.make()  
  
  if config.check_option("module", "mobile"):
-    curl.make()
+    if (config.check_option("platform", "android")):
+      curl.make()
    websocket.make()
  return
--- a/scripts/core_common/modules/socket_io.py
+++ b/scripts/core_common/modules/socket_io.py
@ -6,6 +6,22 @@ import config
 import base
 import os
 import subprocess
+import glob
+
+def correct_namespace(dir):
+  folder = dir
+  if ("/" != folder[-1:]):
+    folder += "/"
+  folder += "*"
+  for file in glob.glob(folder):
+    if base.is_file(file):
+      base.replaceInFile(file, "namespace sio", "namespace sio_no_tls")
+      base.replaceInFile(file, "asio::", "asio_no_tls::")
+      base.replaceInFile(file, "sio::", "sio_no_tls::")
+      base.replaceInFile(file, "asio_no_tls::", "asio::")
+    elif base.is_dir(file):
+      correct_namespace(file)
+  return

 def make():
  base_dir = base.get_script_dir() + "/../../core/Common/3dParty/socketio"
@ -13,4 +29,16 @@ def make():
    base.cmd_in_dir(base_dir, "git", ["clone", "https://github.com/socketio/socket.io-client-cpp.git"])
    base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["submodule", "init"])
    base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["submodule", "update"])
+
+    # no tls realization (remove if socket.io fix this)
+    dst_dir = base_dir + "/socket.io-client-cpp/src_no_tls"
+    base.copy_dir(base_dir + "/socket.io-client-cpp/src", dst_dir)
+    correct_namespace(dst_dir)
+    base.replaceInFile(dst_dir + "/internal/sio_client_impl.h", "SIO_TLS", "SIO_TLS_NO")
+    base.replaceInFile(dst_dir + "/internal/sio_client_impl.cpp", "SIO_TLS", "SIO_TLS_NO")
+
+    base.replaceInFile(dst_dir + "/sio_socket.h", "SIO_SOCKET_H", "SIO_SOCKET_NO_TLS_H")
+    base.replaceInFile(dst_dir + "/sio_client.h", "SIO_CLIENT_H", "SIO_CLIENT_NO_TLS_H")
+    base.replaceInFile(dst_dir + "/sio_message.h", "__SIO_MESSAGE_H__", "__SIO_MESSAGE_NO_TLS_H__")
+    base.replaceInFile(dst_dir + "/internal/sio_packet.h", "SIO_PACKET_H", "SIO_PACKET_NO_TLS_H")
  return
--- a/scripts/core_common/modules/v8_89.py
+++ b/scripts/core_common/modules/v8_89.py
@ -70,12 +70,14 @@ def make():

  if not base.is_dir("v8"):
    base.cmd("./depot_tools/fetch", ["v8"], True)
+    base.copy_dir("./v8/third_party", "./v8/third_party_new")
    if ("windows" == base.host_platform()):
      os.chdir("v8")
      base.cmd("git", ["config", "--system", "core.longpaths", "true"])
      os.chdir("../")
    base.cmd("./depot_tools/gclient", ["sync", "-r", "remotes/branch-heads/8.9"], True)
    base.cmd("gclient", ["sync", "--force"], True)
+    base.copy_dir("./v8/third_party_new/ninja", "./v8/third_party/ninja")

  if ("windows" == base.host_platform()):
    base.replaceInFile("v8/build/config/win/BUILD.gn", ":static_crt", ":dynamic_crt")
--- a/scripts/core_common/modules/websocket.py
+++ b/scripts/core_common/modules/websocket.py
@ -6,11 +6,13 @@ import config
 import base
 import ixwebsocket
 import socketrocket
+import socket_io

 config_file = base.get_script_dir() + "/../../core/Common/WebSocket/websocket.pri"

 def make():
-  ixwebsocket.make()
-  socketrocket.make()
+  #ixwebsocket.make()
+  #socketrocket.make()
+  socket_io.make()

  return
--- a/scripts/package_desktop.py
+++ b/scripts/package_desktop.py
@ -61,6 +61,7 @@ def make_windows():
  package_name = branding.desktop_package_name
  package_version = common.version + "." + common.build
  source_dir = "..\\..\\..\\..\\build_tools\\out\\%s\\%s\\%s" % (prefix, company, product)
+  source_help_dir = source_dir + "-help"
  arch_list = {
    "windows_x64":    "x64",
    "windows_x64_xp": "x64",
@ -102,14 +103,17 @@ def make_windows():

  if not vcdl:
    utils.set_summary("desktop inno build", False)
-    # utils.set_summary("desktop inno help build", False)
+    utils.set_summary("desktop inno help build", False)
    utils.set_summary("desktop inno update build", False)
    utils.set_summary("desktop advinst build", False)
    utils.set_cwd(common.workspace_dir)
    return

  make_inno()
-  # make_inno_help()
+
+  if branding.onlyoffice and common.platform in ["windows_x64", "windows_x86"]:
+    make_inno_help()
+
  make_inno_update()

  if common.platform == "windows_x64":
@ -227,9 +231,11 @@ def make_inno_update():
  utils.log_h2("desktop inno update build")
  utils.log_h2(inno_update_file)

-  args = ["iscc"] + iscc_args + ["/DTARGET_NAME=" + inno_file, "update_common.iss"]
-  ret = utils.cmd(*args, creates=inno_update_file, verbose=True)
-  utils.set_summary("desktop inno update build", ret)
+  # args = ["iscc"] + iscc_args + ["/DTARGET_NAME=" + inno_file, "update_common.iss"]
+  # ret = utils.cmd(*args, creates=inno_update_file, verbose=True)
+  # utils.set_summary("desktop inno update build", ret)
+  ret = True
+  utils.copy_file(inno_file, inno_update_file)

  if common.deploy and ret:
    utils.log_h2("desktop inno update deploy")
--- a/2
+++ b/2
@ -1 +1 @@
-7.3.0
+7.3.2
Author	SHA1	Message	Date
papacarlo	0811018560	Merge branch hotfix/v7.3.2 into develop	2023-02-14 07:52:35 +00:00
github-actions[bot]	cecf304ace	Update hard-coded version to v7.3.2	2023-02-08 08:31:39 +00:00
Oleg Korshul	7764d4ba30	Merge remote-tracking branch 'origin/hotfix/v7.3.2' into develop	2023-02-06 23:28:38 +03:00
Oleg Korshul	719a198e55	Merge pull request #617 from ONLYOFFICE/hotfix/v7.3.1 Hotfix/v7.3.1	2023-02-05 13:11:07 +05:00
maxkadushkin	8eac35df75	fix package building for desktop	2023-02-05 10:06:11 +03:00
papacarlo	975972885a	Merge branch release/v7.3.0 into develop	2023-02-02 13:29:00 +00:00
papacarlo	056da4b782	Merge branch release/v7.3.0 into master	2023-02-02 13:28:57 +00:00
github-actions[bot]	0de3c26200	Update hard-coded version to v7.3.1	2023-02-02 08:08:32 +00:00
Oleg Korshul	f5539cf79f	Fix build (ninja missing)	2023-02-02 09:56:09 +03:00
Oleg Korshul	a0bdca62b5	Disable unused modules	2023-02-01 23:27:47 +03:00
Oleg Korshul	ad996d39d2	Merge pull request #614 from ONLYOFFICE/feature/change-desktop-updates-build [desktop] changed building updates for desktop	2023-02-02 00:15:44 +05:00
maxkadushkin	d393b9ea90	[desktop] changed building updates for desktop	2023-02-01 22:09:31 +03:00
Alexey Golubev	6efb0cfccf	Merge pull request #613 from ONLYOFFICE/release/v7.3.0 Merge release/v7.3.0 into hotfix/v7.3.0	2023-02-01 12:35:24 +05:00
Semyon Bezrukov	19ac16ff62	Fix DesktopEditorsHelp installer build [2] (#612 ) * Fix DesktopEditorsHelp installer build * Small fix	2023-02-01 12:29:54 +05:00
Oleg.Korshul	468f1788b8	Add support no tls version socket.io	2023-01-31 22:58:47 +05:00
Semyon Bezrukov	36b5e1b5d7	Fix DesktopEditorsHelp installer build (#610 )	2023-01-31 20:27:03 +05:00
papacarlo	4b50455a22	Merge branch release/v7.3.0 into master	2023-01-31 07:56:10 +00:00
Semyon Bezrukov	5250de602c	Enable DesktopEditorsHelp installer build (#608 )	2023-01-30 17:39:24 +05:00
Oleg.Korshul	ffb88cdf57	Remove depends to python3	2023-01-28 23:45:57 +05:00
Oleg Korshul	306703e677	Merge branch 'release/v7.3.0' into develop	2023-01-02 14:54:40 +03:00
Oleg Korshul	256edf489c	Merge pull request #598 from ONLYOFFICE/feature/package-develop-fix Merge release/v7.3.0 package fixes	2023-01-02 14:53:08 +03:00
Semyon Bezrukov	655837f8cd	Merge release/v7.3.0 package fixes	2023-01-01 23:17:14 +03:00
Oleg Korshul	ef43e6a9a4	Remove not used websocket engine	2023-01-01 19:55:25 +03:00
papacarlo	8fa222a9b9	Merge branch hotfix/v7.2.2 into develop	2022-12-27 13:43:24 +00:00
Semyon Bezrukov	0e90989998	Small fix (#590 )	2022-12-23 22:51:34 +03:00
Semyon Bezrukov	dd9a8b9df5	Fix develop (#588 ) * Fix msi build (#583) * Add packages upload s3 endpoint url option (#584) * Fix package build (#585) * Refactoring package scripts (#587) * Refactoring logs * Refactoring packages * Small fix	2022-12-23 20:11:12 +03:00
papacarlo	d758cd1e7d	Merge branch hotfix/v7.2.2 into master	2022-12-20 07:54:28 +00:00
Elena Subbotina	ad83a772a1	Merge commit 'ab838ae3ba50283cd683a1bbaa7ac256d28cc256' into develop	2022-12-12 12:30:30 +03:00
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
 @ -1 +1 @@
 .3.0
 .3.2