#!/usr/bin/env python3
+
+# Allow direct execution
import os
-import platform
import sys
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+import platform
+
from PyInstaller.__main__ import run as run_pyinstaller
-OS_NAME = platform.system()
-if OS_NAME == 'Windows':
- from PyInstaller.utils.win32.versioninfo import (
- FixedFileInfo,
- SetVersion,
- StringFileInfo,
- StringStruct,
- StringTable,
- VarFileInfo,
- VarStruct,
- VSVersionInfo,
- )
-elif OS_NAME == 'Darwin':
- pass
-else:
- raise Exception(f'{OS_NAME} is not supported')
+from devscripts.utils import read_version
-ARCH = platform.architecture()[0][:2]
+OS_NAME, MACHINE, ARCH = sys.platform, platform.machine().lower(), platform.architecture()[0][:2]
+if MACHINE in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
+ MACHINE = 'x86' if ARCH == '32' else ''
def main():
- opts = parse_options()
- version = read_version('yt_dlp/version.py')
+ opts, version = parse_options(), read_version()
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}')
+ name, final_file = exe(onedir)
+ print(f'Building yt-dlp v{version} for {OS_NAME} {platform.machine()} with options {opts}')
print('Remember to update the version using "devscripts/update-version.py"')
if not os.path.isfile('yt_dlp/extractor/lazy_extractors.py'):
print('WARNING: Building without lazy_extractors. Run '
'--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(),
+ '--additional-hooks-dir=yt_dlp/__pyinstaller',
*opts,
'yt_dlp/__main__.py',
]
def parse_options():
- # Compatability with older arguments
+ # Compatibility with older arguments
opts = sys.argv[1:]
if opts[0:1] in (['32'], ['64']):
if ARCH != opts[0]:
return opts
-# 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 exe(onedir):
+ """@returns (name, path)"""
+ name = '_'.join(filter(None, (
+ 'yt-dlp',
+ {'win32': '', 'darwin': 'macos'}.get(OS_NAME, OS_NAME),
+ MACHINE,
+ )))
+ return name, ''.join(filter(None, (
+ 'dist/',
+ onedir and f'{name}/',
+ name,
+ OS_NAME == 'win32' and '.exe'
+ )))
def version_to_list(version):
return list(map(int, version_list)) + [0] * (4 - len(version_list))
-def dependency_options():
- # 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)
-
-
-def pycryptodome_module():
- try:
- import Cryptodome # noqa: F401
- except ImportError:
- try:
- import Crypto # noqa: F401
- print('WARNING: Using Crypto since Cryptodome is not available. '
- 'Install with: pip install pycryptodomex', file=sys.stderr)
- return 'Crypto'
- except ImportError:
- pass
- return 'Cryptodome'
-
-
def set_version_info(exe, version):
- if OS_NAME == 'Windows':
+ if OS_NAME == 'win32':
windows_set_version(exe, version)
def windows_set_version(exe, version):
+ from PyInstaller.utils.win32.versioninfo import (
+ FixedFileInfo,
+ StringFileInfo,
+ StringStruct,
+ StringTable,
+ VarFileInfo,
+ VarStruct,
+ VSVersionInfo,
+ )
+
+ try:
+ from PyInstaller.utils.win32.versioninfo import SetVersion
+ except ImportError: # Pyinstaller >= 5.8
+ from PyInstaller.utils.win32.versioninfo import write_version_info_to_executable as SetVersion
+
version_list = version_to_list(version)
- suffix = '_x86' if ARCH == '32' else ''
+ suffix = MACHINE and f'_{MACHINE}'
SetVersion(exe, VSVersionInfo(
ffi=FixedFileInfo(
filevers=version_list,
),
kids=[
StringFileInfo([StringTable('040904B0', [
- StringStruct('Comments', 'yt-dlp%s Command Line Interface.' % suffix),
+ StringStruct('Comments', 'yt-dlp%s Command Line Interface' % suffix),
StringStruct('CompanyName', 'https://github.com/yt-dlp'),
- StringStruct('FileDescription', 'yt-dlp%s' % (' (32 Bit)' if ARCH == '32' else '')),
+ StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),
StringStruct('FileVersion', version),
StringStruct('InternalName', f'yt-dlp{suffix}'),
StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),
projects / yt-dlp.git / blobdiff