From: Roel Janssen <roel@gnu.org>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 26803@debbugs.gnu.org
Subject: bug#26803: [PATCH 11/36] gnu: java-hamcrest-core: Install all jars without version suffix.
Date: Sat, 06 May 2017 23:39:10 +0200 [thread overview]
Message-ID: <87bmr5k6m9.fsf@gnu.org> (raw)
In-Reply-To: <20170506153617.3074-11-rekado@elephly.net>
Ricardo Wurmus writes:
> * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Install all three
> jars and strip the version suffix.
> ---
> gnu/packages/java.scm | 26 +++++++++++++++++++++-----
> 1 file changed, 21 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 3dc71e4bc..57ef65336 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -1081,7 +1081,10 @@ an Ant task that extends the built-in @code{jar} task.")
> #t))))
> (build-system ant-build-system)
> (arguments
> - `(#:tests? #f ; Tests require junit
> + `(#:tests? #f ; Tests require junit
Is this intended?
> + #:modules ((guix build ant-build-system)
> + (guix build utils)
> + (srfi srfi-1))
> #:make-flags (list (string-append "-Dversion=" ,version))
> #:build-target "core"
> #:phases
> @@ -1133,10 +1136,23 @@ private Method[] allMethods = getSortedMethods();")))))
> #t))
> (replace 'install
> (lambda* (#:key outputs #:allow-other-keys)
> - (install-file (string-append "build/hamcrest-core-"
> - ,version ".jar")
> - (string-append (assoc-ref outputs "out")
> - "/share/java")))))))
> + (let* ((target (string-append (assoc-ref outputs "out")
> + "/share/java/"))
> + (version-suffix ,(string-append "-" version ".jar"))
> + (install-without-version-suffix
> + (lambda (jar)
> + (copy-file jar
> + (string-append target
> + (basename jar version-suffix)
> + ".jar")))))
> + (mkdir-p target)
> + (for-each
> + install-without-version-suffix
> + (find-files "build"
> + (lambda (name _)
> + (and (string-suffix? ".jar" name)
> + (not (string-suffix? "-sources.jar" name)))))))
> + #t)))))
> (native-inputs
> `(("java-qdox-1.12" ,java-qdox-1.12)
> ("java-jarjar" ,java-jarjar)))
Otherwise LGTM!
Kind regards,
Roel Janssen
next prev parent reply other threads:[~2017-05-06 21:40 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-06 14:01 bug#26803: Java things Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 01/36] ant-build-system: Allow specifying source directory Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 02/36] ant-build-system: Add default "check" target Ricardo Wurmus
2017-05-06 20:28 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 03/36] guix: Add java-utils Ricardo Wurmus
2017-05-06 20:31 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 04/36] gnu: Add java-plexus-utils Ricardo Wurmus
2017-05-06 20:34 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 05/36] gnu: Add java-plexus-interpolation Ricardo Wurmus
2017-05-06 20:36 ` Roel Janssen
2017-05-10 10:44 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 06/36] gnu: Add java-asm Ricardo Wurmus
2017-05-06 20:39 ` Roel Janssen
2017-05-10 13:58 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 07/36] gnu: Add java-cglib Ricardo Wurmus
2017-05-06 20:40 ` Roel Janssen
2017-05-06 20:49 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 08/36] gnu: Add java-objenesis Ricardo Wurmus
2017-05-06 20:41 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 09/36] gnu: Add java-easymock Ricardo Wurmus
2017-05-06 21:28 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 10/36] gnu: Add java-jopt-simple Ricardo Wurmus
2017-05-06 21:31 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 11/36] gnu: java-hamcrest-core: Install all jars without version suffix Ricardo Wurmus
2017-05-06 21:39 ` Roel Janssen [this message]
2017-05-10 14:00 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 12/36] gnu: Add java-commons-math3 Ricardo Wurmus
2017-05-06 21:43 ` Roel Janssen
2017-05-10 14:01 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 13/36] gnu: Add java-jmh Ricardo Wurmus
2017-05-07 19:13 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 14/36] gnu: Add java-commons-collections4 Ricardo Wurmus
2017-05-07 19:16 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 15/36] gnu: Add java-commons-io Ricardo Wurmus
2017-05-08 10:41 ` Roel Janssen
2017-05-10 14:10 ` Ricardo Wurmus
2017-05-10 14:24 ` Roel Janssen
2017-05-10 14:34 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 16/36] gnu: Add java-commons-lang Ricardo Wurmus
2017-05-08 10:46 ` Roel Janssen
2017-05-10 14:13 ` Ricardo Wurmus
2017-05-10 14:23 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 17/36] gnu: Add java-commons-lang3 Ricardo Wurmus
2017-05-08 11:20 ` Roel Janssen
2017-05-10 14:23 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 18/36] gnu: Add java-commons-cli Ricardo Wurmus
2017-05-08 14:13 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 19/36] gnu: Add java-commons-codec Ricardo Wurmus
2017-05-10 10:09 ` Roel Janssen
2017-05-10 14:25 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 20/36] gnu: Add java-commons-daemon Ricardo Wurmus
2017-05-10 10:12 ` Roel Janssen
2017-05-10 16:03 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 21/36] gnu: Add java-jmock-1 Ricardo Wurmus
2017-05-10 10:15 ` Roel Janssen
2017-05-10 16:00 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 22/36] gnu: java-hamcrest-core: Declare test target Ricardo Wurmus
2017-05-10 10:15 ` Roel Janssen
2017-05-10 16:04 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 23/36] gnu: Add java-hamcrest-all Ricardo Wurmus
2017-05-10 18:02 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 24/36] gnu: Add java-jsr305 Ricardo Wurmus
2017-05-10 18:04 ` Roel Janssen
2017-05-11 9:27 ` julien lepiller
2017-05-06 15:36 ` bug#26803: [PATCH 25/36] gnu: Add java-guava Ricardo Wurmus
2017-05-10 18:06 ` Roel Janssen
2017-05-10 19:43 ` Ricardo Wurmus
2017-05-11 9:38 ` julien lepiller
2017-05-06 15:36 ` bug#26803: [PATCH 26/36] gnu: Add java-commons-logging-minimal Ricardo Wurmus
2017-05-10 18:09 ` Roel Janssen
2017-05-10 19:46 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 27/36] gnu: Add java-mockito-1 Ricardo Wurmus
2017-05-11 8:13 ` Roel Janssen
2017-05-11 8:22 ` Ricardo Wurmus
2017-05-11 8:57 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 28/36] gnu: Add java-httpcomponents-httpcore Ricardo Wurmus
2017-05-11 8:16 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 29/36] gnu: Add java-httpcomponents-httpcore-nio Ricardo Wurmus
2017-05-11 8:18 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 30/36] gnu: Add java-httpcomponents-httpcore-ab Ricardo Wurmus
2017-05-11 8:30 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 31/36] gnu: Add java-httpcomponents-httpclient Ricardo Wurmus
2017-05-11 8:32 ` Roel Janssen
2017-05-15 19:44 ` Ricardo Wurmus
2017-05-15 21:26 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 32/36] gnu: Add java-httpcomponents-httpmime Ricardo Wurmus
2017-05-11 8:32 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 33/36] gnu: Add java-commons-httpclient Ricardo Wurmus
2017-05-11 8:35 ` Roel Janssen
2017-05-15 19:50 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 34/36] gnu: Add java-commons-net Ricardo Wurmus
2017-05-11 8:40 ` Roel Janssen
2017-05-15 19:53 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 35/36] gnu: Add java-jsch Ricardo Wurmus
2017-05-11 8:41 ` Roel Janssen
2017-05-15 19:54 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 36/36] gnu: Add java-commons-compress Ricardo Wurmus
2017-05-11 8:53 ` Roel Janssen
2017-05-15 19:56 ` Ricardo Wurmus
2017-05-06 20:22 ` bug#26803: [PATCH 01/36] ant-build-system: Allow specifying source directory Roel Janssen
2017-05-07 10:34 ` bug#26803: Java things Hartmut Goebel
2017-05-07 11:47 ` Ricardo Wurmus
2017-05-08 8:18 ` Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bmr5k6m9.fsf@gnu.org \
--to=roel@gnu.org \
--cc=26803@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).