From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49876)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d8SKV-0003Du-DD
	for guix-patches@gnu.org; Wed, 10 May 2017 10:11:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d8SKU-0002eV-2q
	for guix-patches@gnu.org; Wed, 10 May 2017 10:11:03 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:34139)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1d8SKT-0002eR-U5
	for guix-patches@gnu.org; Wed, 10 May 2017 10:11:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d8SKT-0002dK-Op
	for guix-patches@gnu.org; Wed, 10 May 2017 10:11:01 -0400
Subject: bug#26803: [PATCH 15/36] gnu: Add java-commons-io.
Resent-Message-ID: <handler.26803.B26803.149442545210108@debbugs.gnu.org>
References: <20170506153617.3074-1-rekado@elephly.net>
	<20170506153617.3074-15-rekado@elephly.net> <rbu1srzska1.fsf@gnu.org>
From: Ricardo Wurmus <rekado@elephly.net>
In-reply-to: <rbu1srzska1.fsf@gnu.org>
Date: Wed, 10 May 2017 16:10:39 +0200
Message-ID: <87r2zwhkf4.fsf@elephly.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Roel Janssen <roel@gnu.org>
Cc: Hartmut Goebel <h.goebel@crazy-compilers.com>, 26803@debbugs.gnu.org


Roel Janssen <roel@gnu.org> writes:

> Ricardo Wurmus writes:
>
>> From: Hartmut Goebel <h.goebel@crazy-compilers.com>
>>
>> * gnu/packages/java.scm (java-commons-io): New variable.
>>
>> Co-authored-by: Ricardo Wurmus <rekado@elephly.net>
>> ---
[…]
>> +    (arguments
>> +     `(#:test-target "test"
>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'unpack 'symlink-junit.jar
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             ;; TODO: don't do this; use make-flags
>> +             ;; The existence of this file is taken as indicator whether test
>> +             ;; dependencies will to be downloaded.
>> +             (let ((junit (assoc-ref inputs "java-junit"))
>> +                   (junit-version "4.12")) ; from build.xml
>> +               (mkdir-p "lib")
>> +               (symlink (string-append junit "/share/java/junit.jar")
>> +                        (string-append "lib/junit-" junit-version ".jar"))
>> +               #t)))
>
> I'm not sure how the result of the code here could be achieved
> using 'make-flags', so is the TODO item referring to an already-removed
> piece of code?

Oh, I forgot about this.  It’s actually pretty easy to do this with
make-flags:

       #:make-flags
       (list (string-append "-Djunit.jar="
                            (assoc-ref %build-inputs "java-junit")
                            "/share/java/junit.jar"))

Much nicer than symlinking things!
I’ll push it with this change.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net