Skip to content

Commit 9fd22df

Browse files
committed
Rename resources_to_filter to files_to_filter
'Resources' makes it sound like it only applies to src/main/resources. But it also applies to eg. src/freeze/...
1 parent 9101366 commit 9fd22df

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

fbs/_defaults/src/build/settings/base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"src/unittest/python",
55
"src/integrationtest/python"
66
],
7-
"resources_to_filter": [],
7+
"files_to_filter": [],
88
"hidden_imports": []
99
}

fbs/_defaults/src/build/settings/linux.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author_email": "",
55
"url": "",
66
"depends": [],
7-
"resources_to_filter": [
7+
"files_to_filter": [
88
"src/installer/linux/usr/share/applications/AppName.desktop"
99
]
1010
}

fbs/_defaults/src/build/settings/mac.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"freeze_dir": "target/${app_name}.app",
33
"mac_bundle_identifier": "",
44
"installer": "${app_name}.dmg",
5-
"resources_to_filter": [
5+
"files_to_filter": [
66
"src/freeze/mac/Contents/Info.plist"
77
],
88
"show_console_window": false

fbs/_defaults/src/build/settings/windows.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"installer": "${app_name}Setup.exe",
3-
"resources_to_filter": [
3+
"files_to_filter": [
44
"src/installer/windows/Installer.nsi"
55
],
66
"show_console_window": false

fbs/freeze/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def run_pyinstaller(extra_args=None, debug=False):
4444
def _generate_resources():
4545
"""
4646
Copy the data files from src/main/resources to ${freeze_dir}.
47-
Automatically filters files mentioned in the setting resources_to_filter:
47+
Automatically filters files mentioned in the setting files_to_filter:
4848
Placeholders such as ${app_name} are automatically replaced by the
4949
corresponding setting in files on that list.
5050
"""

fbs/resources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def _copy_with_filtering(
7777
class _paths:
7878
def __init__(self, paths):
7979
self._paths = []
80-
# _defaults includes "resources_to_filter" - eg. Installer.nsi. If these
80+
# _defaults includes "files_to_filter" - eg. Installer.nsi. If these
8181
# files don't also exist in the "user's" src/ directory, then
8282
# Path(p).resolve() raises FileNotFoundError. Handle this:
8383
for p in paths:
@@ -101,5 +101,5 @@ def _resolve_strict(self, path_):
101101
def _copy(path_fn, src, dst): # Used by several other internal fbs modules
102102
src = path_fn(src)
103103
if exists(src):
104-
filter_ = [path_fn(f) for f in SETTINGS['resources_to_filter']]
104+
filter_ = [path_fn(f) for f in SETTINGS['files_to_filter']]
105105
copy_with_filtering(src, dst, files_to_filter=filter_)

0 commit comments

Comments
 (0)