From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBJ5G-0008Dd-LV for guix-patches@gnu.org; Thu, 18 May 2017 06:55:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBJ5C-0004tT-PW for guix-patches@gnu.org; Thu, 18 May 2017 06:55:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dBJ5C-0004tM-M1 for guix-patches@gnu.org; Thu, 18 May 2017 06:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dBJ5C-0007UC-Ck for guix-patches@gnu.org; Thu, 18 May 2017 06:55:02 -0400 Subject: bug#26966: [PATCH 18/22] gnu: ant-bootstrap: Do not delete scripts. Resent-Message-ID: References: <20170517171905.7840-1-rekado@elephly.net> <20170517171905.7840-18-rekado@elephly.net> From: Roel Janssen In-reply-to: <20170517171905.7840-18-rekado@elephly.net> Date: Thu, 18 May 2017 12:54:09 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ricardo Wurmus Cc: 26966@debbugs.gnu.org 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? Kind regards, Roel Janssen