Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Fix antlib location in bundled pyinstaller executable #370

Merged
merged 3 commits into from
Jul 6, 2022
Merged

Fix antlib location in bundled pyinstaller executable #370

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44f2a65
Add antlib to antlib/ instead of the bundle root
bjorgan Feb 28, 2022
c24c40a
Merge branch 'master' into fix/pyinstaller-antlib
jornbh Jul 5, 2022
c809f60
Merge branch 'master' into fix/pyinstaller-antlib
jornbh Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nrfutil.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (sys.platform == "win32"):
module_ant = importlib.import_module('antlib')
mod_dir_ant = os.path.dirname(module_ant.__file__)
shlib_dir_ant = os.path.abspath(mod_dir_ant)
datas.append((shlib_dir_ant, '.'))
datas.append((shlib_dir_ant, 'antlib'))

nrfutil_path = os.path.dirname(os.path.abspath(SPEC))
datas.append((os.path.join(nrfutil_path, "libusb", "x64", "libusb-1.0.dylib"), os.path.join("libusb", "x64")))
Expand Down