diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-19 15:24:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-19 15:24:59 +0200 |
| commit | a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d (patch) | |
| tree | 284cc0af9edb74bfafad70b5a6fac9ad8b07b532 /guix/build/ant-build-system.scm | |
| parent | 8a502c3b60fdd5d8ee0b08e1c9d4c0d7fedc2fda (diff) | |
| parent | df570bf271536399993b39e7ea2ea0452bb6cde4 (diff) | |
Merge branch 'staging'
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))) |