bug#26966: [PATCH 18/22] gnu: ant-bootstrap: Do not delete scripts.

[Ricardo Wurmus]

Roel Janssen <address@hidden> writes:

> Ricardo Wurmus writes:
>
>> The bootstrap ant should keep the scripts as their presence is checked when
>> building the latest version of ant.
>>
>> * gnu/packages/java.scm (ant-bootstrap)[arguments]: Delete "remove-scripts"
>> phase.
>> ---
>>  gnu/packages/java.scm | 8 --------
>>  1 file changed, 8 deletions(-)
>>
>> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
>> index c5fa67eef..2b9d8ddd4 100644
>> --- a/gnu/packages/java.scm
>> +++ b/gnu/packages/java.scm
>> @@ -210,14 +210,6 @@ This package provides the virtual machine.")
>>       `(#:tests? #f ; no "check" target
>>         #:phases
>>         (modify-phases %standard-phases
>> -         (add-after 'unpack 'remove-scripts
>> -           ;; Remove bat / cmd scripts for DOS as well as the antRun and 
>> runant
>> -           ;; wrappers.
>> -           (lambda _
>> -             (for-each delete-file
>> -                       (find-files "src/script"
>> -                                   "(.*\\.(bat|cmd)|runant.*|antRun.*)"))
>> -             #t))
>>           (delete 'configure)
>>           (replace 'build
>>             (lambda* (#:key inputs #:allow-other-keys)
>
> This seems redundant with the "04/22 gnu: Add ant-bootstrap" patch.
> Why add a snippet to remove it in a separate patch?

Oh, you’re right.  These patches ought to be squashed into one.
“ant-bootstrap” was a mere copy of “ant” at this point, which did
include the “remove-scripts” phase.

I’ll fix this before pushing.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net