From e166237e5d4c1352d55b9c3ca95f34d8d2bb861c Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 4 Jun 2024 23:29:20 +0300 Subject: [PATCH] Fix previous commit --- scripts/build.py | 49 ------------------------ scripts/core_common/modules/websocket.py | 18 --------- 2 files changed, 67 deletions(-) delete mode 100644 scripts/build.py delete mode 100755 scripts/core_common/modules/websocket.py diff --git a/scripts/build.py b/scripts/build.py deleted file mode 100644 index 69074369..00000000 --- a/scripts/build.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/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/modules/websocket.py b/scripts/core_common/modules/websocket.py deleted file mode 100755 index 7d0e5fe9..00000000 --- a/scripts/core_common/modules/websocket.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python - -import sys -sys.path.append('../..') -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() - socket_io.make() - - return