diff --git a/DatabaseApp.spec b/DatabaseApp.spec index b2f3eeb..06e1454 100644 --- a/DatabaseApp.spec +++ b/DatabaseApp.spec @@ -1,31 +1,21 @@ # -*- mode: python ; coding: utf-8 -*- -import os +from PyInstaller.utils.hooks import collect_all -# Bundle mysql-connector locales to fix "no localization for language 'eng'" error -_mysql_locales = os.path.join( - os.path.dirname(os.path.abspath('.')), - 'db_interface', 'venv', 'Lib', 'site-packages', 'mysql', 'connector', 'locales' -) -# Fallback: resolve relative to spec file location -_spec_dir = os.path.dirname(os.path.abspath(SPEC)) -_mysql_locales = os.path.join(_spec_dir, 'venv', 'Lib', 'site-packages', 'mysql', 'connector', 'locales') +mysql_datas, mysql_binaries, mysql_hiddenimports = collect_all('mysql.connector') a = Analysis( ['main.py'], pathex=[], - binaries=[], - datas=[ - (_mysql_locales, os.path.join('mysql', 'connector', 'locales')), - ], - hiddenimports=[ - 'mysql.connector', - 'mysql.connector.locales', - 'mysql.connector.locales.eng', - 'mysql.connector.plugins', - 'mysql.connector.plugins.mysql_native_password', + binaries=mysql_binaries, + datas=mysql_datas, + hiddenimports=mysql_hiddenimports + [ + 'mysql', 'mysql.connector', 'mysql.connector.locales', + 'mysql.connector.locales.eng', 'mysql.connector.locales.eng.client_error', + 'mysql.connector.plugins', 'mysql.connector.plugins.mysql_native_password', 'mysql.connector.plugins.caching_sha2_password', - 'kivy.core.window.window_sdl2', - 'win32timezone', + 'mysql.connector.aio', 'mysql.connector.aio.plugins', + 'mysql.connector.aio.plugins.mysql_native_password', + 'kivy.core.window.window_sdl2', 'win32timezone', ], hookspath=[], hooksconfig={}, diff --git a/dist/DatabaseApp.exe b/dist/DatabaseApp.exe index 2f3b816..09f13c3 100644 Binary files a/dist/DatabaseApp.exe and b/dist/DatabaseApp.exe differ