nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: java-hamcrest-all: Build with icedtea-8. 

* gnu/packages/java.scm (java-hamcrest-all)[arguments]: Build with icedtea-8;
do not disable tests.
[inputs]: Remove java-hamcrest-core.
This commit is contained in:
Ricardo Wurmus 2018-03-11 20:02:10 +01:00
parent fb94174fc3
commit bfc007e13e
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gnu/packages/java.scm
View File

@ -3886,39 +3886,30 @@ The jMock library
(package (inherit java-hamcrest-core)
(name "java-hamcrest-all")
(arguments
(substitute-keyword-arguments (package-arguments java-hamcrest-core)
;; FIXME: a unit test fails because org.hamcrest.SelfDescribing is not
;; found, although it is part of the hamcrest-core library that has
;; just been built.
;;
;; Fixing this one test is insufficient, though, and upstream confirmed
;; that the latest hamcrest release fails its unit tests when built
;; with Java 7. See https://github.com/hamcrest/JavaHamcrest/issues/30
((#:tests? _) #f)
((#:build-target _) "bigjar")
((#:phases phases)
`(modify-phases ,phases
;; Some build targets override the classpath, so we need to patch
;; the build.xml to ensure that required dependencies are on the
;; classpath.
(add-after 'unpack 'patch-classpath-for-integration
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "build.xml"
((" build/hamcrest-library-\\$\\{version\\}.jar" line)
(string-join
(cons line
(append
(find-files (assoc-ref inputs "java-hamcrest-core") "\\.jar$")
(find-files (assoc-ref inputs "java-junit") "\\.jar$")
(find-files (assoc-ref inputs "java-jmock") "\\.jar$")
(find-files (assoc-ref inputs "java-easymock") "\\.jar$")))
";")))
#t))))))
`(#:jdk ,icedtea-8
,@(substitute-keyword-arguments (package-arguments java-hamcrest-core)
((#:build-target _) "bigjar")
((#:phases phases)
`(modify-phases ,phases
;; Some build targets override the classpath, so we need to patch
;; the build.xml to ensure that required dependencies are on the
;; classpath.
(add-after 'unpack 'patch-classpath-for-integration
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "build.xml"
((" build/hamcrest-library-\\$\\{version\\}.jar" line)
(string-join
(cons line
(append
(find-files (assoc-ref inputs "java-junit") "\\.jar$")
(find-files (assoc-ref inputs "java-jmock") "\\.jar$")
(find-files (assoc-ref inputs "java-easymock") "\\.jar$")))
";")))
#t)))))))
(inputs
`(("java-junit" ,java-junit)
("java-jmock" ,java-jmock-1)
("java-easymock" ,java-easymock)
("java-hamcrest-core" ,java-hamcrest-core)
,@(package-inputs java-hamcrest-core)))))
(define-public java-jopt-simple