macOS hydrus source fix
With luck, this puts the 'hydrus' source structure back in, which PyOxidizer, unlike PyInstaller, needs. Also a test to see if putting server.exe in 'binaries' is ok for Win/Linux
This commit is contained in:
parent
eacb26aef3
commit
8951b2f762
|
@ -9,19 +9,19 @@ block_cipher = None
|
||||||
|
|
||||||
a = Analysis(['hydrus/hydrus_client.py'],
|
a = Analysis(['hydrus/hydrus_client.py'],
|
||||||
pathex=['.'],
|
pathex=['.'],
|
||||||
binaries=[],
|
binaries=[
|
||||||
|
('dist/hydrus_server/hydrus_server', '.')
|
||||||
|
],
|
||||||
datas=[
|
datas=[
|
||||||
('hydrus/bin', 'bin'),
|
('hydrus/bin', 'bin'),
|
||||||
('hydrus/help', 'help'),
|
('hydrus/help', 'help'),
|
||||||
('hydrus/static', 'static'),
|
('hydrus/static', 'static'),
|
||||||
('dist/hydrus_server/hydrus_server', '.'),
|
|
||||||
('hydrus/license.txt', '.'),
|
('hydrus/license.txt', '.'),
|
||||||
('hydrus/README.md', '.'),
|
('hydrus/README.md', '.'),
|
||||||
('hydrus/help my client will not boot.txt', '.'),
|
('hydrus/help my client will not boot.txt', '.'),
|
||||||
('hydrus/db', 'db'),
|
('hydrus/db', 'db'),
|
||||||
(cloudscraper_dir, 'cloudscraper')
|
(cloudscraper_dir, 'cloudscraper')
|
||||||
],
|
],
|
||||||
hiddenimports=['hydrus/hydrus_server.py'],
|
|
||||||
hookspath=[],
|
hookspath=[],
|
||||||
runtime_hooks=[],
|
runtime_hooks=[],
|
||||||
excludes=[],
|
excludes=[],
|
||||||
|
|
|
@ -37,6 +37,9 @@ def make_install(client, resources):
|
||||||
static_resources = glob(["./*.py", "./*.md", "./*txt", "./bin/**/*", "./static/**/*", "./help/**/*"], strip_prefix="{}/".format(CWD))
|
static_resources = glob(["./*.py", "./*.md", "./*txt", "./bin/**/*", "./static/**/*", "./help/**/*"], strip_prefix="{}/".format(CWD))
|
||||||
files.add_manifest(static_resources)
|
files.add_manifest(static_resources)
|
||||||
|
|
||||||
|
hydrus_source = glob(["./hydrus/**/*.py"], strip_prefix="{}/".format(CWD))
|
||||||
|
files.add_manifest(hydrus_source)
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
print(BUILD_TARGET_TRIPLE)
|
print(BUILD_TARGET_TRIPLE)
|
||||||
|
|
|
@ -13,19 +13,19 @@ a = Analysis(['hydrus\\hydrus_client.pyw'],
|
||||||
binaries=[
|
binaries=[
|
||||||
('hydrus\\sqlite3.dll', '.'),
|
('hydrus\\sqlite3.dll', '.'),
|
||||||
('hydrus\\mpv-2.dll', '.')
|
('hydrus\\mpv-2.dll', '.')
|
||||||
|
('dist\\hydrus_server\\hydrus_server.exe*', '.'),
|
||||||
],
|
],
|
||||||
datas=[
|
datas=[
|
||||||
('hydrus\\bin', 'bin'),
|
('hydrus\\bin', 'bin'),
|
||||||
('hydrus\\help', 'help'),
|
('hydrus\\help', 'help'),
|
||||||
('hydrus\\static', 'static'),
|
('hydrus\\static', 'static'),
|
||||||
('dist\\hydrus_server\\hydrus_server.exe*', '.'),
|
|
||||||
('hydrus\\license.txt', '.'),
|
('hydrus\\license.txt', '.'),
|
||||||
('hydrus\\README.md', '.'),
|
('hydrus\\README.md', '.'),
|
||||||
('hydrus\\help my client will not boot.txt', '.'),
|
('hydrus\\help my client will not boot.txt', '.'),
|
||||||
('hydrus\\db', 'db'),
|
('hydrus\\db', 'db'),
|
||||||
(cloudscraper_dir, 'cloudscraper')
|
(cloudscraper_dir, 'cloudscraper')
|
||||||
],
|
],
|
||||||
hiddenimports=['hydrus\\hydrus_server.py', 'cloudscraper'],
|
hiddenimports=['cloudscraper'],
|
||||||
hookspath=[],
|
hookspath=[],
|
||||||
runtime_hooks=[],
|
runtime_hooks=[],
|
||||||
excludes=[],
|
excludes=[],
|
||||||
|
|
Loading…
Reference in New Issue