jepler/circuitpython-build-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46 from sommersoft/test_examps_bundle

Browse source 
Fix Example Bundling When 'examples' In Subfolder Name
This commit is contained in:
Kattni 2019-08-18 11:38:45 -04:00 committed by GitHub
commit 26ca8730a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
circuitpython_build_tools/build.py
View file

@ -116,17 +116,21 @@ def library(library_path, output_directory, package_folder_prefix,
# 'walked_files' while retaining subdirectory structure
walked_files = []
for path in path_walk:
rel_path = ""
if filename.startswith("examples"):
path_tail_idx = path[0].rfind("examples/") + 9
path_tail_idx = path[0].rfind("examples/")
if path_tail_idx != -1:
rel_path = "{}/".format(path[0][path_tail_idx + 9:])
else:
path_tail_idx = (path[0].rfind("{}/".format(filename))
+ (len(filename) +1))
path_tail = path[0][path_tail_idx:]
rel_path = ""
# if this entry is the package top dir, keep it
# empty so we don't double append the dir name
if filename not in path_tail:
rel_path = "{}/".format(path_tail)
path_tail = path[0][path_tail_idx:]
# if this entry is the package top dir, keep it
# empty so we don't double append the dir name
if filename not in path_tail:
rel_path = "{}/".format(path_tail)
for path_files in path[2]:
walked_files.append("{}{}".format(rel_path, path_files))
@ -151,8 +155,8 @@ def library(library_path, output_directory, package_folder_prefix,
#print("- package files: {} | {}".format(filename, package_files))
if (filename.endswith(".py") and
filename not in IGNORE_PY and
not example_bundle):
filename not in IGNORE_PY and
not example_bundle):
py_files.append(filename)
if len(py_files) > 1: