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 branch 'release/v5.5.0' into develop

Browse Source
This commit is contained in:
Oleg Korshul
2019-12-27 16:16:23 +03:00
parent c2ed0d0368 c41fa386bc
commit 413cf616ff
3 changed files with 13 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build.pro
View File

@ -94,17 +94,17 @@ SUBDIRS += \
hunspell \
ooxmlsignature
!no_desktop_apps {
core_windows:SUBDIRS += projicons
SUBDIRS += desktopapp
}
core_and_multimedia {
SUBDIRS += \
documentscore \
videoplayer
}
!no_desktop_apps {
core_windows:SUBDIRS += projicons
SUBDIRS += desktopapp
}
}
ordered {
@ -307,10 +307,8 @@ desktop {
videoplayer.depends = kernel unicodeconverter graphics
!no_desktop_apps {
core_windows {
projicons.depends = documentscore videoplayer
}
desktopapp.depends = documentscore videoplayer
core_windows:projicons.depends = documentscore videoplayer
desktopapp.depends = documentscore videoplayer
}
}

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

@ -14,13 +14,14 @@ def make():
os.chdir(base_dir)
# download
url = "https://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z"
if not base.is_file("boost_1_58_0.7z"):
base.download("https://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z", "boost_1_58_0.7z")
#url = "https://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z"
#if not base.is_file("boost_1_58_0.7z"):
# base.download("https://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z", "boost_1_58_0.7z")
#if not base.is_dir("boost_1_58_0"):
# base.extract("boost_1_58_0.7z", "./")
if not base.is_dir("boost_1_58_0"):
base.extract("boost_1_58_0.7z", "./")
base.cmd("git", ["clone", "--recursive", "--depth=1", "https://github.com/boostorg/boost.git", "boost_1_58_0", "-b" "boost-1.58.0"])
os.chdir("boost_1_58_0")

57
scripts/deploy_server.py
View File

@ -9,46 +9,6 @@ from tempfile import mkstemp
import datetime
def sed(pattern, replace, source, dest=None, count=0):
"""Reads a source file and writes the destination file.
In each line, replaces pattern with replace.
Args:
pattern (str): pattern to match (can be re.pattern)
replace (str): replacement str
source (str): input filename
count (int): number of occurrences to replace
dest (str): destination filename, if not given, source will be over written.
"""
fin = open(source, 'r')
num_replaced = count
if dest:
fout = open(dest, 'w')
else:
fd, name = mkstemp()
fout = open(name, 'w')
for line in fin:
out = re.sub(pattern, replace, line)
fout.write(out)
if out != line:
num_replaced += 1
if count and num_replaced > count:
break
try:
fout.writelines(fin.readlines())
except Exception as E:
raise E
fin.close()
fout.close()
if not dest:
shutil.move(name, source)
def make():
base_dir = base.get_script_dir() + "/../out"
@ -169,27 +129,10 @@ def make():
product_version = base.get_env('PRODUCT_VERSION')
if(not product_version):
product_version = "0.0.0"
base.set_env('PRODUCT_VERSION', product_version)
build_number = base.get_env('BUILD_NUMBER')
if(not build_number):
build_number = "0"
base.set_env('BUILD_NUMBER', build_number)
publisher_name = base.get_env('PUBLISHER_NAME')
if(not publisher_name):
publisher_name = "Ascensio System SIA"
base.set_env('PUBLISHER_NAME', publisher_name)
publisher_url = base.get_env('PUBLISHER_URL')
if(not publisher_url):
publisher_url = "https://www.onlyoffice.com/"
base.set_env('PUBLISHER_URL', publisher_url)
base.set_env("PRODUCT_VERSION", product_version)
base.set_env("BUILD_NUMBER", build_number)
base.set_env("PUBLISHER_NAME", publisher_name)
base.set_env("PUBLISHER_URL", publisher_url)
branding_dir = base.get_env('BRANDING_DIR')
if(not branding_dir):