diff --git a/scripts/core_common/modules/v8.py b/scripts/core_common/modules/v8.py index c87238dc..aa71addf 100644 --- a/scripts/core_common/modules/v8.py +++ b/scripts/core_common/modules/v8.py @@ -93,6 +93,7 @@ def make(): if not base.is_dir("depot_tools"): base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) + v8_89.change_bootstrap() if ("windows" == base.host_platform()): # hack for 32 bit system!!! if base.is_file("depot_tools/cipd.ps1"): @@ -225,6 +226,7 @@ def make_xp(): if not base.is_dir("depot_tools"): base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) + v8_89.change_bootstrap() if ("windows" == base.host_platform()): # hack for 32 bit system!!! if base.is_file("depot_tools/cipd.ps1"): @@ -232,7 +234,7 @@ def make_xp(): # old variant #path_to_python2 = "/depot_tools/win_tools-2_7_13_chromium7_bin/python/bin" - path_to_python2 = "/depot_tools/bootstrap-2@3_8_10_chromium_26_bin/python/bin" + path_to_python2 = "/depot_tools/bootstrap-2@3_8_10_chromium_23_bin/python/bin" os.environ["PATH"] = os.pathsep.join([base_dir + "/depot_tools", base_dir + path_to_python2, config.option("vs-path") + "/../Common7/IDE", @@ -269,6 +271,13 @@ def make_xp(): " replaceInFile(file, 'MultiThreaded', 'MultiThreadedDLL')", ]); + programFilesDir = base.get_env("ProgramFiles") + if ("" != base.get_env("ProgramFiles(x86)")): + programFilesDir = base.get_env("ProgramFiles(x86)") + dev_path = programFilesDir + "\\Microsoft Visual Studio 14.0\\Common7\\IDE" + if (base.is_dir(dev_path)): + os.environ["PATH"] = dev_path + os.pathsep + os.environ["PATH"] + # add "SET CL=\"/D_ITERATOR_DEBUG_LEVEL=0\"" before devenv for disable _ITERATOR_DEBUG_LEVEL in debug if config.check_option("platform", "win_64_xp"): if not base.is_dir("win_64/release"): diff --git a/scripts/core_common/modules/v8_89.py b/scripts/core_common/modules/v8_89.py index 85f82354..96432631 100644 --- a/scripts/core_common/modules/v8_89.py +++ b/scripts/core_common/modules/v8_89.py @@ -7,6 +7,23 @@ import os import subprocess +def change_bootstrap(): + base.move_file("./depot_tools/bootstrap/manifest.txt", "./depot_tools/bootstrap/manifest.txt.bak") + content = "# changed by build_tools\n\n" + content += "$VerifiedPlatform windows-amd64 windows-arm64 linux-amd64 mac-amd64 mac-arm64\n\n" + + content += "@Subdir python\n" + content += "infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.39\n\n" + + content += "@Subdir python3\n" + content += "infra/3pp/tools/cpython3/${platform} version:2@3.8.10.chromium.23\n\n" + + content += "@Subdir git\n" + content += "infra/3pp/tools/git/${platform} version:2@2.41.0.chromium.11\n" + + base.writeFile("./depot_tools/bootstrap/manifest.txt", content) + return + def make_args(args, platform, is_64=True, is_debug=False): args_copy = args[:] if is_64: @@ -46,6 +63,12 @@ def ninja_windows_make(args, is_64=True, is_debug=False): base.copy_file("./" + directory_out + "/obj/v8_wrappers.ninja", "./" + directory_out + "/obj/v8_wrappers.ninja.bak") base.replaceInFile("./" + directory_out + "/obj/v8_wrappers.ninja", "target_output_name = v8_wrappers", "target_output_name = v8_wrappers\nbuild obj/v8_wrappers.obj: cxx ../../../src/base/platform/wrappers.cc") base.replaceInFile("./" + directory_out + "/obj/v8_wrappers.ninja", "build obj/v8_wrappers.lib: alink", "build obj/v8_wrappers.lib: alink obj/v8_wrappers.obj") + + win_toolset_wrapper_file = "build/toolchain/win/tool_wrapper.py" + win_toolset_wrapper_file_content = base.readFile("build/toolchain/win/tool_wrapper.py") + if (-1 == win_toolset_wrapper_file_content.find("line = line.decode('utf8')")): + base.replaceInFile(win_toolset_wrapper_file, "for line in link.stdout:\n", "for line in link.stdout:\n line = line.decode('utf8')\n") + base.cmd("ninja", ["-C", directory_out, "v8_wrappers"]) base.cmd("ninja", ["-C", directory_out]) base.delete_file("./" + directory_out + "/obj/v8_wrappers.ninja") @@ -85,6 +108,7 @@ def make(): os.chdir(base_dir) if not base.is_dir("depot_tools"): base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) + change_bootstrap() os.environ["PATH"] = base_dir + "/depot_tools" + os.pathsep + os.environ["PATH"] diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index d841df81..a0eb4c88 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -131,14 +131,14 @@ def make_zip(): def download_vcredist(): vcredist = { - # Microsoft Visual C++ 2015-2022 Redistributable - 14.38.33130 + # Microsoft Visual C++ 2015-2022 Redistributable - 14.38.33135 "windows_x64": { "url": "https://aka.ms/vs/17/release/vc_redist.x64.exe", - "md5": "101b0b9f74cdc6cdbd2570bfe92e302c" + "md5": "a8a68bcc74b5022467f12587baf1ef93" }, "windows_x86": { "url": "https://aka.ms/vs/17/release/vc_redist.x86.exe", - "md5": "0d762264d9765e21c15a58edc43f4706" + "md5": "9882a328c8414274555845fa6b542d1e" }, # Microsoft Visual C++ 2015-2019 Redistributable - 14.27.29114 "windows_x64_xp": { diff --git a/version b/version index ae9a76b9..cd1d2e94 100644 --- a/version +++ b/version @@ -1 +1 @@ -8.0.0 +8.0.1