From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFNmT-0003F4-BY for guix-patches@gnu.org; Sun, 06 May 2018 13:49:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFNmQ-0007XR-8l for guix-patches@gnu.org; Sun, 06 May 2018 13:49:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fFNmQ-0007X8-3j for guix-patches@gnu.org; Sun, 06 May 2018 13:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fFNmP-0001vE-Qd for guix-patches@gnu.org; Sun, 06 May 2018 13:49:01 -0400 Subject: [bug#31333] [PATCH 02/22] gnu: Add groovy-bootstrap. Resent-Message-ID: Date: Sun, 6 May 2018 19:48:02 +0200 From: Danny Milosavljevic Message-ID: <20180506194802.0ea9802e@scratchpost.org> In-Reply-To: <20180501154449.3531-2-julien@lepiller.eu> References: <20180501174136.1c411b1a@lepiller.eu> <20180501154449.3531-1-julien@lepiller.eu> <20180501154449.3531-2-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/utsaJsFgX9IL=mkeOMKm1EX"; 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: 31333@debbugs.gnu.org --Sig_/utsaJsFgX9IL=mkeOMKm1EX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Julien, > + (add-before 'build 'fix-java8 > + ;; Fix "Reference to plus is ambiguous" > + (lambda _ > + (substitute* "src/main/org/codehaus/groovy/runtime/DefaultG= roovyMethods.java" > + (("toList\\(left\\)") > + "(List)toList(left)")))) #t Also, is it possible to eventually upstream this fix? > + (add-before 'build 'generate-exception-utils > + (lambda _ > + (system* "javac" "-cp" (getenv "CLASSPATH") > + "config/ant/src/org/codehaus/groovy/ExceptionUtils= Generator.java") Hmm, is ignoring the exit status intentional? > + (zero? (system* "java" "-cp" (string-append (getenv "CLASSP= ATH") > + ":config/ant/sr= c") > + "org.codehaus.groovy.ExceptionUtilsGenerato= r" > + "target/classes/org/codehaus/groovy/runtime= /ExceptionUtils.class")))) > + (add-before 'build 'generate-dgminfo > + (lambda _ > + (mkdir-p "target/classes/org/codehaus/groovy/runtime") > + (mkdir-p "target/classes/META-INF") > + (system* "javac" "-cp" (getenv "CLASSPATH") > + "src/main/org/codehaus/groovy/tools/DgmConverter.j= ava") Exit status ignored > + (zero? (system* "java" "-cp" (string-append (getenv "CLASSP= ATH") > + ":src/main") > + "org.codehaus.groovy.tools.DgmConverter")))) > + (add-before 'build 'copy-resources > + (lambda _ > + (with-directory-excursion "src/main" > + (for-each (lambda (file) > + (mkdir-p (string-append "../../target/classes= /" > + (dirname file))) > + (copy-file file > + (string-append "../../target/class= es/" > + file))) > + (find-files "." ".*.(txt|properties|xml|html)"))))) #t Otherwise LGTM! --Sig_/utsaJsFgX9IL=mkeOMKm1EX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlrvP9IACgkQ5xo1VCww uqVXnAf/f3JYZALbK8MbXdv9WNVHibAZ880mnixnMxthF0mJ8QGffwc8Gkw2nYDO Wt7WfsOWa/oB6ZMKd881sbyAwVA3Le93U1eAUJBPZvcqsdF7MaUXOXHB24fH5fbd 54esAgcYuhLZ8MB+FMpmXi5QIEIZ1Sr3ChkHsmChR/gHzX6yVjlOHyUGFF3Hodex YSbu3Tbn803vuoKXVZMlrT+6a3U1xZHdtnMaX6A5yogB26m/2YIId+EC+DUiy+A5 7BGSfV3LYmbsVCdbZovdth9xhsXvCri5dJdOQmiPPieL5pmV1N7YhEflsYmtkv/e 4mPzWPlxCclpdYNXpyqLU7piSmbShA== =cZgY -----END PGP SIGNATURE----- --Sig_/utsaJsFgX9IL=mkeOMKm1EX--