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

[julien lepiller]

roptat pushed a commit to branch staging
in repository guix.

commit 79d4d47b99591e4edd8cefee907fbb0d930f78aa
Author: Julien Lepiller <address@hidden>
Date:   Thu Jul 19 19:11:46 2018 +0200

    guix: ant-build-system: Reorder before generating INDEX.LIST.
    
    * guix/build/ant-build-system.scm (%standard-phases): Add
    reorder-jar-content phase.
---
 guix/build/ant-build-system.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index d79b4d5..d79a2d5 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)))