From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHjgg-0003oL-4N for guix-patches@gnu.org; Wed, 31 Oct 2018 02:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHjgc-0001N8-30 for guix-patches@gnu.org; Wed, 31 Oct 2018 02:09:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHjgb-0001Mq-UU for guix-patches@gnu.org; Wed, 31 Oct 2018 02:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHjgb-0006fW-Kx for guix-patches@gnu.org; Wed, 31 Oct 2018 02:09:01 -0400 Subject: [bug#33215] [PATCH 04/11] gnu: clojure: Use (guix build java-utils) to simplify build phases. References: <87muquhcw3.fsf@gmail.com> In-Reply-To: <87muquhcw3.fsf@gmail.com> Resent-Message-ID: From: Alex Vong Date: Wed, 31 Oct 2018 14:08:38 +0800 Message-ID: <875zxihcm1.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: 33215@debbugs.gnu.org Cc: alexvong1995@gmail.com --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0004-gnu-clojure-Use-guix-build-java-utils-to-simplify-bu.patch Content-Transfer-Encoding: quoted-printable From=2029b927ed0fc2ed932c37e1fb188e35e300fc3aeb Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 02:52:41 +0800 Subject: [PATCH 04/11] gnu: clojure: Use (guix build java-utils) to simplify build phases. * gnu/packages/lisp.scm (clojure)[arguments]: Use 'ant-build-javadoc', 'install-jars' and 'install-javadoc' in build phases. =2D-- gnu/packages/lisp.scm | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c42878fd3..c451aa4c1 100644 =2D-- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -610,10 +610,10 @@ interface.") (build-system ant-build-system) (arguments `(#:modules ((guix build ant-build-system) + (guix build java-utils) (guix build utils) (ice-9 ftw) (ice-9 regex) =2D (srfi srfi-1) (srfi srfi-26)) #:test-target "test" #:phases @@ -637,34 +637,22 @@ interface.") (substitute* "build.xml" (("") "")) #t)) =2D ;; The javadoc target is not built by default. =2D (add-after 'build 'build-doc =2D (lambda _ =2D (invoke "ant" "javadoc"))) =2D ;; Needed since no install target is provided. =2D (replace 'install =2D (lambda* (#:key outputs #:allow-other-keys) =2D (let ((java-dir (string-append (assoc-ref outputs "out") =2D "/share/java/"))) =2D ;; Install versioned to avoid collisions. =2D (install-file (string-append "clojure-" ,version ".jar") =2D java-dir) =2D #t))) =2D ;; Needed since no install-doc target is provided. + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "./")) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let ((doc-dir (string-append (assoc-ref outputs "out") "/share/doc/clojure-" ,version "/"))) (copy-recursively "doc/clojure" doc-dir) =2D (copy-recursively "target/javadoc/" =2D (string-append doc-dir "javadoc/")) (for-each (cut install-file <> doc-dir) (filter (cut string-match ".*\\.(html|markdown|md|txt)" <>) (scandir "./"))) =2D #t)))))) + #t))) + (add-after 'install-doc 'install-javadoc + (install-javadoc "target/javadoc/"))))) (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") =2D-=20 2.19.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSof2ZdXkE0FM5aU4XzrkvbI+zaGwUCW9lG5gAKCRDzrkvbI+za GzhaAP44eidO0V6ERFt/dZlzFEU+lqDa4vyX8pFqoiQveFsmwAEAz322DsSzsEyv kGNuGBYnXXXLCs+uJAz/nZ7zRCkHPAo= =RFuP -----END PGP SIGNATURE----- --==-=-=--