diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2018-07-19 19:11:46 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2018-07-19 19:46:31 +0200 |
| commit | 79d4d47b99591e4edd8cefee907fbb0d930f78aa (patch) | |
| tree | b3ed389493aca3ed4c1d9051b2d51cbacb55ad15 | |
| parent | 8e2c0ce4ee72466dc498ebbcf129684dfb11fdd0 (diff) | |
| download | guix-79d4d47b99591e4edd8cefee907fbb0d930f78aa.tar.gz | |
guix: ant-build-system: Reorder before generating INDEX.LIST.
* guix/build/ant-build-system.scm (%standard-phases): Add reorder-jar-content phase.
| -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))) |