branch: javaimp_devel
commit edfc9ef1e7290ca3078dbd063bf3bf419ff8e620
Author: Filipp Gunbin <fgun...@fastmail.fm>
Commit: Filipp Gunbin <fgun...@fastmail.fm>
Fixes
---
packages/javaimp/javaimp.el | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/packages/javaimp/javaimp.el b/packages/javaimp/javaimp.el
index 93d35f9..fcca837 100644
--- a/packages/javaimp/javaimp.el
+++ b/packages/javaimp/javaimp.el
@@ -100,6 +100,9 @@
;; - use functions `cygwin-convert-file-name-from-windows' and
;; `cygwin-convert-file-name-to-windows' when they are available instead of
;; calling `cygpath'. See https://cygwin.com/ml/cygwin/2013-03/msg00228.html.
+;;
+;; - include <packaging> into module info
+;;
;;; Code:
@@ -348,7 +351,7 @@ with POM"
(defun javaimp-fill-pom-file-paths (modules pom)
"Subroutine of `javaimp-maven-load-module-tree'"
(let ((artifact-alist (javaimp-traverse-pom-tree (list pom))))
- (dolist (module modules-alist)
+ (dolist (module modules)
(let* ((artifact (javaimp-get-mod-artifact module))
(path
(cdr (or (seq-find (lambda (el)
@@ -370,8 +373,8 @@ with POM"
(defun javaimp-cygpath-convert-maybe (path)
(if (eq system-type 'cygwin)
- (car (process-lines javaimp-cygpath-program "-u" source-dir))
- source-dir))
+ (car (process-lines javaimp-cygpath-program "-u" path))
+ path))
(defun javaimp-maven-process-projects (projects-elts)
(mapcar
@@ -394,9 +397,9 @@ with POM"
(javaimp-extract-artifact-info
(javaimp-xml-child 'parent project-elt))
nil ;parent-ts will be set later
- (javaimp-xml-first-child javaimp-xml-child 'finalName 'build-elt)
+ (javaimp-xml-first-child (javaimp-xml-child 'finalName build-elt))
)))
- project-elts))
+ projects-elts))
(defun javaimp-extract-submodules-paths (project-elt)
(let* ((modules-elt (javaimp-xml-child 'modules project-elt))
@@ -610,14 +613,15 @@ directory"
;;; Some functions for use in other programs
(defun javaimp-get-source-directories ()
- (apply #'seq-concatenate 'list
- (mapcar (lambda (root)
- (mapcar #'javaimp-get-mod-source-dir (cdr root)))
- javaimp-maven-root-modules)))
+ (append
+ (mapcar (lambda (root)
+ (mapcar #'javaimp-get-mod-source-dir (cdr root)))
+ javaimp-maven-root-modules)))
(defun javaimp-get-all-modules ()
"Returns flat list of all child modules."
- (append (mapcar #'cdr roots)))
+ (apply #'seq-concatenate 'list
+ (mapcar #'cdr javaimp-maven-root-modules)))
;;; Adding and organizing imports
