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

.

Browse Source
This commit is contained in:
Oleg Korshul
2019-11-29 13:24:41 +03:00
parent 499038a0a1
commit e3c9abcb6a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/core_common/modules/icu.py
View File

@ -52,13 +52,15 @@ def make():
if not base.is_dir(platform + "/build"):
base.replaceInFile("./icu/source/tools/pkgdata/pkgdata.cpp", "cmd, \"%s %s -o %s%s %s %s%s %s %s\",", "cmd, \"%s %s -o %s%s %s %s %s %s %s\",")
if ("" != platform):
if ("" != platform) and not base.is_dir(platform + "/build"):
base.create_dir(platform)
base.cmd("icu/source/runConfigureICU", [platform])
os.chdir("icu/source")
base.cmd("./runConfigureICU", ["Linux" if "linux" == base.host_platform() else "MacOSX"])
old_dest_dir = base.get_env("DESTDIR")
base.set_env("DESTDIR", platform)
base.cmd("make", ["install"])
base.set_env("DESTDIR", old_dest_dir)
os.chdir("../..")
base.create_dir(platform + "/build")
if ("linux_64" == platform):
base.copy_file("icu/source/lib/libicudata.so." + icu_major + "." + icu_minor, platform + "/build/libicudata.so." + icu_major)

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

@ -19,7 +19,7 @@ def make():
if not base.is_dir("openssl"):
base.cmd("git", ["clone", "--depth=1", "https://github.com/openssl/openssl.git"])
os.chdir(base_dir + "openssl")
os.chdir(base_dir + "/openssl")
if not base.is_file("Makefile"):
base.cmd("./config", ["no-shared", "no-asm"])