From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eg5ee-0001FO-7i for guix-patches@gnu.org; Mon, 29 Jan 2018 04:23:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eg5eY-0001p4-Fj for guix-patches@gnu.org; Mon, 29 Jan 2018 04:23:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39216) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eg5eY-0001ou-AK for guix-patches@gnu.org; Mon, 29 Jan 2018 04:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eg5eY-0007r7-2R for guix-patches@gnu.org; Mon, 29 Jan 2018 04:23:02 -0500 Subject: [bug#30062] Help wanted Resent-Message-ID: From: Chris Marusich References: <20180110093308.5581-1-boskovits@gmail.com> Date: Mon, 29 Jan 2018 01:22:01 -0800 In-Reply-To: ("=?UTF-8?Q?G=C3=A1bor?= Boskovits"'s message of "Mon, 29 Jan 2018 10:05:21 +0100") Message-ID: <87607lnhom.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; 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: =?UTF-8?Q?G=C3=A1bor?= Boskovits Cc: 30062@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable G=C3=A1bor Boskovits writes: > Hello Chris! > > Could you help me out on this? > > It seems that I should somehow extract the version string from the input = to > use in substitute*, to fix the version string in tests. What would be the > proper way of doing this? It looks like the existing code is already substituting the version string (by hard-coding it): =2D-8<---------------cut here---------------start------------->8--- (arguments `(#:jar-name "java-ops4j-pax-tinybundles.jar" #:source-dir "src/main/java" #:test-exclude ;; Abstract base classes for other tests (list "**/BndTest.java" "**/CoreTest.java") #:phases (modify-phases %standard-phases (add-before 'check 'fix-version (lambda _ ;; This test has a reference to an old version of bndlib we ar= e not ;; packaging. It uses the version referenced in pom.xml. We = replace ;; it with our own version. (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndT= est.java" (("2.4.0.201411031534") "3.4.0"))))))) =2D-8<---------------cut here---------------end--------------->8--- I think we could probably just make a change like the following (I haven't tested this, though): =2D-8<---------------cut here---------------start------------->8--- (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndT= est.java" =2D (("2.4.0.201411031534") "3.4.0"))))))) + (("2.4.0.201411031534") ,(package-version java-aqute-bndlib= )))))))) =2D-8<---------------cut here---------------end--------------->8--- The comma is 'unquote' (see: (guile) Expression Syntax), which should insert the package version of java-aqute-bndlib into the quasi-quoted list. Does that help? =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAlpu57kACgkQ3UCaFdgi Rp382xAAsaEpgZHIPLwspTyY3A4iEYoZWhM9wtzHswRQbQbEfLCktE7dFFkvRAhc GNgAgWZ73Otac1WoH2tSv6RhmHN3xykgQ5492aPZ7+4piJfcLp071sXF46EKie+t lEDJ+X4fdO9QiZAezdI4Aop3MUVaQHoJ6k3ZxA4eZ+dIeuCPGUltHaPuFMQZNBXJ 7mYqQoqEffXtK8pA+OVQ5d0/omWkA+mPmJTSvA1pcmqhbp6cFK51dtNfQg9azmfP p4butguaA1KTU5bJJqPAhm103EaLrxkD5Zk3kZCg7LcIpZjQgGeSXkx1uw5JUNSR A8ABHjNJ9TwiM/doMLtaaxQ2C3zojjIB/7iz8TVwzTmZMsOk5oWTenptD+nVCIzN pdAGoTe6vJE1C8RZPGOQKSoZDNpiFc5Ak/1y9+OxBRmCYcH2mh2OC9ziPnm1vX3n K7gyGAdoHZnJq0HnZfNeRFhlBxmuAvHYTwXnxSjrjbdx/c6eU5LWxHPAiILen5ju KnWomnZxg/XuEGH+0iu/xTWAlDmNSZLWd9VEzgsIrUviFq+9/Ol4XVJZLFFn0j7u 4YmnxFpMNv09h6DWO77IThelcnmkFlCCL3+ETOc7LDE28dcil8eZYuS8sDH+rYUQ AMWcm62hwFmAV71k6xCWq+V30skS9XJVPKMjJPXJLILiU9sUcHM= =eV9N -----END PGP SIGNATURE----- --=-=-=--