Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbc27ea0 authored by Cole Faust's avatar Cole Faust
Browse files

Make dir work on multiple paths 

To increase its feature parity with our notdir
implementation and gnu make.

Bug: 227245326
Test: Manually
Change-Id: Ied975f934d7af963e0099054c416f0d364aec8f9
parent bcabb923

core/product_config.rbc

+8 −5
Original line number Diff line number Diff line
@@ -439,10 +439,6 @@ def __base(path): 
    """Returns basename."""

    return path.rsplit("/",1)[-1]



def __dir(path):

    """Returns dirname."""

    return path.rsplit("/",1)[0]



def _board_platform_in(g, string_or_list):

    """Returns true if board is in the list."""

    board = g.get("TARGET_BOARD_PLATFORM","")
@@ -526,6 +522,13 @@ def _filter(pattern, text): 
            res.append(w)

    return res



def _dir(paths):

    """Equivalent to the GNU make function $(dir).



    Returns the folder of the file for each path in paths.

    """

    return " ".join([w.rsplit("/",1)[0] for w in __words(paths)])



def _notdir(paths):

    """Equivalent to the GNU make function $(notdir).
@@ -740,7 +743,7 @@ rblf = struct( 
    copy_files = _copy_files,

    copy_if_exists = _copy_if_exists,

    cfg = __h_cfg,

    dir = __dir,

    dir = _dir,

    enforce_product_packages_exist = _enforce_product_packages_exist,

    expand_wildcard = _expand_wildcard,

    file_exists = rblf_file_exists,