Skip to content

include_directory fix for manifest and setup.py #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mriehl merged 1 commit into from
Jul 13, 2016
Merged

include_directory fix for manifest and setup.py #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/main/python/pybuilder/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def include_file(self, package_name, filename):
return
self._package_data[package_name].append(filename)

def include_directory(self, package_path, patterns_list):
def include_directory(self, package_path, patterns_list, package_root=""):
if not package_path or package_path.strip() == "":
raise ValueError("Missing argument package_path.")

Expand All @@ -487,12 +487,14 @@ def include_directory(self, package_path, patterns_list):
package_name = package_path.replace(PATH_SEPARATOR, '.')
self._manifest_include_directory(package_path, patterns_list)

for root, dirnames, filenames in os.walk(package_path):
package_full_path = os.path.join(package_root, package_path)

for root, dirnames, filenames in os.walk(package_full_path):
filenames = list(fnmatch.filter(filenames, pattern) for pattern in patterns_list)

for filename in itertools.chain.from_iterable(filenames):
full_path = os.path.join(root, filename)
relative_path = full_path.replace(package_path, '', 1).lstrip(PATH_SEPARATOR)
relative_path = full_path.replace(package_full_path, '', 1).lstrip(PATH_SEPARATOR)
self._package_data.setdefault(package_name, []).append(relative_path)

@property
Expand Down