ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: ant-build-system: Reorder before generating INDEX.LIST.

Browse source 
* guix/build/ant-build-system.scm (%standard-phases): Add
reorder-jar-content phase.
This commit is contained in:
Julien Lepiller 2018-07-19 19:11:46 +02:00
parent 8e2c0ce4ee
commit 79d4d47b99
No known key found for this signature in database
GPG key ID: 43111F4520086A0C
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/build/ant-build-system.scm
View file

@ -173,7 +173,7 @@ (define* (build #:key (make-flags '()) (build-target "jar")
(define* (generate-jar-indices #:key outputs #:allow-other-keys) (define* (generate-jar-indices #:key outputs #:allow-other-keys)
"Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps "Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps
and is preferred over \"META-INF/MAINFEST.MF\", which does use word wraps, and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps,
by Java when resolving dependencies. So we make sure to create it so that by Java when resolving dependencies. So we make sure to create it so that
grafting works - and so that the garbage collector doesn't collect grafting works - and so that the garbage collector doesn't collect
dependencies of this jar file." dependencies of this jar file."
@ -245,7 +245,9 @@ (define %standard-phases
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)
(replace 'install install) (replace 'install install)
(add-after 'install 'generate-jar-indices generate-jar-indices) (add-after 'install 'reorder-jar-content
strip-jar-timestamps)
(add-after 'reorder-jar-content 'generate-jar-indices generate-jar-indices)
(add-after 'generate-jar-indices 'strip-jar-timestamps (add-after 'generate-jar-indices 'strip-jar-timestamps
strip-jar-timestamps))) strip-jar-timestamps)))