diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:08 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:32 +0200 |
| commit | b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c (patch) | |
| tree | 01c8ec8d4172c2834bef1e8859d6ca8b99338470 /guix/build/ant-build-system.scm | |
| parent | 25bd72678ae4048b0b84ee82bc5f2644367e9715 (diff) | |
| parent | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'guix/build/ant-build-system.scm')
| -rw-r--r-- | guix/build/ant-build-system.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79b4d503b..d79a2d55ed 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -173,7 +173,7 @@ to the default GNU unpack strategy." (define* (generate-jar-indices #:key outputs #:allow-other-keys) "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 grafting works - and so that the garbage collector doesn't collect dependencies of this jar file." @@ -245,7 +245,9 @@ repack them. This is necessary to ensure that archives are reproducible." (replace 'build build) (replace 'check check) (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 strip-jar-timestamps))) |