From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
To: 56231@debbugs.gnu.org
Subject: [bug#56231] [PATCH] gnu: Add 'maven-doxia-test-docs' and some Doxia modules
Date: Tue, 20 Sep 2022 20:45:55 +0300 [thread overview]
Message-ID: <8735cmaqi4.fsf@gmail.com> (raw)
In-Reply-To: <87sfnr3od8.fsf@gmail.com> (Artyom V. Poptsov's message of "Sun, 26 Jun 2022 09:55:31 +0300")
[-- Attachment #1.1: Type: text/plain, Size: 67 bytes --]
Hello,
I rebased this patch series onto the Guix "master" branch.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-maven-doxia-test-docs.patch --]
[-- Type: text/x-diff, Size: 1859 bytes --]
From 6c2d9a9a6ba4c62cf5bb66914151da3ed0c08942 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sun, 26 Jun 2022 09:15:44 +0300
Subject: [PATCH 1/5] gnu: Add maven-doxia-test-docs.
* gnu/packages/maven.scm (maven-doxia-test-docs): New variable.
---
gnu/packages/maven.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 28ec4eb9a8..7e1457ad42 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -3965,3 +3965,30 @@ (define-public maven-doxia-core
markup languages.
This package contains Doxia core classes and interfaces.")))
+
+(define-public maven-doxia-test-docs
+ (package
+ (inherit maven-doxia-sink-api)
+ (name "maven-doxia-test-docs")
+ (arguments
+ `(#:jar-name "doxia-test-docs.jar"
+ #:tests? #f ; no tests.
+ #:source-dir "doxia-test-docs/src/main/"
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (mkdir-p "build/classes")
+ (copy-recursively "doxia-test-docs/src/main/resources"
+ "build/classes")
+ #t))
+ (replace 'install
+ (install-from-pom "doxia-test-docs/pom.xml")))))
+ (propagated-inputs (list maven-doxia-parent-pom))
+ (synopsis "Several test documents to check syntax structures under Doxia")
+ (description
+ "Doxia is a content generation framework that provides powerful
+techniques for generating static and dynamic content, supporting a variety of
+markup languages.
+
+This package contains several test documents to check syntax structures under
+Doxia.")))
--
2.34.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-maven-doxia-module-apt.patch --]
[-- Type: text/x-diff, Size: 2789 bytes --]
From 6a5b6c3b846ca64f91706078f7138e7bdad11a7e Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sun, 26 Jun 2022 04:08:35 +0300
Subject: [PATCH 2/5] gnu: Add maven-doxia-module-apt.
* gnu/packages/maven.scm (maven-doxia-module-apt): New variable.
(maven-doxia-modules-parent-pom): New private variable.
---
gnu/packages/maven.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 7e1457ad42..84879003e9 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -3992,3 +3992,50 @@ (define-public maven-doxia-test-docs
This package contains several test documents to check syntax structures under
Doxia.")))
+
+(define maven-doxia-modules-parent-pom
+ (package
+ (inherit maven-doxia-sink-api)
+ (name "maven-doxia-modules-parent-pom")
+ (arguments
+ `(#:tests? #f
+ #:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (replace 'install
+ (install-pom-file "doxia-modules/pom.xml")))))
+ (propagated-inputs
+ (list maven-doxia-parent-pom
+ maven-doxia-sink-api
+ maven-doxia-core))
+ (synopsis "Content generation framework")
+ (description "@samp{Doxia} is a content generation framework that provides
+powerful techniques for generating static and dynamic content, supporting a
+variety of markup languages.
+
+This package contains the parent POM of all Doxia modules.")))
+
+(define-public maven-doxia-module-apt
+ (package
+ (inherit maven-doxia-sink-api)
+ (name "maven-doxia-module-apt")
+ (arguments
+ `(#:jar-name "doxia-module-apt.jar"
+ #:source-dir "doxia-modules/doxia-module-apt/src/main/java"
+ #:test-dir "doxia-modules/doxia-module-apt/src/test/java"
+ #:tests? #f ;tests require JUnit5
+ #:phases (modify-phases %standard-phases
+ (replace 'install
+ (install-from-pom "doxia-modules/doxia-module-apt/pom.xml")))))
+ (native-inputs (list maven-doxia-test-docs
+ java-junit
+ java-guice
+ java-xmlunit
+ java-xmlunit-matchers
+ java-slf4j-simple))
+ (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api
+ java-javax-inject java-plexus-utils))
+ (synopsis "Doxia module for APT source documents")
+ (description "A Doxia module for Almost Plain Text source documents. APT
+format is supported both as source and target formats.")))
+
--
2.34.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-gnu-Add-maven-doxia-module-xdoc.patch --]
[-- Type: text/x-diff, Size: 1911 bytes --]
From c2594adfb967797321672edddd69417775d96d33 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sun, 26 Jun 2022 09:44:40 +0300
Subject: [PATCH 3/5] gnu: Add maven-doxia-module-xdoc.
* gnu/packages/maven.scm (maven-doxia-module-xdoc): New variable.
---
gnu/packages/maven.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 84879003e9..e8105b109b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -4039,3 +4039,27 @@ (define-public maven-doxia-module-apt
(description "A Doxia module for Almost Plain Text source documents. APT
format is supported both as source and target formats.")))
+(define-public maven-doxia-module-xdoc
+ (package
+ (inherit maven-doxia-sink-api)
+ (name "maven-doxia-module-xdoc")
+ (arguments
+ `(#:jar-name "doxia-module-xdoc.jar"
+ #:source-dir "doxia-modules/doxia-module-xdoc/src/main/java"
+ #:test-dir "doxia-modules/doxia-module-xdoc/src/test/java"
+ #:tests? #f ;tests require JUnit5
+ #:phases (modify-phases %standard-phases
+ (replace 'install
+ (install-from-pom "doxia-modules/doxia-module-xdoc/pom.xml")))))
+ (native-inputs (list maven-doxia-test-docs
+ java-junit
+ java-guice
+ java-xmlunit
+ java-xmlunit-matchers
+ java-slf4j-simple))
+ (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api
+ java-javax-inject java-plexus-utils))
+ (synopsis "Doxia module for Xdoc source documents")
+ (description "A Doxia module for Xdoc source documents. Xdoc format is
+supported both as source and target formats.")))
+
--
2.34.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: 0004-gnu-Add-maven-doxia-module-xhtml.patch --]
[-- Type: text/x-diff, Size: 1911 bytes --]
From 6bbec9cba6f9790d4332aa85d70b8965bd707390 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sun, 26 Jun 2022 09:46:36 +0300
Subject: [PATCH 4/5] gnu: Add maven-doxia-module-xhtml.
* gnu/packages/maven.scm (maven-doxia-module-xhtml): New variable.
---
gnu/packages/maven.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index e8105b109b..918610eb7f 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -4063,3 +4063,27 @@ (define-public maven-doxia-module-xdoc
(description "A Doxia module for Xdoc source documents. Xdoc format is
supported both as source and target formats.")))
+(define-public maven-doxia-module-xhtml
+ (package
+ (inherit maven-doxia-sink-api)
+ (name "maven-doxia-module-xhtml")
+ (arguments
+ `(#:jar-name "doxia-module-xhtml.jar"
+ #:source-dir "doxia-modules/doxia-module-xhtml/src/main/java"
+ #:test-dir "doxia-modules/doxia-module-xhtml/src/test/java"
+ #:tests? #f ;tests require JUnit5
+ #:phases (modify-phases %standard-phases
+ (replace 'install
+ (install-from-pom "doxia-modules/doxia-module-xhtml/pom.xml")))))
+ (native-inputs (list maven-doxia-test-docs
+ java-junit
+ java-guice
+ java-xmlunit
+ java-xmlunit-matchers
+ java-slf4j-simple))
+ (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api
+ java-javax-inject java-plexus-utils))
+ (synopsis "Doxia module for Xhtml source documents")
+ (description "A Doxia module for Xhtml source documents. Xhtml format is
+supported both as source and target formats.")))
+
--
2.34.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.6: 0005-gnu-Add-maven-doxia-module-xhtml5.patch --]
[-- Type: text/x-diff, Size: 1925 bytes --]
From e8c3df3afe203796a3b49af6595d48dabda2a75a Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sun, 26 Jun 2022 09:49:39 +0300
Subject: [PATCH 5/5] gnu: Add maven-doxia-module-xhtml5.
* gnu/packages/maven.scm (maven-doxia-module-xhtml5): New variable.
---
gnu/packages/maven.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 918610eb7f..ec116de5e9 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -4087,3 +4087,27 @@ (define-public maven-doxia-module-xhtml
(description "A Doxia module for Xhtml source documents. Xhtml format is
supported both as source and target formats.")))
+(define-public maven-doxia-module-xhtml5
+ (package
+ (inherit maven-doxia-sink-api)
+ (name "maven-doxia-module-xhtml5")
+ (arguments
+ `(#:jar-name "doxia-module-xhtml5.jar"
+ #:source-dir "doxia-modules/doxia-module-xhtml5/src/main/java"
+ #:test-dir "doxia-modules/doxia-module-xhtml5/src/test/java"
+ #:tests? #f ;tests require JUnit5
+ #:phases (modify-phases %standard-phases
+ (replace 'install
+ (install-from-pom "doxia-modules/doxia-module-xhtml5/pom.xml")))))
+ (native-inputs (list maven-doxia-test-docs
+ java-junit
+ java-guice
+ java-xmlunit
+ java-xmlunit-matchers
+ java-slf4j-simple))
+ (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api
+ java-javax-inject java-plexus-utils))
+ (synopsis "Doxia module for Xhtml5 source documents")
+ (description "A Doxia module for Xhtml5 source documents. Xhtml5 format is
+supported both as source and target formats.")))
+
--
2.34.1
[-- Attachment #1.7: Type: text/plain, Size: 219 bytes --]
- Artyom
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
prev parent reply other threads:[~2022-09-20 23:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-26 6:55 [bug#56231] [PATCH] gnu: Add 'maven-doxia-test-docs' and some Doxia modules Artyom V. Poptsov
2022-09-20 17:45 ` Artyom V. Poptsov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8735cmaqi4.fsf@gmail.com \
--to=poptsov.artyom@gmail.com \
--cc=56231@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).