From patchwork Wed Oct 31 06:08:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vong X-Patchwork-Id: 62 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2B9811676A; Wed, 31 Oct 2018 06:09:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id A72051675C for ; Wed, 31 Oct 2018 06:09:13 +0000 (GMT) Received: from localhost ([::1]:57494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHjgn-0003oS-0e for patchwork@mira.cbaines.net; Wed, 31 Oct 2018 02:09:13 -0400 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 X-Loop: help-debbugs@gnu.org 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-From: Alex Vong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Oct 2018 06:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33215 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33215@debbugs.gnu.org Received: via spool by 33215-submit@debbugs.gnu.org id=B33215.154096613025618 (code B ref 33215); Wed, 31 Oct 2018 06:09:01 +0000 Received: (at 33215) by debbugs.gnu.org; 31 Oct 2018 06:08:50 +0000 Received: from localhost ([127.0.0.1]:56175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHjgQ-0006f7-Gc for submit@debbugs.gnu.org; Wed, 31 Oct 2018 02:08:50 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:37525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHjgO-0006es-6s for 33215@debbugs.gnu.org; Wed, 31 Oct 2018 02:08:48 -0400 Received: by mail-pg1-f174.google.com with SMTP id c10-v6so6856397pgq.4 for <33215@debbugs.gnu.org>; Tue, 30 Oct 2018 23:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=Myoes63JRax0bjnOFcYxw8TiWxX/nlQtTEA+v8u9ciQ=; b=fNSSAIlYRHBGxT/lFrswc8XMZS1lZX7SW5s/mltKso1o+mlu3ceppoEUysMmqN6bAa a74UeLonIA+kWYMsZkB3zwNbZtOorwKD07Kws0FfD/SbIyonIFlOc1ciYO2NIhZbsriJ naw89NKg7nc6hyrDSU183TkG/b9Zczpp/b4dcZZ1jD6mI4+dfbeuBcLbuzb4ZO7yip2l As9LMo8QRnXsAU8caHaSAeqVp6MrX2hs4yYhzNkyZY6E/81CpCGLzrjC83lgRjQUZryB qORoQJxe4UIe22uZXEq2hw3raiI41T5+QtPun/3C6krqugAqcSoNB+UKh/pkJJ9Ul/Pr tseQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=Myoes63JRax0bjnOFcYxw8TiWxX/nlQtTEA+v8u9ciQ=; b=Yynt+mzlaM6PfQnaO8ypXB9kUCy2tfeMzubkM+a/Fj08S1AvpTFh4aATUNmxF6PeQW dCtbc8gennPatcFno+A6lR5c4R6qF15oJXVCy/NRJBROQtdRHsSvYpDndsopKc6AKREL m4TBfQ0C5FrhpPN8yQ/TNURlnEU7iFSdbtMnAYprdW/Cifobng9axX6d6f1uYmGb+r6K syGYpCBGg0nGj3mVKkSASoj65R5W9TpD6cZdqn3eK5aN4MkPFytV5/Upz51Br2ZFsNKL 9qj7Vikzg4n/oy0/r0mPJsq/s5LA6deq1mkpIJe3ogk0QPcBYF+IDpzCvIjrFFhMTa7y iwqA== X-Gm-Message-State: AGRZ1gIYRbROMZqgEiFYDYA+2HOek3wrE7JpZTYRm/qh2ZCk15gerFim mW5mLaXReVFIRNIknOQNI30LB6O1 X-Google-Smtp-Source: AJdET5eMdSImkmMfFmlUH+nVMCNVPIk1t0HF/dS8xMmUdW4Bscs2zWGEzzAx66U/jfawpwx84eSPIQ== X-Received: by 2002:a62:d206:: with SMTP id c6-v6mr1923848pfg.143.1540966122739; Tue, 30 Oct 2018 23:08:42 -0700 (PDT) Received: from debian (42-3-197-089.static.netvigator.com. [42.3.197.89]) by smtp.gmail.com with ESMTPSA id m18-v6sm32370934pfk.149.2018.10.30.23.08.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 23:08:42 -0700 (PDT) From: Alex Vong Date: Wed, 31 Oct 2018 14:08:38 +0800 Message-ID: <875zxihcm1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alexvong1995@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 29b927ed0fc2ed932c37e1fb188e35e300fc3aeb 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. --- 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 --- 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) - (srfi srfi-1) (srfi srfi-26)) #:test-target "test" #:phases @@ -637,34 +637,22 @@ interface.") (substitute* "build.xml" (("") "")) #t)) - ;; The javadoc target is not built by default. - (add-after 'build 'build-doc - (lambda _ - (invoke "ant" "javadoc"))) - ;; Needed since no install target is provided. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((java-dir (string-append (assoc-ref outputs "out") - "/share/java/"))) - ;; Install versioned to avoid collisions. - (install-file (string-append "clojure-" ,version ".jar") - java-dir) - #t))) - ;; 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) - (copy-recursively "target/javadoc/" - (string-append doc-dir "javadoc/")) (for-each (cut install-file <> doc-dir) (filter (cut string-match ".*\\.(html|markdown|md|txt)" <>) (scandir "./"))) - #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") -- 2.19.1