From 2311c553197e98abc7aff5a2e04330c44de0b9a3 Mon Sep 17 00:00:00 2001 From: Sergey Konovalov Date: Thu, 19 Oct 2023 23:32:25 +0300 Subject: [PATCH 1/5] [develop] Fix develop readme instruction --- develop/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/develop/README.md b/develop/README.md index aea31be8..d924a375 100644 --- a/develop/README.md +++ b/develop/README.md @@ -33,7 +33,7 @@ use the following commands: ### Clone development environment to work dir ```bash -git clone -b feature/docker-instruction https://github.com/ONLYOFFICE/build_tools.git +git clone https://github.com/ONLYOFFICE/build_tools.git ``` ### Modify Docker Images From 342556b7639abd11827051c9319a93b660c18a5e Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 24 Oct 2023 22:49:15 +0300 Subject: [PATCH 2/5] Fix windows build --- scripts/core_common/modules/v8_89.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/core_common/modules/v8_89.py b/scripts/core_common/modules/v8_89.py index 42c80d3e..85f82354 100644 --- a/scripts/core_common/modules/v8_89.py +++ b/scripts/core_common/modules/v8_89.py @@ -108,11 +108,10 @@ def make(): if ("windows" == base.host_platform()): base.replaceInFile("v8/build/config/win/BUILD.gn", ":static_crt", ":dynamic_crt") - else: - base.replaceInFile("depot_tools/gclient_paths.py", "@functools.lru_cache", "") - if not base.is_file("v8/src/base/platform/wrappers.cc"): base.writeFile("v8/src/base/platform/wrappers.cc", "#include \"src/base/platform/wrappers.h\"\n") + else: + base.replaceInFile("depot_tools/gclient_paths.py", "@functools.lru_cache", "") if not base.is_file("v8/third_party/jinja2/tests.py.bak"): base.copy_file("v8/third_party/jinja2/tests.py", "v8/third_party/jinja2/tests.py.bak") From fd2e480e171646cefb098c8aeb71d2324dc3acbe Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 25 Oct 2023 22:25:59 +0300 Subject: [PATCH 3/5] Fix build v8 for xp --- scripts/core_common/modules/v8.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/core_common/modules/v8.py b/scripts/core_common/modules/v8.py index 46146de1..c87238dc 100644 --- a/scripts/core_common/modules/v8.py +++ b/scripts/core_common/modules/v8.py @@ -230,8 +230,11 @@ def make_xp(): if base.is_file("depot_tools/cipd.ps1"): base.replaceInFile("depot_tools/cipd.ps1", "windows-386", "windows-amd64") + # 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" os.environ["PATH"] = os.pathsep.join([base_dir + "/depot_tools", - base_dir + "/depot_tools/win_tools-2_7_13_chromium7_bin/python/bin", + base_dir + path_to_python2, config.option("vs-path") + "/../Common7/IDE", os.environ["PATH"]]) From b3a2493767a601bf74aad70629d4680cfc37f186 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 26 Oct 2023 07:59:57 +0000 Subject: [PATCH 4/5] Update hard-coded version to v7.5.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 18bb4182..a5f017a0 100644 --- a/version +++ b/version @@ -1 +1 @@ -7.5.0 +7.5.1 From 6d8f89deba4cfa910dc2fc168e5499d2c03b8de4 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Fri, 27 Oct 2023 10:37:52 +0300 Subject: [PATCH 5/5] Fix typo --- scripts/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/base.py b/scripts/base.py index 750697a7..67839d95 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -194,7 +194,7 @@ def copy_dir(src, dst): except: if ("windows" == host_platform()) and copy_dir_windows(src, dst): return - print('Directory not copied. Error: %s' % e) + print("Directory not copied") return def copy_dir_windows(src, dst):