pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-02-10 20:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Oleg Korshul
2022-06-18 18:44:14 +03:00
parent 206c1da862
commit cc84676070
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/base.py
View File

@ -605,13 +605,10 @@ def qt_config(platform):
config_param += " apple_silicon use_javascript_core"
if config.check_option("module", "mobile"):
config_param += " support_web_socket"
if (config.option("vs-version") == "2019"):
config_param += " v8_version_89 vs2019"
if ("linux_arm64" == platform):
config_param += " linux_arm64"
if config.check_option("platform", "linux_arm64"):
config_param += " v8_version_89"
return config_param
def qt_major_version():
@ -1257,10 +1254,9 @@ def copy_v8_files(core_dir, deploy_dir, platform, is_xp=False):
return
directory_v8 = core_dir + "/Common/3dParty"
if is_xp:
directory_v8 += "/v8/v8_xp/"
elif (-1 != config.option("config").lower().find("v8_version_89")):
directory_v8 += "/v8_89/v8/out.gn/"
if (config.option("vs-version") == "2019"):
directory_v8 += "/v8/v8_xp"
if (-1 != config.option("config").lower().find("v8_version_89")) and not is_xp:
directory_v8 += "/v8_89/v8/out.gn/"
else:
directory_v8 += "/v8/v8/out.gn/"

7
scripts/config.py
View File

@ -77,6 +77,13 @@ def parse():
if ("linux" == host_platform) and (5004 <= base.get_gcc_version()) and not check_option("platform", "android"):
extend_option("config", "v8_version_89")
if ("windows" == host_platform) and ("2019" == option("vs-version")):
extend_option("config", "v8_version_89")
extend_option("config", "vs2019")
if check_option("platform", "linux_arm64"):
extend_option("config", "v8_version_89")
# check vs-path
if ("windows" == host_platform) and ("" == option("vs-path")):
programFilesDir = base.get_env("ProgramFiles")

4
scripts/core_common/modules/v8.py
View File

@ -71,10 +71,6 @@ def make():
use_v8_89 = False
if (-1 != config.option("config").lower().find("v8_version_89")):
use_v8_89 = True
if ("windows" == base.host_platform()) and (config.option("vs-version") == "2019"):
use_v8_89 = True
if config.check_option("platform", "linux_arm64"):
use_v8_89 = True
if (use_v8_89):
v8_89.make()