[PATCH v2 1/4] waf_generator: Copy headers if necessary.

Sichen Zhao zsc19940506 at outlook.com
Sat Aug 12 09:24:37 UTC 2017


Ok, the branch  with only these four patches is here:

https://github.com/hahchenchen/rtems-libbsd/tree/usb_wpa_openssl

Best Regards
Sichen Zhao

________________________________________
From: Christian Mauderer <list at c-mauderer.de>
Sent: Saturday, August 12, 2017 17:05
To: Chris Johns; Sichen Zhao; Sichen Zhao; devel at rtems.org
Cc: Christian Mauderer
Subject: Re: [PATCH v2 1/4] waf_generator: Copy headers if necessary.

Am 12.08.2017 um 05:57 schrieb Chris Johns:
> On 12/08/2017 13:30, Sichen Zhao wrote:
>>>> +    for headers in header_build_copy_paths:
>>>> +        target = os.path.join("build-include", headers[2])
>>>> +        start_dir = bld.path.find_dir(headers[0])
>>>> +        for header in start_dir.ant_glob(os.path.join("**/", headers[1])):
>>> Remove the '/':
>>>
>>>         for header in start_dir.ant_glob(os.path.join("**", headers[1])):
>>>
>>> OK to push once fixed.
>>>
>>> Chris
>> This already done in the PATCH v2 2/4.
>> -        self.add('        for header in
>> start_dir.ant_glob(os.path.join("**/", headers[1])):')
>> +        self.add('        for header in start_dir.ant_glob(headers[1]):')
>
> Excellent. These patches look good. Christian let me know if you want me to do this?
>
> Thanks for your hard work.
>
> Chris

Hello Chris,

yes, I think the patches are ready for merge. The little nitpick in the
os.path.join is something that is replaced in the second patch anyway
(like Sichen already mentioned) so I don't think it's worth the effort
to change it.

@Sichen: The patch 2/4 has been posted two times and the patch
containing the raw import is missing (most likely due to the size).
Could you post a link to a branch on your github repo with only these
four patches applied to the current master so Chris can make the merge?

Kind regards

Christian


More information about the devel mailing list