Skip to content

Commit

Permalink
Merge pull request #2930 from ferricoxide/Issue_2929
Browse files Browse the repository at this point in the history
  • Loading branch information
lorengordon authored May 25, 2023
2 parents 50f20a2 + 2b36695 commit 7d7d217
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ci/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $PYI_DIST_LATEST = ".pyinstaller\dist\latest"
$PYI_SPEC_DIR = ".pyinstaller\spec"
$PYI_WORK_DIR = ".pyinstaller\build"

$PYI_HOOK_DIR = ".\ci\pyinstaller"
$PYI_HOOK_DIR = ".\ci\pyinstaller\win"
$PYI_SCRIPT = "${PYI_SPEC_DIR}\watchmaker-standalone.py"
$WAM_SCRIPT = ".\src\watchmaker\__main__.py"
$WAM_FILENAME = "watchmaker-${VERSION}-standalone-windows-amd64"
Expand Down
2 changes: 1 addition & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PYI_DIST_LATEST=".pyinstaller/dist/latest"
PYI_SPEC_DIR=".pyinstaller/spec"
PYI_WORK_DIR=".pyinstaller/build"

PYI_HOOK_DIR="./ci/pyinstaller"
PYI_HOOK_DIR="./ci/pyinstaller/elx"
PYI_SCRIPT="${PYI_SPEC_DIR}/watchmaker-standalone.py"
WAM_SCRIPT="./src/watchmaker/__main__.py"
WAM_FILENAME="watchmaker-${VERSION}-standalone-linux-x86_64"
Expand Down
40 changes: 40 additions & 0 deletions ci/pyinstaller/elx/hook-watchmaker.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# -*- coding: utf-8 -*-
"""Pyinstaller hook for watchmaker standalone."""
from __future__ import (
absolute_import,
division,
print_function,
unicode_literals,
with_statement,
)

from PyInstaller.utils.hooks import (
collect_data_files,
collect_dynamic_libs,
collect_submodules,
copy_metadata,
)

datas = [
("src/watchmaker/static", "watchmaker/static"),
(
"src/watchmaker/_vendor/pypa/get-pip/public/2.7",
"watchmaker/_vendor/pypa/get-pip/public/2.7",
),
('/usr/lib64/.libcrypto.so.*.hmac', '.'),
('/usr/lib64/.libssl.so.*.hmac', '.'),
]

binaries = [
('/usr/lib64/libcrypto.so.*', '.'),
('/usr/lib64/libssl.so.*', '.'),
]

hiddenimports = [
"boto3",
]

datas += copy_metadata("watchmaker", recursive=True)
datas += collect_data_files("watchmaker")
binaries += collect_dynamic_libs("watchmaker")
hiddenimports += collect_submodules("watchmaker")
File renamed without changes.

0 comments on commit 7d7d217

Please sign in to comment.