From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyLkv-0005XJ-Fd for guix-patches@gnu.org; Tue, 20 Mar 2018 14:13:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyLks-0006xj-88 for guix-patches@gnu.org; Tue, 20 Mar 2018 14:13:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eyLks-0006xV-46 for guix-patches@gnu.org; Tue, 20 Mar 2018 14:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eyLkr-0002G5-Ru for guix-patches@gnu.org; Tue, 20 Mar 2018 14:13:01 -0400 Subject: [bug#30845] [PATCH 06/82] gnu: Add java-commons-httpclient. Resent-Message-ID: Date: Tue, 20 Mar 2018 19:12:17 +0100 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20180320191217.59514487@alma-ubu> In-Reply-To: <20180318130530.1654-6-julien@lepiller.eu> References: <20180318134211.38163cd6@lepiller.eu> <20180318130530.1654-6-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/_c4iDi7O94urK6t0k3ucgCJ"; protocol="application/pgp-signature" 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: Julien Lepiller Cc: 30845@debbugs.gnu.org --Sig_/_c4iDi7O94urK6t0k3ucgCJ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, 18 Mar 2018 14:05:26 +0100 Julien Lepiller wrote: > * gnu/packages/java.scm (java-commons-httpclient): New variable. > --- > gnu/packages/java.scm | 44 > ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 > insertions(+) >=20 [..] > + (modify-phases %standard-phases > + (add-before 'build 'fix-accent > + (lambda _ > + (for-each (lambda (file) > + (with-fluids ((%default-port-encoding > "ISO-8859-1")) > + (substitute* file > + (("\\* @author Ortwin .*") "* @author > Ortwin Gluck\n")))) To be picky: The ASCII-transcription of German character ü is "ue", not just "u" :-) > + > '("src/java/org/apache/commons/httpclient/HttpContentTooLargeException.ja= va" > + "src/examples/TrivialApp.java" > "src/examples/ClientApp.java" > + > "src/test/org/apache/commons/httpclient/TestHttps.java" > + > "src/test/org/apache/commons/httpclient/TestURIUtil2.java")))) This works and is OK. I wonder how this works in general for Guix: Usually, Java uses the system character encoding. Do we explicitly set one, or is this a possible case of non-reproducibility? I know for Maven you can explicitly set the character encoding, I have no idea for Ant. > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (zero? (system* "ant" "dist" > + (string-append > "-Ddist.home=3D" (assoc-ref outputs "out") > + "/share/java")))))))) Use invoke: (invoke "ant" "dist" (string-append "-Ddist.home=3D" (assoc-ref outputs "out") "/share/java"))))))) Otherwise, LGTM Bj=C3=B6rn --Sig_/_c4iDi7O94urK6t0k3ucgCJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlqxTwIACgkQvyhstlk+X/2YcACfa65sYaam5gxYSPM22EjlXOXn oEYAn0Omy3+6RVR/AY/Vyq5wRM8jBa6A =pxrB -----END PGP SIGNATURE----- --Sig_/_c4iDi7O94urK6t0k3ucgCJ--