diff options
| author | Astound <kirito@disroot.org> | 2024-03-10 02:11:09 +0800 |
|---|---|---|
| committer | Astound <kirito@disroot.org> | 2024-03-10 02:11:09 +0800 |
| commit | ff2a2edaa59f2fc03a074b86f85d80f49ed1b4d7 (patch) | |
| tree | 636adeac9d1a98f1bcecf19563039f05389bdd9b | |
| parent | 38d8d5d4c5e1f7b83308ad079674dd1157b57be1 (diff) | |
| download | yt-local-ff2a2edaa59f2fc03a074b86f85d80f49ed1b4d7.tar.lz yt-local-ff2a2edaa59f2fc03a074b86f85d80f49ed1b4d7.tar.xz yt-local-ff2a2edaa59f2fc03a074b86f85d80f49ed1b4d7.zip | |
generate_release: Fix wrong (32bit) MSVCR included for 64 bitInsert the 64 bit microsoft visual C runtime for 64 bit releases
| -rw-r--r-- | generate_release.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generate_release.py b/generate_release.py index 049b43b..8bec3a0 100644 --- a/generate_release.py +++ b/generate_release.py @@ -114,10 +114,12 @@ if bitness == '32': visual_c_runtime_url = 'https://github.com/yuempek/vc-archive/raw/master/archives/vc15_(14.10.25017.0)_2017_x86.7z' visual_c_runtime_sha256 = '2549eb4d2ce4cf3a87425ea01940f74368bf1cda378ef8a8a1f1a12ed59f1547' visual_c_name = 'vc15_(14.10.25017.0)_2017_x86.7z' + visual_c_path_to_dlls = 'runtime_minimum/System' else: visual_c_runtime_url = 'https://github.com/yuempek/vc-archive/raw/master/archives/vc15_(14.10.25017.0)_2017_x64.7z' visual_c_runtime_sha256 = '4f00b824c37e1017a93fccbd5775e6ee54f824b6786f5730d257a87a3d9ce921' visual_c_name = 'vc15_(14.10.25017.0)_2017_x64.7z' + visual_c_path_to_dlls = 'runtime_minimum/System64' download_if_not_exists('get-pip.py', get_pip_url) @@ -198,7 +200,7 @@ with open('./python/python3' + major_release + '._pth', 'a', encoding='utf-8') a f.write('..\n')''' log('Inserting Microsoft C Runtime') -check_subp(subprocess.run([r'7z', '-y', 'e', '-opython', 'vc15_(14.10.25017.0)_2017_x86.7z', 'runtime_minimum/System'])) +check_subp(subprocess.run([r'7z', '-y', 'e', '-opython', visual_c_name, visual_c_path_to_dlls])) log('Installing dependencies') wine_run(['./python/python.exe', '-I', '-m', 'pip', 'install', '--no-compile', '-r', './requirements.txt']) |