From ce9c47c3ea93007def4f654e8e06ec854589ff71 Mon Sep 17 00:00:00 2001
From: Gres <gres@gres.biz>
Date: Sun, 3 Apr 2022 12:19:50 +0300
Subject: [PATCH] Update tesseract version

---
 .github/workflows/build.yml |  2 +-
 share/ci/common.py          | 10 +---------
 share/ci/config.py          |  2 +-
 share/ci/get_tesseract.py   |  6 +++---
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a693b2..3cc9cb3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{ matrix.config.os }}
     env:
       OS: ${{ matrix.config.name }}
-      MSVC_VERSION: 2022/Enterprise
+      MSVC_VERSION: C:/Program Files/Microsoft Visual Studio/2022/Enterprise
     strategy:
       matrix:
         config:
diff --git a/share/ci/common.py b/share/ci/common.py
index 1cee6fe..9ff797c 100644
--- a/share/ci/common.py
+++ b/share/ci/common.py
@@ -150,15 +150,7 @@ def get_msvc_env_cmd(bitness='64', msvc_version=''):
     if platform.system() != "Windows":
         return None
 
-    msvc_path = 'C:/Program Files/Microsoft Visual Studio'
-    if len(msvc_version) == 0:
-        with os.scandir(msvc_path) as ver_it:
-            version = next(ver_it, '')
-            with os.scandir(msvc_path + '/' + version) as ed_it:
-                msvc_version = version + '/' + next(ed_it, '')
-
-    env_script = msvc_path + '/{}/VC/Auxiliary/Build/vcvars{}.bat'.format(
-        msvc_version, bitness)
+    env_script = msvc_version + '/VC/Auxiliary/Build/vcvars{}.bat'.format(bitness)
     return '"' + env_script + '"'
 
 
diff --git a/share/ci/config.py b/share/ci/config.py
index 5d4135d..7520942 100644
--- a/share/ci/config.py
+++ b/share/ci/config.py
@@ -30,6 +30,6 @@ os_name = getenv('OS', 'linux')
 app_version += {'linux': '', 'macos': '-experimental',
                 'win32': '', 'win64': ''}[os_name]
 bitness = '32' if os_name == 'win32' else '64'
-msvc_version = getenv('MSVC_VERSION', '2019/Community')
+msvc_version = getenv('MSVC_VERSION', 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Community')
 
 build_type = 'release' # 'debug'
diff --git a/share/ci/get_tesseract.py b/share/ci/get_tesseract.py
index 0efcc39..41009d3 100644
--- a/share/ci/get_tesseract.py
+++ b/share/ci/get_tesseract.py
@@ -6,8 +6,8 @@ import platform
 c.print('>> Installing tesseract')
 
 install_dir = dependencies_dir
-url = 'https://github.com/tesseract-ocr/tesseract/archive/4.1.3.tar.gz'
-required_version = '4.1.3'
+url = 'https://github.com/tesseract-ocr/tesseract/archive/5.1.0.tar.gz'
+required_version = '5.1.0'
 
 build_type_flag = 'Debug' if build_type == 'debug' else 'Release'
 
@@ -54,7 +54,7 @@ def check_existing():
 
     if platform.system() == "Windows":
         lib = install_dir + '/bin/tesseract{}.dll'.format(lib_suffix)
-        orig_lib = install_dir + '/bin/tesseract41.dll'
+        orig_lib = install_dir + '/bin/tesseract51.dll'
     elif platform.system() == "Darwin":
         lib = install_dir + '/lib/libtesseract{}.dylib'.format(lib_suffix)
         orig_lib = install_dir + '/lib/libtesseract.{}.dylib'.format(required_version)