[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: guix: maven: Support fixing modules.
From: |
guix-commits |
Subject: |
05/14: guix: maven: Support fixing modules. |
Date: |
Tue, 22 Jun 2021 07:11:36 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit 0db1393b732304220aff978676b5354bfa186a65
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Tue Jun 1 00:44:18 2021 +0200
guix: maven: Support fixing modules.
* guix/build/maven/pom.scm (fix-pom-dependencies): Support fixing
modules that do not exist.
* guix/build/maven-build-system.scm (fix-pom): Fix modules.
---
guix/build/maven-build-system.scm | 1 +
guix/build/maven/pom.scm | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/guix/build/maven-build-system.scm
b/guix/build/maven-build-system.scm
index 374fa2f..b3d97c8 100644
--- a/guix/build/maven-build-system.scm
+++ b/guix/build/maven-build-system.scm
@@ -65,6 +65,7 @@
(format #t "fixing ~a~%" pom-file)
(fix-pom-dependencies pom-file (map cdr inputs)
#:with-plugins? #t #:with-build-dependencies? #t
+ #:with-modules? #t
#:local-packages local-packages
#:excludes excludes))
diff --git a/guix/build/maven/pom.scm b/guix/build/maven/pom.scm
index 3a4ad7a..ffb4515 100644
--- a/guix/build/maven/pom.scm
+++ b/guix/build/maven/pom.scm
@@ -291,7 +291,8 @@ this repository contains."
(define* (fix-pom-dependencies pom-file inputs
#:key with-plugins? with-build-dependencies?
- (excludes '()) (local-packages '()))
+ with-modules? (excludes '())
+ (local-packages '()))
"Open @var{pom-file}, and override its content, rewritting its dependencies
to set their version to the latest version available in the @var{inputs}.
@@ -339,8 +340,24 @@ Returns nothing, but overrides the @var{pom-file} as a
side-effect."
`((http://maven.apache.org/POM/4.0.0:build ,(fix-build build))
,@(fix-pom rest))
(cons tag (fix-pom rest))))
+ (('http://maven.apache.org/POM/4.0.0:modules modules ...)
+ (if with-modules?
+ `((http://maven.apache.org/POM/4.0.0:modules ,(fix-modules
modules))
+ ,@(fix-pom rest))
+ (cons tag (fix-pom rest))))
(tag (cons tag (fix-pom rest)))))))
+ (define fix-modules
+ (match-lambda
+ ('() '())
+ ((tag rest ...)
+ (match tag
+ (('http://maven.apache.org/POM/4.0.0:module module)
+ (if (file-exists? (string-append (dirname pom-file) "/" module
"/pom.xml"))
+ `((http://maven.apache.org/POM/4.0.0:module ,module)
,@(fix-modules rest))
+ (fix-modules rest)))
+ (tag (cons tag (fix-modules rest)))))))
+
(define fix-dep-management
(match-lambda
('() '())
- branch master updated (a40207b -> 1b1eeb3), guix-commits, 2021/06/22
- 01/14: guix: java-utils: Factorize pom.xml generation., guix-commits, 2021/06/22
- 03/14: guix: maven: Simplify finding local packages and modules., guix-commits, 2021/06/22
- 04/14: guix: maven: Support fixing extensions., guix-commits, 2021/06/22
- 05/14: guix: maven: Support fixing modules.,
guix-commits <=
- 02/14: guix: maven: Simplify finding version and group information., guix-commits, 2021/06/22
- 07/14: guix: maven: Use a temporary file to fix pom files., guix-commits, 2021/06/22
- 08/14: guix: java-utils: Look for actual jar files., guix-commits, 2021/06/22
- 11/14: gnu: maven-core: Hardcode versions we have in Guix., guix-commits, 2021/06/22
- 13/14: gnu: java-jmh: Update to 1.32., guix-commits, 2021/06/22
- 06/14: guix: maven: Look in local packages when searching for package version., guix-commits, 2021/06/22
- 09/14: gnu: Add java-jopt-simple-4., guix-commits, 2021/06/22
- 12/14: gnu: maven-enforcer-parent-pom: Fix pom., guix-commits, 2021/06/22
- 10/14: gnu: java-commons-math3: Install to maven repository., guix-commits, 2021/06/22
- 14/14: gnu: java-jmh: Switch to maven-build-system., guix-commits, 2021/06/22