Win build shiboken fix?
There's a hack in the client spec for shiboken2, shiboken6 doesn't have the directory referenced, so let's try taking it out.
This commit is contained in:
parent
b1ab9931b5
commit
84ea7a0873
|
@ -336,7 +336,7 @@ jobs:
|
||||||
move ${{ steps.setup_ffmpeg.outputs.ffmpeg-path }} hydrus\bin\
|
move ${{ steps.setup_ffmpeg.outputs.ffmpeg-path }} hydrus\bin\
|
||||||
move hydrus\static\build_files\windows\sqlite3.dll hydrus\
|
move hydrus\static\build_files\windows\sqlite3.dll hydrus\
|
||||||
move hydrus\static\build_files\windows\sqlite3.exe hydrus\db
|
move hydrus\static\build_files\windows\sqlite3.exe hydrus\db
|
||||||
move hydrus\static\build_files\windows\client-win.spec client-win.spec
|
move hydrus\static\build_files\windows\client-winQt5.spec client-win.spec
|
||||||
move hydrus\static\build_files\windows\server-win.spec server-win.spec
|
move hydrus\static\build_files\windows\server-win.spec server-win.spec
|
||||||
pyinstaller server-win.spec
|
pyinstaller server-win.spec
|
||||||
pyinstaller client-win.spec
|
pyinstaller client-win.spec
|
||||||
|
@ -438,7 +438,7 @@ jobs:
|
||||||
move ${{ steps.setup_ffmpeg.outputs.ffmpeg-path }} hydrus\bin\
|
move ${{ steps.setup_ffmpeg.outputs.ffmpeg-path }} hydrus\bin\
|
||||||
move hydrus\static\build_files\windows\sqlite3.dll hydrus\
|
move hydrus\static\build_files\windows\sqlite3.dll hydrus\
|
||||||
move hydrus\static\build_files\windows\sqlite3.exe hydrus\db
|
move hydrus\static\build_files\windows\sqlite3.exe hydrus\db
|
||||||
move hydrus\static\build_files\windows\client-win.spec client-win.spec
|
move hydrus\static\build_files\windows\client-winQt6.spec client-win.spec
|
||||||
move hydrus\static\build_files\windows\server-win.spec server-win.spec
|
move hydrus\static\build_files\windows\server-win.spec server-win.spec
|
||||||
pyinstaller server-win.spec
|
pyinstaller server-win.spec
|
||||||
pyinstaller client-win.spec
|
pyinstaller client-win.spec
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
# -*- mode: python ; coding: utf-8 -*-
|
||||||
|
|
||||||
|
import cloudscraper
|
||||||
|
import os
|
||||||
|
import glob
|
||||||
|
cloudscraper_dir = os.path.dirname( cloudscraper.__file__ )
|
||||||
|
|
||||||
|
block_cipher = None
|
||||||
|
|
||||||
|
|
||||||
|
a = Analysis(['hydrus\\client.pyw'],
|
||||||
|
pathex=['.'],
|
||||||
|
binaries=[],
|
||||||
|
datas=[
|
||||||
|
('hydrus\\bin', 'bin'),
|
||||||
|
('hydrus\\help', 'help'),
|
||||||
|
('hydrus\\static', 'static'),
|
||||||
|
('dist\\server\\server.exe*', '.'),
|
||||||
|
('hydrus\\license.txt', '.'),
|
||||||
|
('hydrus\\README.md', '.'),
|
||||||
|
('hydrus\\help my client will not boot.txt', '.'),
|
||||||
|
('hydrus\\db', 'db'),
|
||||||
|
('hydrus\\hydrus', 'hydrus'),
|
||||||
|
('hydrus\\sqlite3.dll', '.'),
|
||||||
|
('hydrus\\mpv-1.dll', '.'),
|
||||||
|
(cloudscraper_dir, 'cloudscraper')
|
||||||
|
],
|
||||||
|
hiddenimports=['hydrus\\server.py', 'cloudscraper'],
|
||||||
|
hookspath=[],
|
||||||
|
runtime_hooks=[],
|
||||||
|
excludes=[],
|
||||||
|
win_no_prefer_redirects=False,
|
||||||
|
win_private_assemblies=False,
|
||||||
|
cipher=block_cipher,
|
||||||
|
noarchive=False)
|
||||||
|
pyz = PYZ(a.pure, a.zipped_data,
|
||||||
|
cipher=block_cipher)
|
||||||
|
exe = EXE(pyz,
|
||||||
|
a.scripts,
|
||||||
|
[],
|
||||||
|
exclude_binaries=True,
|
||||||
|
name='client',
|
||||||
|
debug=False,
|
||||||
|
bootloader_ignore_signals=False,
|
||||||
|
strip=False,
|
||||||
|
upx=True,
|
||||||
|
console=False,
|
||||||
|
icon='hydrus\\static\\hydrus.ico' )
|
||||||
|
coll = COLLECT(exe,
|
||||||
|
a.binaries,
|
||||||
|
a.zipfiles,
|
||||||
|
a.datas,
|
||||||
|
strip=False,
|
||||||
|
upx=False,
|
||||||
|
upx_exclude=[],
|
||||||
|
name='Hydrus Network')
|
Loading…
Reference in New Issue