Merge branch hotfix/v7.5.1 into master

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

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):

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"]])
 

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")

version

@@ -1 +1 @@
-7.5.0
+7.5.1