From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBRYh-0000t5-MT for guix-patches@gnu.org; Thu, 18 May 2017 15:58:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBRYg-0000QI-IM for guix-patches@gnu.org; Thu, 18 May 2017 15:58:03 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dBRYg-0000Of-FT for guix-patches@gnu.org; Thu, 18 May 2017 15:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dBRYf-0005MW-MS for guix-patches@gnu.org; Thu, 18 May 2017 15:58:01 -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: Ricardo Wurmus In-reply-to: Date: Thu, 18 May 2017 21:57:49 +0200 Message-ID: <87inkyndj6.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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: Roel Janssen Cc: 26966@debbugs.gnu.org Roel Janssen 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