Fix vcredist download (#761)

ONLYOFFICE · Nov 15, 2023 · 265cac6 · 265cac6
1 parent 96ff18b
commit 265cac6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/scripts/package_common.py b/scripts/package_common.py
@@ -16,34 +16,15 @@
 out_dir = "build_tools/out"
 tsa_server = "http://timestamp.digicert.com"
 vcredist_links = {
-  "2022": {
+  # Microsoft Visual C++ 2015-2022 Redistributable - 14.38.33130
+  "2015-2022": {
     "x64": {
       "url": "https://aka.ms/vs/17/release/vc_redist.x64.exe",
-      "md5": "077f0abdc2a3881d5c6c774af821f787"
+      "md5": "101b0b9f74cdc6cdbd2570bfe92e302c"
     },
     "x86": {
       "url": "https://aka.ms/vs/17/release/vc_redist.x86.exe",
-      "md5": "ae427c1329c3b211a6d09f8d9506eb74"
-    }
-  },
-  "2015": {
-    "x64": {
-      "url": "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe",
-      "md5": "27b141aacc2777a82bb3fa9f6e5e5c1c"
-    },
-    "x86": {
-      "url": "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe",
-      "md5": "1a15e6606bac9647e7ad3caa543377cf"
-    }
-  },
-  "2013": {
-    "x64": {
-      "url": "https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe",
-      "md5": "96b61b8e069832e6b809f24ea74567ba"
-    },
-    "x86": {
-      "url": "https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe",
-      "md5": "0fc525b6b7b96a87523daa7a0013c69d"
+      "md5": "0d762264d9765e21c15a58edc43f4706"
     }
   }
 }
diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py
@@ -91,8 +91,7 @@ def make_windows():
   make_zip()
 
   vcdl = True
-  vcdl &= download_vcredist("2013")
-  vcdl &= download_vcredist("2022")
+  vcdl &= download_vcredist("2015-2022")
 
   if not vcdl:
     utils.set_summary("desktop inno build", False)