From b934429e41f5f9f085af3181c9cde4466c51e2a5 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Tue, 4 Jun 2024 23:27:09 +0300
Subject: [PATCH] Rename modules for standard libs correctly work

---
 make.py                                      |  4 +-
 scripts/build_sln.py                         | 49 ++++++++++++++++++++
 scripts/core_common/make_common.py           |  4 +-
 scripts/core_common/modules/websocket_all.py | 16 +++++++
 4 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 scripts/build_sln.py
 create mode 100644 scripts/core_common/modules/websocket_all.py

diff --git a/make.py b/make.py
index 48458eb..9c52800 100755
--- a/make.py
+++ b/make.py
@@ -11,7 +11,7 @@ sys.path.append(__dir__name__ + '/scripts/core_common/modules')
 sys.path.append(__dir__name__ + '/scripts/core_common/modules/android')
 import config
 import base
-from scripts import build
+import build_sln
 import build_js
 import build_server
 import deploy
@@ -94,7 +94,7 @@ if config.check_option("module", "desktop"):
     base.set_env("DESKTOP_URL_UPDATES_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcastdev.json")
 
 # build
-build.make()
+build_sln.make()
 
 # js
 build_js.make()
diff --git a/scripts/build_sln.py b/scripts/build_sln.py
new file mode 100644
index 0000000..6907436
--- /dev/null
+++ b/scripts/build_sln.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+import config
+import base
+import os
+import sys
+sys.path.append(os.path.dirname(__file__) + "/..")
+import sln
+import qmake
+
+# make solution
+def make(solution=""):
+  platforms = config.option("platform").split()
+  for platform in platforms:
+    if not platform in config.platforms:
+      continue
+
+    print("------------------------------------------")
+    print("BUILD_PLATFORM: " + platform)
+    print("------------------------------------------")
+
+    if ("" == solution):
+      solution = "./sln.json"
+    projects = sln.get_projects(solution, platform)
+
+    for pro in projects:
+      qmake_main_addon = ""
+      if (0 == platform.find("android")) and (-1 != pro.find("X2tConverter.pro")):
+        if config.check_option("config", "debug") and not config.check_option("config", "disable_x2t_debug_strip"):
+          print("[WARNING:] temporary enable strip for x2t library in debug")
+          qmake_main_addon += "build_strip_debug"
+
+      qmake.make(platform, pro, qmake_main_addon)
+      if config.check_option("platform", "ios") and config.check_option("config", "bundle_xcframeworks"):
+        qmake.make(platform, pro, "xcframework_platform_ios_simulator")
+
+  if config.check_option("module", "builder") and base.is_windows() and "onlyoffice" == config.branding():
+    # check replace
+    new_replace_path = base.correctPathForBuilder(os.getcwd() + "/../core/DesktopEditor/doctrenderer/docbuilder.com/src/docbuilder.h")
+    if ("2019" == config.option("vs-version")):
+      base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.com/src", "docbuilder.com_2019.sln")
+      if (True):
+        new_path_net = base.correctPathForBuilder(os.getcwd() + "/../core/DesktopEditor/doctrenderer/docbuilder.net/src/docbuilder.net.cpp")
+        base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.net/src", "docbuilder.net.sln")
+        base.restorePathForBuilder(new_path_net)
+    else:
+      base.make_sln_project("../core/DesktopEditor/doctrenderer/docbuilder.com/src", "docbuilder.com.sln")
+    base.restorePathForBuilder(new_replace_path)
+  return
diff --git a/scripts/core_common/make_common.py b/scripts/core_common/make_common.py
index 00754af..7527aad 100755
--- a/scripts/core_common/make_common.py
+++ b/scripts/core_common/make_common.py
@@ -13,7 +13,7 @@ import cef
 import icu
 import openssl
 import curl
-from modules import websocket
+import websocket_all
 import v8
 import html2
 import hunspell
@@ -54,5 +54,5 @@ def make():
   if config.check_option("module", "mobile"):
     if (config.check_option("platform", "android")):
       curl.make()
-    websocket.make()
+    websocket_all.make()
   return
diff --git a/scripts/core_common/modules/websocket_all.py b/scripts/core_common/modules/websocket_all.py
new file mode 100644
index 0000000..6164f1f
--- /dev/null
+++ b/scripts/core_common/modules/websocket_all.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../..')
+import config
+import base
+#import ixwebsocket
+#import socketrocket
+import socket_io
+
+def make():
+  #ixwebsocket.make()
+  #socketrocket.make()
+  socket_io.make()
+
+  return