From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest. Date: Mon, 18 Jun 2018 15:49:52 +0200 Message-ID: <878t7cnr0f.fsf@fastmail.com> References: <20180618083130.3500-1-boskovits@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUuXl-0002Zs-Ok for bug-guix@gnu.org; Mon, 18 Jun 2018 09:50:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUuXi-0005cD-KL for bug-guix@gnu.org; Mon, 18 Jun 2018 09:50:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:46614) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUuXi-0005c7-ER for bug-guix@gnu.org; Mon, 18 Jun 2018 09:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fUuXi-0001wx-67 for bug-guix@gnu.org; Mon, 18 Jun 2018 09:50:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20180618083130.3500-1-boskovits@gmail.com> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: =?UTF-8?Q?G=C3=A1bor?= Boskovits , 30665@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable G=C3=A1bor Boskovits writes: > --- > guix/build/ant-build-system.scm | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-syste= m.scm > index 3ed12b9f4..87c782d85 100644 > --- a/guix/build/ant-build-system.scm > +++ b/guix/build/ant-build-system.scm > @@ -68,14 +68,11 @@ >=20=20 > (target (@ (name "manifest")) > (mkdir (@ (dir "${manifest.dir}"))) > - (echo (@ (file "${manifest.file}") > - (message ,(string-append > - (if main-class > - (string-append > - "Main-Class: " main-cl= ass > - "${line.separator}") > - "") > - ""))))) > + (manifest (@ (file "${manifest.file}")) > + ,(if main-class > + `(attribute (@ (name "Main-Class") > + (value ,main-class= ))) > + ""))) LGTM. I was about to push it and start the 'staging' jobset on Hydra, but I'm not sure what to write in the commit message. Are you able to push it soonish? I'll start Hydra once the current 'master' evaluation finishes. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlsnuIAACgkQoqBt8qM6 VPrAIwf/UVf1RxXag+JOoOESXL7oY8Z3MBQrX/puEgQDZmHsLbIhr6O9kl917VW8 UbHNVsTq9iX+hiOsWhRW7dvtuPMV/s1NVN0aPOvCxN+IWNEu3Mivk7VCRNSyyjvf KXs8O9y3Oq0cePZRLK/+OetpLtJuzTF20oIbE1+uHitkeA2mUVRahsTQU2kSGsH2 hb0uNL8fJeT+pCh/T0O+sGzsKgsKj6+YjKqLiw6AkS+ylqpeLykOpYuYVH3RNv1V yjtLrk+KQjCX7Ooi7fKhmjlZCbCXIvFNYb7dcw6ltCC3tQplWtP8crgB9HvVpCd/ OLKlKDVWqZzg/ZRkHFA0YVP++A5sLQ== =95Mv -----END PGP SIGNATURE----- --=-=-=--