From 7f8af9417d2b6c75ff4cc652f2a6c19b497ee882 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Tue, 14 May 2019 20:29:52 -0500 Subject: [PATCH] de-confuse 'package_folder_prefix' parameter naming --- circuitpython_build_tools/build.py | 4 ++-- circuitpython_build_tools/scripts/build_bundles.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circuitpython_build_tools/build.py b/circuitpython_build_tools/build.py index 862a5bb..d0c3d11 100644 --- a/circuitpython_build_tools/build.py +++ b/circuitpython_build_tools/build.py @@ -100,7 +100,7 @@ def _munge_to_temp(original_path, temp_file, library_version): temp_file.write(line.encode("utf-8") + b"\r\n") temp_file.flush() -def library(library_path, output_directory, pkg_folder_prefix, mpy_cross=None, example_bundle=False): +def library(library_path, output_directory, package_folder_prefix, mpy_cross=None, example_bundle=False): py_files = [] package_files = [] example_files = [] @@ -138,7 +138,7 @@ def library(library_path, output_directory, pkg_folder_prefix, mpy_cross=None, e #print("- example files: {}".format(example_files)) else: if (not example_bundle and - not filename.startswith(pkg_folder_prefix)): + not filename.startswith(package_folder_prefix)): #print("skipped path: {}".format(full_path)) continue if not example_bundle: diff --git a/circuitpython_build_tools/scripts/build_bundles.py b/circuitpython_build_tools/scripts/build_bundles.py index 65bfd7a..492d5a4 100755 --- a/circuitpython_build_tools/scripts/build_bundles.py +++ b/circuitpython_build_tools/scripts/build_bundles.py @@ -48,7 +48,7 @@ def add_file(bundle, src_file, zip_name): return file_sector_size -def build_bundle(libs, bundle_version, output_filename, pkg_folder_prefix, +def build_bundle(libs, bundle_version, output_filename, package_folder_prefix, build_tools_version="devel", mpy_cross=None, example_bundle=False): build_dir = "build-" + os.path.basename(output_filename) top_folder = os.path.basename(output_filename).replace(".zip", "") @@ -69,7 +69,7 @@ def build_bundle(libs, bundle_version, output_filename, pkg_folder_prefix, success = True for library_path in libs: try: - build.library(library_path, build_lib_dir, pkg_folder_prefix, + build.library(library_path, build_lib_dir, package_folder_prefix, mpy_cross=mpy_cross, example_bundle=example_bundle) except ValueError as e: print("build.library failure:", library_path)