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 #566 from ONLYOFFICE/feature/core-archive-fix

Browse Source 
Fix core archive
This commit is contained in:
Oleg Korshul
2022-11-17 14:28:57 +03:00
committed by GitHub
parent 9c046cf10f 255ecd64b2
commit cf67d1cb77
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/base.py
View File

@ -881,7 +881,7 @@ def extract_unicode(src, dst):
def archive_folder(src, dst):
app = "7za" if ("mac" == host_platform()) else "7z"
return cmd_exe(app, ["a", "-r", dst, src])
return cmd_exe(app, ["a", dst, src])
# windows vcvarsall
def _call_vcvarsall_and_return_env(arch):

6
scripts/deploy_core.py
View File

@ -59,9 +59,9 @@ def make():
base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2ttester")
if base.is_file(archive_dir + "/core.7z"):
base.delete_file(archive_dir + "/core.7z")
base.archive_folder(archive_dir, archive_dir + "/core.7z")
if base.is_file(archive_dir + ".7z"):
base.delete_file(archive_dir + ".7z")
base.archive_folder(archive_dir + "/*", archive_dir + ".7z")
return

2
scripts/package_core.py
View File

@ -24,7 +24,7 @@ def make_core():
}
repo = repos[common.platform]
branch = utils.get_env("BRANCH_NAME")
core_7z = utils.get_path("build_tools/out/%s/%s/core/core.7z" % (prefix, company))
core_7z = utils.get_path("build_tools/out/%s/%s/core.7z" % (prefix, company))
dest_version = "%s/core/%s/%s/%s/" % (repo["repo"], branch, repo["version"], repo["arch"])
dest_latest = "%s/core/%s/%s/%s/" % (repo["repo"], branch, "latest", repo["arch"])