gnu: java-jgit: Include properties files.
* gnu/packages/version-control.scm (java-jgit)[arguments]: Add phase "add-properties". (java-jgit-4.2)[arguments]: Move modification of phases into substitute-keyword-arguments clause.master
parent
c56c5e78ea
commit
8843373322
|
@ -1650,7 +1650,17 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
|
|||
;; JGit must be built with a JDK supporting Java 8.
|
||||
#:jdk ,icedtea-8
|
||||
;; Target our older default JDK.
|
||||
#:make-flags (list "-Dtarget=1.7")))
|
||||
#:make-flags (list "-Dtarget=1.7")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; The jar file generated by the default build.xml does not include
|
||||
;; the text properties files, so we need to add them.
|
||||
(add-after 'build 'add-properties
|
||||
(lambda* (#:key jar-name #:allow-other-keys)
|
||||
(with-directory-excursion "src"
|
||||
(zero? (apply system* "jar" "-uf"
|
||||
(string-append "../build/jar/" jar-name)
|
||||
(find-files "." "\\.properties$")))))))))
|
||||
(inputs
|
||||
`(("java-classpathx-servletapi" ,java-classpathx-servletapi)
|
||||
("java-javaewah" ,java-javaewah)
|
||||
|
@ -1679,16 +1689,16 @@ network protocols, and core version control algorithms.")
|
|||
"15gm537iivhnzlkjym4x3wn5jqdjdragsw9pdpzqqg21nrc817mm"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'use-latest-javaewah-API
|
||||
(lambda _
|
||||
(substitute* "src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java"
|
||||
(("wordinbits") "WORD_IN_BITS"))
|
||||
#t)))
|
||||
(substitute-keyword-arguments (package-arguments java-jgit)
|
||||
;; Build for default JDK.
|
||||
,@(substitute-keyword-arguments (package-arguments java-jgit)
|
||||
((#:jdk _) icedtea-7))))
|
||||
((#:jdk _) icedtea-7)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'use-latest-javaewah-API
|
||||
(lambda _
|
||||
(substitute* "src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java"
|
||||
(("wordinbits") "WORD_IN_BITS"))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("java-javaewah" ,java-javaewah)
|
||||
("java-jsch" ,java-jsch)
|
||||
|
|
Reference in New Issue