import platform
import sys
-from PyInstaller.utils.hooks import collect_submodules
+from PyInstaller.__main__ import run as run_pyinstaller
OS_NAME = platform.system()
if OS_NAME == 'Windows':
elif OS_NAME == 'Darwin':
pass
else:
- raise Exception('{OS_NAME} is not supported')
+ raise Exception(f'{OS_NAME} is not supported')
ARCH = platform.architecture()[0][:2]
def main():
opts = parse_options()
- version = read_version()
+ version = read_version('yt_dlp/version.py')
- suffix = '_macos' if OS_NAME == 'Darwin' else '_x86' if ARCH == '32' else ''
- final_file = 'dist/%syt-dlp%s%s' % (
- 'yt-dlp/' if '--onedir' in opts else '', suffix, '.exe' if OS_NAME == 'Windows' else '')
+ onedir = '--onedir' in opts or '-D' in opts
+ if not onedir and '-F' not in opts and '--onefile' not in opts:
+ opts.append('--onefile')
+
+ name = 'yt-dlp%s' % ('_macos' if OS_NAME == 'Darwin' else '_x86' if ARCH == '32' else '')
+ final_file = ''.join((
+ 'dist/', f'{name}/' if onedir else '', name, '.exe' if OS_NAME == 'Windows' else ''))
print(f'Building yt-dlp v{version} {ARCH}bit for {OS_NAME} with options {opts}')
print('Remember to update the version using "devscripts/update-version.py"')
print(f'Destination: {final_file}\n')
opts = [
- f'--name=yt-dlp{suffix}',
+ f'--name={name}',
'--icon=devscripts/logo.ico',
'--upx-exclude=vcruntime140.dll',
'--noconfirm',
+ # NB: Modules that are only imported dynamically must be added here.
+ # --collect-submodules may not work correctly if user has a yt-dlp installed via PIP
+ '--hidden-import=yt_dlp.compat._legacy',
*dependency_options(),
*opts,
- '--collect-submodules=yt_dlp',
'yt_dlp/__main__.py',
]
- print(f'Running PyInstaller with {opts}')
-
- import PyInstaller.__main__
-
- PyInstaller.__main__.run(opts)
+ print(f'Running PyInstaller with {opts}')
+ run_pyinstaller(opts)
set_version_info(final_file, version)
if ARCH != opts[0]:
raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system')
opts = opts[1:]
- return opts or ['--onefile']
+ return opts
-def read_version():
- exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
- return locals()['__version__']
+# Get the version from yt_dlp/version.py without importing the package
+def read_version(fname):
+ with open(fname, encoding='utf-8') as f:
+ exec(compile(f.read(), fname, 'exec'))
+ return locals()['__version__']
def version_to_list(version):
def dependency_options():
- dependencies = [pycryptodome_module(), 'mutagen', 'brotli', 'certifi'] + collect_submodules('websockets')
- excluded_modules = ['test', 'ytdlp_plugins', 'youtube-dl', 'youtube-dlc']
+ # Due to the current implementation, these are auto-detected, but explicitly add them just in case
+ dependencies = [pycryptodome_module(), 'mutagen', 'brotli', 'certifi', 'websockets']
+ excluded_modules = ['test', 'ytdlp_plugins', 'youtube_dl', 'youtube_dlc']
yield from (f'--hidden-import={module}' for module in dependencies)
+ yield '--collect-submodules=websockets'
yield from (f'--exclude-module={module}' for module in excluded_modules)