Add config option

This commit is contained in:
Alexey Nagaev
2025-10-17 14:38:46 +03:00
parent 8a70f3d14a
commit b6b09d17f4
6 changed files with 7 additions and 4 deletions

View File

@ -43,6 +43,7 @@ parser.add_option("--vs-path", action="store", type="string", dest="vs-path", de
parser.add_option("--siteUrl", action="store", type="string", dest="siteUrl", default="127.0.0.1", help="site url")
parser.add_option("--multiprocess", action="store", type="string", dest="multiprocess", default="1", help="provides ability to specify single process for make")
parser.add_option("--sysroot", action="store", type="string", dest="sysroot", default="0", help="provides ability to use sysroot (ubuntu 16.04) to build c++ code. If value is \"1\", then the sysroot from tools/linux/sysroot will be used, and if it is not there, it will download it and unpack it. You can also set value as the path to the your own sysroot (rarely used). Only for linux")
parser.add_option("--use-qemu", action="store", type="string", dest="use-qemu", default="0", help="Use qemu for win_arm64 cross build.")
(options, args) = parser.parse_args(arguments)
configOptions = vars(options)

View File

@ -2002,6 +2002,8 @@ def create_artifacts_qemu_win_arm(git_dir, branding, product, only_snapshots=Fal
start_qemu_bat_path = f"start.bat"
cmd(start_qemu_bat_path, [])
os.chdir(old_curr_dir)
delete_file(git_dir + "/automate.bat")
def create_x2t_js_cache(dir, product, platform):
# mac

View File

@ -119,7 +119,7 @@ def make():
base.mac_correct_rpath_docbuilder(root_dir)
base.create_x2t_js_cache(root_dir, "builder", platform)
if platform == "win_arm64":
if platform == "win_arm64" and not base.is_os_arm() and config.option("use-qemu") == "1":
base.create_artifacts_qemu_win_arm(git_dir, "builder", branding, True)
base.create_dir(root_dir + "/fonts")

View File

@ -75,7 +75,7 @@ def make():
# js cache
base.generate_doctrenderer_config(archive_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries")
base.create_x2t_js_cache(archive_dir, "core", platform)
if platform == "win_arm64":
if platform == "win_arm64" and not base.is_os_arm() and config.option("use-qemu") == "1":
base.create_artifacts_qemu_win_arm(git_dir, "core", branding, True)
base.delete_file(archive_dir + "/DoctRenderer.config")

View File

@ -315,7 +315,7 @@ def make():
sdkjs_dir_64 = sdkjs_dir[0:end_find_platform] + "/" + host_platform + "/" + sdkjs_dir[end_find_platform+11:]
base.delete_dir(sdkjs_dir)
base.copy_dir(sdkjs_dir_64, sdkjs_dir)
if platform == "win_arm64": # create bat file and start qemu to execute win arm binaries
if platform == "win_arm64" and config.option("use-qemu") == "1": # create bat file and start qemu to execute win arm binaries
base.create_artifacts_qemu_win_arm(git_dir, branding, "DesktopEditors", False, themes_params)
else:
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\""], True)

View File

@ -123,7 +123,7 @@ def make():
base.delete_file(file)
base.create_x2t_js_cache(converter_dir, "server", platform)
if platform == "win_arm64":
if platform == "win_arm64" and not base.is_os_arm() and config.option("use-qemu") == "1":
base.create_artifacts_qemu_win_arm(git_dir, "server", branding, True)
# add embed worker code