pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-04-07 14:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from ONLYOFFICE/hotfix/v5.5.1

Browse Source 
Hotfix/v5.5.1
This commit is contained in:
Oleg Korshul
2020-03-11 11:41:34 +03:00
committed by GitHub
parent 2b0d5837a0 8141f9d3e7
commit 0c1eb2db14
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/core_common/modules/boost.py
View File

@ -27,6 +27,16 @@ def make():
#if not base.is_dir("boost_1_58_0"):
# base.extract("boost_1_58_0.7z", "./")
boost_version_good = "boost_version_1"
boost_version = base.readFile("./boost.data")
if (boost_version != boost_version_good):
base.delete_file("./boost.data")
base.writeFile("./boost.data", boost_version_good)
if base.is_dir("boost_1_58_0"):
base.delete_dir("boost_1_58_0")
if base.is_dir("build"):
base.delete_dir("build")
if not base.is_dir("boost_1_58_0"):
base.cmd("git", ["clone", "--recursive", "--depth=1", "https://github.com/boostorg/boost.git", "boost_1_58_0", "-b" "boost-1.58.0"])

16
scripts/core_common/modules/openssl.py
View File

@ -16,6 +16,14 @@ def make():
old_cur = os.getcwd()
os.chdir(base_dir)
openssl_version_good = "openssl_version_1"
openssl_version = base.readFile("./openssl.data")
if (openssl_version != openssl_version_good):
base.delete_file("./openssl.data")
base.writeFile("./openssl.data", openssl_version_good)
if base.is_dir("openssl"):
base.delete_dir("openssl")
if not base.is_dir("openssl"):
base.cmd("git", ["clone", "--depth=1", "https://github.com/openssl/openssl.git"])
@ -23,6 +31,14 @@ def make():
if not base.is_file("Makefile"):
base.cmd("./config", ["no-shared", "no-asm"])
if base.is_file("./libssl.a") and base.is_file("./libcrypto.a"):
os.chdir(old_cur)
return
if ("linux" == base.host_platform()):
base.replaceInFile("./Makefile", "CFLAGS=-Wall -O3", "CFLAGS=-Wall -O3 -fvisibility=hidden")
base.replaceInFile("./Makefile", "CXXFLAGS=-Wall -O3", "CXXFLAGS=-Wall -O3 -fvisibility=hidden")
base.cmd("make", ["build_libs"])
os.chdir(old_cur)

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

@ -27,9 +27,12 @@ def make():
os.environ["PATH"] = base_dir + "/depot_tools" + os.pathsep + os.environ["PATH"]
if not base.is_dir("v8/out.gn"):
base.delete_file("./.gclient")
base.delete_file("./.gclient_entries")
base.delete_dir("./.cipd")
if base.is_exist("./.gclient"):
base.delete_file("./.gclient")
if base.is_exist("./.gclient_entries"):
base.delete_file("./.gclient_entries")
if base.is_exist("./.cipd"):
base.delete_dir("./.cipd")
base.cmd("gclient")
# --------------------------------------------------------------------------

6
scripts/deploy_desktop.py
View File

@ -178,8 +178,8 @@ def make():
base.copy_dir(git_dir + "/sdkjs-plugins/macros", root_dir + "/editors/sdkjs-plugins/{E6978D28-0441-4BD7-8346-82FAD68BCA3B}")
base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/{8D67F3C5-7736-4BAE-A0F2-8C7127DC4BB8}", root_dir + "/editors/sdkjs-plugins/{8D67F3C5-7736-4BAE-A0F2-8C7127DC4BB8}")
base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/common/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}", root_dir + "/editors/sdkjs-plugins/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}")
base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/engine/database/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}", root_dir + "/editors/sdkjs-plugins/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}")
#base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/common/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}", root_dir + "/editors/sdkjs-plugins/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}")
#base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/engine/database/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}", root_dir + "/editors/sdkjs-plugins/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}")
if (0 != platform.find("mac")):
base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/{060E6A7D-2766-44E8-A0EE-9A8CB9DB00D1}", root_dir + "/editors/sdkjs-plugins/{060E6A7D-2766-44E8-A0EE-9A8CB9DB00D1}")
@ -204,7 +204,7 @@ def make():
themes_params = []
if ("" != config.option("themesparams")):
themes_params = ["--params=\"" + config.option("themesparams") + "\""]
base.cmd_exe(root_dir + "/converter/allfontsgen", ["--use-system=\"1\"", "--input=\"" + root_dir + "/fonts\"", "--allfonts=\"" + root_dir + "/converter/AllFonts.js\"", "--selection=\"" + root_dir + "/converter/font_selection.bin\""])
base.cmd_exe(root_dir + "/converter/allfontsgen", ["--use-system=\"1\"", "--input=\"" + root_dir + "/fonts\"", "--input=\"" + git_dir + "/core-fonts\"", "--allfonts=\"" + root_dir + "/converter/AllFonts.js\"", "--selection=\"" + root_dir + "/converter/font_selection.bin\""])
base.cmd_exe(root_dir + "/converter/allthemesgen", ["--converter-dir=\"" + root_dir + "/converter\"", "--src=\"" + root_dir + "/editors/sdkjs/slide/themes\"", "--allfonts=\"AllFonts.js\"", "--output=\"" + root_dir + "/editors/sdkjs/common/Images\""] + themes_params)
base.delete_exe(root_dir + "/converter/allfontsgen")