From patchwork Sat May 4 22:38:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13896 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4E37216FA0; Sat, 4 May 2019 23:39:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3EC2D16F9B for ; Sat, 4 May 2019 23:39:09 +0100 (BST) Received: from localhost ([127.0.0.1]:33630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JE-0003iC-Rl for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:39:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JB-0003gf-BE for guix-patches@gnu.org; Sat, 04 May 2019 18:39:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3J9-0006eK-1U for guix-patches@gnu.org; Sat, 04 May 2019 18:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3J8-0006eG-V0 for guix-patches@gnu.org; Sat, 04 May 2019 18:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3J8-0007Xl-ST for guix-patches@gnu.org; Sat, 04 May 2019 18:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 3/8] gnu: java-javaee-servletapi: Add properties-files to jar. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700952228963 (code B ref -1); Sat, 04 May 2019 22:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:38:42 +0000 Received: from localhost ([127.0.0.1]:52582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ik-0007X2-Dn for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ii-0007Wp-HL for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:57701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Ic-0006LI-Lx for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Ib-0003fx-GN for guix-patches@gnu.org; Sat, 04 May 2019 18:38:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3Ia-0006H8-3t for guix-patches@gnu.org; Sat, 04 May 2019 18:38:29 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35766 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3IZ-0006G8-Tj for guix-patches@gnu.org; Sat, 04 May 2019 18:38:28 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 70E713F85A for ; Sun, 5 May 2019 00:38:24 +0200 (CEST) Date: Sun, 5 May 2019 00:38:23 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505003823.453451b5@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (jav-javaee-servletapi)[arguments]: Add phase 'copy-resources' to copy properties-files. --- gnu/packages/java.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f92b3d5e89..9b635699f6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2851,7 +2851,25 @@ API and version 2.1 of the Java ServerPages API.") `(#:jar-name "javax-servletapi.jar" ;; no tests #:tests? #f - #:source-dir "src/main/java")) + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/javax/servlet/http") + (let ((from-prefix "src/main/java/javax/servlet/") + (to-prefix "build/classes/javax/servlet/")) + (for-each (lambda (f) + (copy-file (string-append from-prefix f) + (string-append to-prefix f))) + (list "LocalStrings_ja.properties" + "LocalStrings.properties" + "LocalStrings_fr.properties" + "http/LocalStrings_es.properties" + "http/LocalStrings_ja.properties" + "http/LocalStrings.properties" + "http/LocalStrings_fr.properties"))) + #t))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://javaee.github.io/servlet-spec/")