* [bug#60976] [PATCH] gnu: Add ditaa.
@ 2023-01-06 18:46 Frank Pursel
2023-01-24 10:44 ` Simon Tournier
` (8 more replies)
0 siblings, 9 replies; 16+ messages in thread
From: Frank Pursel @ 2023-01-06 18:46 UTC (permalink / raw)
To: 60976
* gnu/packages/ditaa.scm: New file.
---
With Guix as with everything in life:
If at first you don't succeed . . .
This patch addresses the issues I discovered some time after posting
60612 which was intended to address the issues with the still older
53908! All of which required building a few odd dependencies
supporting the goal of adding ditaa to guix's repertoire.
Like the earlier patches to add ditaa I'm again hopeful about this one
and look forward to any feedback.
Sincerely,
Frank Pursel
gnu/packages/ditaa.scm | 296 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 296 insertions(+)
create mode 100644 gnu/packages/ditaa.scm
diff --git a/gnu/packages/ditaa.scm b/gnu/packages/ditaa.scm
new file mode 100644
index 0000000000..c47efa3b3e
--- /dev/null
+++ b/gnu/packages/ditaa.scm
@@ -0,0 +1,296 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+;;;
+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
+;;;
+
+(define-module (gnu packages ditaa)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages java)
+ #:use-module (gnu packages xml)
+ #:use-module (gnu packages java-xml)
+ #:use-module (gnu packages javascript)
+ #:use-module (gnu packages batik)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system ant)
+ #:use-module (guix modules)
+ #:use-module (guix build utils) )
+
+(define-public java-jericho-html
+ (let ((ver "3.4")
+ (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i")
+ (internal-name "jericho-html"))
+ (package
+ (name "java-jericho-html")
+ (version ver)
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append
+ "https://sourceforge.net/projects/jerichohtml"
+ "/files/jericho-html/3.4/jericho-html-3.4.zip/download"))
+ (sha256
+ (base32
+ hash))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ (format #t "~%~a~%" "Removing sourced jar files.")
+ (for-each (lambda (jarf)
+ (delete-file jarf)
+ (format #t "Deleted: ~a~%" jarf))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name (string-append ,name ".jar")
+ #:source-dir (string-append ,internal-name "-"
+ ,ver "/src/")
+ #:test-dir (string-append ,internal-name "-"
+ ,ver "/test/")
+ #:test-exclude (list "**/StAXTest.java"
+ "**/NodeIteratorTest.java"
+ "**/ScriptTest.java"
+ "**/SegmentGetStyleURISegmentsTest.java"
+ "**/SegmentTest.java"
+ "**/StreamedSourceTest.java"
+ "**/HTMLSanitiserTest.java")
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'add-ant-env-options
+ (lambda* _
+ (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") #t))
+ (add-after 'build 'check-prep
+ (lambda* (#:key source #:allow-other-keys)
+ (let* ((cwd (getcwd))
+ (jericho-test (string-append cwd "/" ,internal-name
+ "-" ,ver "/test"))
+ (test (string-append jericho-test "/test"))
+ (test-data (string-append jericho-test "/data"))
+ (test-src (string-append jericho-test "/src"))
+ (test-src-data (string-append test-src "/data")))
+ (format #t "~%Check Prep dir: ~s\n" cwd)
+ (substitute* "build.xml"
+ (("\\$\\{test\\.home\\}/java")
+ "${test.home}/src"))
+ (mkdir-p (string-append cwd "/build/test-classes"))
+ (copy-recursively (string-append cwd
+ "/"
+ ,internal-name
+ "-"
+ ,ver
+ "/samples/console/classes")
+ (string-append cwd
+ "/build/test-classes/"))
+ (mkdir-p test-src-data)
+ (copy-recursively test-data
+ test-src-data))
+ #t)))))
+ (native-inputs (list java-junit java-slf4j-api java-log4j-api
+ java-commons-logging-minimal))
+ (home-page "http://jericho.htmlparser.net/docs/index.html")
+ (description
+ "A java library allowing analysis and manipulation of
+parts of an HTML document, including server-side tags, while
+reproducing verbatim any unrecognised or invalid HTML. It also
+provides high-level HTML form manipulation functions.
+")
+ (synopsis "Java HTML Parser library")
+ (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0)))))
+
+(define-public java-libbatik
+ (package
+ (name "batik")
+ (version "1.16+dfsg")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://deb.debian.org/debian/pool/main/b/batik/"
+ name "_"
+ version ".orig.tar.xz"))
+ (sha256 (base32
+ "1xnmnnadp4l74dz55d3ask236lwy0iwg981851d01j2zlrgpw4p9"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Identify and delete bundled jars.
+ (format #t "~%~a~%" "Removing sourced jars")
+ (for-each
+ (lambda (f)
+ (delete-file f)
+ (format #t "Deleted: ~a~%" f))
+ (find-files "." "\\.jar$"))
+ ))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:tests? #f
+ #:jar-name (string-append ,name ".jar")
+ #:source-dir "sources"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after
+ 'unpack 'src-consolidation
+ (lambda _
+ (mkdir-p "sources")
+ (let ((cwd (getcwd))
+ (sub-dirs (list "anim" "awt-util" "bridge"
+ "codec" "constants" "css"
+ "dom" "ext" "extension"
+ "gui-util" "gvt" "i18n"
+ "parser" "script" "slideshow"
+ "svgbrowser" "svg-dom"
+ "svggen" "svgpp"
+ "svgrasterizer" "swing"
+ "transcoder" "ttf2svg"
+ "util" "xml")) )
+ (for-each
+ (lambda (sdir)
+ (copy-recursively
+ (string-append
+ "batik-" sdir "/src/main/java/") "sources/") )
+ sub-dirs) )
+ ;; Remove scripting subdirs for jpython, and jacl.
+ (for-each
+ (lambda (rfile)
+ (delete-file rfile)
+ (format #t "Deleted: ~s\n" rfile))
+ (append
+ (find-files
+ "sources/org/apache/batik/script/jpython" )
+ (find-files
+ "sources/org/apache/batik/script/jacl" ) ))
+ #t) ) ) ) )
+ (native-inputs (list rhino java-xmlgraphics-commons libxslt
+ java-jaxen java-junit java-jaxp java-xerces
+ java-jdom quickjs))
+ (home-page "https://xmlgraphics.apache.org/batik")
+ (synopsis "The java based toolkit for Scalable Vector Graphics")
+ (description "Batik is a Java-based toolkit for applications or
+applets that want to use images in the Scalable Vector Graphics (SVG)
+format for various purposes, such as display, generation or manipulation.")
+ (license license:asl2.0) ) )
+
+(define-public ditaa
+ (package
+ (name "ditaa")
+ (version "0.11.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stathissideris/ditaa")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (format #t "~%~a~%" "Finding and removing sourced jars.")
+ (for-each
+ (lambda (jarf)
+ (delete-file jarf)
+ (format #t "Deleted: ~a~%" jarf))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (inputs (list bash-minimal))
+ (native-inputs (list java-libbatik java-commons-cli java-w3c-svg
+ java-jericho-html `(,icedtea "jdk") java-junit))
+ (arguments
+ `(#:build-target "release-all"
+ #:phases
+ (modify-phases %standard-phases
+ ;; Ant's buildfile and build tree need to be modified
+ ;; to provide access to the guix builds of the
+ ;; batik and the java-commons-cli
+ ;; jar files. Also some of the source requires java7.
+ (add-before 'build 'build-prep
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((batik-jar (search-input-file inputs
+ "share/java/batik.jar"))
+ (commons-cli-jar (search-input-file inputs
+ "lib/m2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar")))
+ (mkdir-p "lib")
+ (copy-file batik-jar "./lib/batik.jar")
+ (copy-file commons-cli-jar "./lib/commons-cli.jar"))
+ (with-directory-excursion "build"
+ (substitute* "release.xml"
+ (("source=\"1.6\"")
+ "source=\"7\"")
+ (("<file name=\"commons-cli-1.2.jar\"/>")
+ (string-append "<file name=\"commons-cli.jar\"/>"
+ "\n" "<file name=\"batik.jar\"/>"))))
+ #t))
+ (replace 'build
+ (lambda* _
+ (setenv "ANT_OPTS"
+ (string-append "-Dversion.string="
+ ,version))
+ (with-directory-excursion "build"
+ (invoke "ant" "-f" "release.xml" "release-jar")) #t))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ (setenv "ANT_OPTS"
+ (string-append "-Dversion.string="
+ ,version))
+ (mkdir-p "tests/testlib")
+ (with-directory-excursion "build"
+ (invoke "ant" "-f" "release.xml"
+ "generate-test-images")
+ (invoke "ant" "test"))) #f)))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib"))
+ (bin (string-append out "/bin"))
+ (bash (search-input-file inputs "bin/bash"))
+ (java (search-input-file inputs "bin/java"))
+ (jre (search-input-directory inputs "jre"))
+ (ditaa (string-append out "/bin/ditaa"))
+ (jar-name (string-append ,name
+ ,version ".jar")))
+ (with-directory-excursion "releases"
+ (install-file jar-name lib))
+ (mkdir-p bin)
+ (with-output-to-file ditaa
+ (lambda _
+ (format #t "#!~a~%JAVA_HOME=~a ~a -jar ~a/~a $@~%"
+ bash jre java lib jar-name)))
+ (chmod ditaa #o755)) #t))
+ (add-after 'install 'install-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((doc (string-append (assoc-ref outputs "out")
+ "/share/doc/")))
+ (for-each (lambda (filen)
+ (install-file filen doc))
+ (find-files "." ".*README\\.md"))) #t)))))
+ (home-page "https://github.com/stathissideris/ditaa")
+ (synopsis "Create graphics from ascii art")
+ (description
+ "ditaa is a small command-line utility
+that converts diagrams drawn using ascii art
+('drawings' that contain characters that resemble lines like | / - ),
+into proper bitmap graphics.")
+ (license license:lgpl3)))
+
+
+
+
+
base-commit: 4e9cb45da0cc41cf85b720640a8ba9bc88c28d46
--
2.38.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
@ 2023-01-24 10:44 ` Simon Tournier
2023-01-25 2:50 ` Frank Pursel
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Simon Tournier @ 2023-01-24 10:44 UTC (permalink / raw)
To: Frank Pursel, 60976
Hi,
Thanks for your contribution.
Several minor things.
On ven., 06 janv. 2023 at 10:46, Frank Pursel <frank.pursel@gmail.com> wrote:
> * gnu/packages/ditaa.scm: New file.
Why a new file?
Could you split this commit? Basically, each package addition should go
to their own commit.
> +(define-public java-jericho-html
Why not some of the gnu/packages/java-*.scm files? Or gnu/packages/batik.scm
> +(define-public java-libbatik
Idem.
> + (arguments
> + `(#:tests? #f
Please provide a comment why the tests are disabled. For example, if
there is no test suite or if upstream does not provide tests,
(arguments
`(#:tests? #f ; no tests
> +(define-public ditaa
Why not in gnu/packages/graph.scm?
Cheers,
simon
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
2023-01-24 10:44 ` Simon Tournier
@ 2023-01-25 2:50 ` Frank Pursel
2023-01-25 10:10 ` zimoun
2023-01-25 17:42 ` Frank Pursel
` (6 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Frank Pursel @ 2023-01-25 2:50 UTC (permalink / raw)
To: 60976
> On Tuesday 24 Jan 2023 at 0435 PST, Simon Tournier wrote:
> Why a new file?
> Could you split this commit? Basically, each package addition should go
> to their own commit.
Yes, I puzzled over that too and I think this is the best answer. If
you don't admit a new file (for which I don't see great economy) then
you must decide what three others you would dilute or adjust to avoid
clearly identifying the relationship between these three packages.
There seem to be prior examples of small, unique packages of about
this size having separate files. Ditaa creates graphics but does not
do anything like provide OS level interfaces like in 'graphics.scm'.
Similarly, it does not deal with computer science graphs like in
'graph.scm'. It seems to me it is more like curl which stands alone
in curl.scm or bison, in bison.scm, cmake, cpio, abiword, and I could go on.
While, I know, ditaa is not as fundamental as these other giants it
shares that ubiquity. So, I think, ditaa's uniqueness merits that
distinction. Together with it's odd dependencies I don't see a better
fit but if someone has the courage to positively assert where each of
these packages fits I'm completely supportive.
> Why not some of the gnu/packages/java-*.scm files? Or gnu/packages/batik.scm
Another reason not to want to split this commit is because, per the
reference manual, It seemed to me that this was also 'one set of
related changes' enabling ditaa. java-libbatik and java-jericho-html
are unlikely to be used in support of anything else but cannot be
commited separately without breaking ditaa. I also suspect their
purpose would quickly become unclear if mixed with other java
packages.
If there were another application that also built upon the concrete
java-libbatik then I think the argument for moving it into batik.scm
would be stronger but don't think there is one because batik.scm
remains more abstract. I think that is ok. 'batik.scm' is java
internally uses an svg api but ditaa leverages svg to produce other
than svg output and is independent of java. It is a tool that
is likely to be used in non-java environments.
> Please provide a comment why the tests are disabled. For example, if
> there is no test suite or if upstream does not provide tests,
Knowing that ditaa's checks (which depend upon libbatik) was enough
for me but I think I can do better. I'll get another patch together
to achieve this.
Noting that the qa checks on this patch now indicate that this patch is
successful (I never take this for granted) does this seem like a good
path forward?
Regards,
Frank
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-25 2:50 ` Frank Pursel
@ 2023-01-25 10:10 ` zimoun
0 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2023-01-25 10:10 UTC (permalink / raw)
To: Frank Pursel, 60976
Hi,
On Tue, 24 Jan 2023 at 18:50, Frank Pursel <frank.pursel@gmail.com> wrote:
> Another reason not to want to split this commit is because, per the
> reference manual, It seemed to me that this was also 'one set of
> related changes' enabling ditaa. java-libbatik and java-jericho-html
> are unlikely to be used in support of anything else but cannot be
> commited separately without breaking ditaa. I also suspect their
> purpose would quickly become unclear if mixed with other java
> packages.
No, there are independent. This package java-jericho-html does not
depend on the others so it deserves its proper commit mentioning its
addition.
--8<---------------cut here---------------start------------->8---
+(define-public java-jericho-html
[...]
+ (native-inputs (list java-junit java-slf4j-api java-log4j-api
+ java-commons-logging-minimal))
--8<---------------cut here---------------end--------------->8---
Then, it is similar for this other one:
--8<---------------cut here---------------start------------->8---
+(define-public java-libbatik
[...]
+ (native-inputs (list rhino java-xmlgraphics-commons libxslt
+ java-jaxen java-junit java-jaxp java-xerces
+ java-jdom quickjs))
--8<---------------cut here---------------end--------------->8---
Therefore, I would expect three commits, like this:
gnu: Add java-jericho-html.
gnu: Add java-libbatik.
gnu: Add ditaa.
> If there were another application that also built upon the concrete
> java-libbatik then I think the argument for moving it into batik.scm
> would be stronger but don't think there is one because batik.scm
> remains more abstract. I think that is ok. 'batik.scm' is java
> internally uses an svg api but ditaa leverages svg to produce other
> than svg output and is independent of java. It is a tool that
> is likely to be used in non-java environments.
Well, I am not convinced by this argument about java-libbatik. :-)
Cheers,
simon
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
2023-01-24 10:44 ` Simon Tournier
2023-01-25 2:50 ` Frank Pursel
@ 2023-01-25 17:42 ` Frank Pursel
2023-01-26 12:36 ` Simon Tournier
2023-01-26 16:46 ` [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html Frank Pursel
` (5 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Frank Pursel @ 2023-01-25 17:42 UTC (permalink / raw)
To: 60976
Hi Zimoun,
Ok, so, after some additional looking around, I think this is what we
want to do:
Three commits, as follows
1. java-libbatik -> batik.scm (gnu: java-libbatik)
2. java-jericho-html -> java-xml.scm, (gnu: java-jericho-html)
3. ditaa -> New file ditaa.scm, (gnu: add ditaa)
Let me know how this sounds.
Regards,
Frank
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-25 17:42 ` Frank Pursel
@ 2023-01-26 12:36 ` Simon Tournier
0 siblings, 0 replies; 16+ messages in thread
From: Simon Tournier @ 2023-01-26 12:36 UTC (permalink / raw)
To: Frank Pursel, 60976
Hi Frank,
On Wed, 25 Jan 2023 at 09:42, Frank Pursel <frank.pursel@gmail.com> wrote:
> Three commits, as follows
>
> 1. java-libbatik -> batik.scm (gnu: java-libbatik)
> 2. java-jericho-html -> java-xml.scm, (gnu: java-jericho-html)
> 3. ditaa -> New file ditaa.scm, (gnu: add ditaa)
>
> Let me know how this sounds.
This sounds good. :-)
Thanks.
Cheers,
simon
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH 1/3] gnu: Add java-jericho-html
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
` (4 preceding siblings ...)
2023-01-26 16:46 ` [bug#60976] [PATCH v4 1/3] " Frank Pursel
@ 2023-01-26 16:46 ` Frank Pursel
2023-01-27 13:41 ` [bug#60976] [PATCH 3/3] Add ditaa Frank Pursel
` (2 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Frank Pursel @ 2023-01-26 16:46 UTC (permalink / raw)
To: 60976
---
gnu/packages/java-xml.scm | 79 +++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm
index 5b16806e27..9cf256549b 100644
--- a/gnu/packages/java-xml.scm
+++ b/gnu/packages/java-xml.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2022 Christopher Baines <mail@cbaines.net>
+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,84 @@ (define-module (gnu packages java-xml)
#:use-module (guix build-system ant)
#:use-module (guix utils))
+(define-public java-jericho-html
+ (let ((ver "3.4")
+ (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i")
+ (internal-name "jericho-html"))
+ (package
+ (name "java-jericho-html")
+ (version ver)
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append
+ "https://sourceforge.net/projects/jerichohtml"
+ "/files/jericho-html/3.4/jericho-html-3.4.zip/download"))
+ (sha256
+ (base32
+ hash))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ (format #t "~%~a~%" "Removing sourced jar files.")
+ (for-each (lambda (jarf)
+ (delete-file jarf)
+ (format #t "Deleted: ~a~%" jarf))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name (string-append ,name ".jar")
+ #:source-dir (string-append ,internal-name "-"
+ ,ver "/src/")
+ #:test-dir (string-append ,internal-name "-"
+ ,ver "/test/")
+ #:test-exclude (list "**/StAXTest.java"
+ "**/NodeIteratorTest.java"
+ "**/ScriptTest.java"
+ "**/SegmentGetStyleURISegmentsTest.java"
+ "**/SegmentTest.java"
+ "**/StreamedSourceTest.java"
+ "**/HTMLSanitiserTest.java")
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'add-ant-env-options
+ (lambda* _
+ (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") #t))
+ (add-after 'build 'check-prep
+ (lambda* (#:key source #:allow-other-keys)
+ (let* ((cwd (getcwd))
+ (jericho-test (string-append cwd "/" ,internal-name
+ "-" ,ver "/test"))
+ (test (string-append jericho-test "/test"))
+ (test-data (string-append jericho-test "/data"))
+ (test-src (string-append jericho-test "/src"))
+ (test-src-data (string-append test-src "/data")))
+ (format #t "~%Check Prep dir: ~s\n" cwd)
+ (substitute* "build.xml"
+ (("\\$\\{test\\.home\\}/java")
+ "${test.home}/src"))
+ (mkdir-p (string-append cwd "/build/test-classes"))
+ (copy-recursively (string-append cwd
+ "/"
+ ,internal-name
+ "-"
+ ,ver
+ "/samples/console/classes")
+ (string-append cwd
+ "/build/test-classes/"))
+ (mkdir-p test-src-data)
+ (copy-recursively test-data
+ test-src-data))
+ #t)))))
+ (native-inputs (list java-junit java-slf4j-api java-log4j-api
+ java-commons-logging-minimal))
+ (home-page "http://jericho.htmlparser.net/docs/index.html")
+ (description
+ "A java library allowing analysis and manipulation of
+parts of an HTML document, including server-side tags, while
+reproducing verbatim any unrecognised or invalid HTML. It also
+provides high-level HTML form manipulation functions.
+")
+ (synopsis "Java HTML Parser library")
+ (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0)))))
+
(define-public java-simple-xml
(package
(name "java-simple-xml")
base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42
--
2.38.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
` (2 preceding siblings ...)
2023-01-25 17:42 ` Frank Pursel
@ 2023-01-26 16:46 ` Frank Pursel
2023-02-26 7:47 ` Julien Lepiller
2023-01-26 16:46 ` [bug#60976] [PATCH v4 1/3] " Frank Pursel
` (4 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Frank Pursel @ 2023-01-26 16:46 UTC (permalink / raw)
To: 60976
---
The main point here is to give us ditaa but we also want the ziggaraut
to be fully guix maintainable. Hence here I submit another complete
patch set providing all that preceeded plus changes to java-jericho-html
that, in hindsight, I wish I had put in there in the first place.
Better late than never.
Regards,
Frank Pursel
gnu/packages/java-xml.scm | 79 +++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm
index 5b16806e27..9cf256549b 100644
--- a/gnu/packages/java-xml.scm
+++ b/gnu/packages/java-xml.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2022 Christopher Baines <mail@cbaines.net>
+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,84 @@ (define-module (gnu packages java-xml)
#:use-module (guix build-system ant)
#:use-module (guix utils))
+(define-public java-jericho-html
+ (let ((ver "3.4")
+ (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i")
+ (internal-name "jericho-html"))
+ (package
+ (name "java-jericho-html")
+ (version ver)
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append
+ "https://sourceforge.net/projects/jerichohtml"
+ "/files/jericho-html/3.4/jericho-html-3.4.zip/download"))
+ (sha256
+ (base32
+ hash))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ (format #t "~%~a~%" "Removing sourced jar files.")
+ (for-each (lambda (jarf)
+ (delete-file jarf)
+ (format #t "Deleted: ~a~%" jarf))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name (string-append ,name ".jar")
+ #:source-dir (string-append ,internal-name "-"
+ ,ver "/src/")
+ #:test-dir (string-append ,internal-name "-"
+ ,ver "/test/")
+ #:test-exclude (list "**/StAXTest.java"
+ "**/NodeIteratorTest.java"
+ "**/ScriptTest.java"
+ "**/SegmentGetStyleURISegmentsTest.java"
+ "**/SegmentTest.java"
+ "**/StreamedSourceTest.java"
+ "**/HTMLSanitiserTest.java")
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'add-ant-env-options
+ (lambda* _
+ (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") #t))
+ (add-after 'build 'check-prep
+ (lambda* (#:key source #:allow-other-keys)
+ (let* ((cwd (getcwd))
+ (jericho-test (string-append cwd "/" ,internal-name
+ "-" ,ver "/test"))
+ (test (string-append jericho-test "/test"))
+ (test-data (string-append jericho-test "/data"))
+ (test-src (string-append jericho-test "/src"))
+ (test-src-data (string-append test-src "/data")))
+ (format #t "~%Check Prep dir: ~s\n" cwd)
+ (substitute* "build.xml"
+ (("\\$\\{test\\.home\\}/java")
+ "${test.home}/src"))
+ (mkdir-p (string-append cwd "/build/test-classes"))
+ (copy-recursively (string-append cwd
+ "/"
+ ,internal-name
+ "-"
+ ,ver
+ "/samples/console/classes")
+ (string-append cwd
+ "/build/test-classes/"))
+ (mkdir-p test-src-data)
+ (copy-recursively test-data
+ test-src-data))
+ #t)))))
+ (native-inputs (list java-junit java-slf4j-api java-log4j-api
+ java-commons-logging-minimal))
+ (home-page "http://jericho.htmlparser.net/docs/index.html")
+ (description
+ "A java library allowing analysis and manipulation of
+parts of an HTML document, including server-side tags, while
+reproducing verbatim any unrecognised or invalid HTML. It also
+provides high-level HTML form manipulation functions.
+")
+ (synopsis "Java HTML Parser library")
+ (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0)))))
+
(define-public java-simple-xml
(package
(name "java-simple-xml")
base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42
--
2.39.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH v4 1/3] gnu: Add java-jericho-html
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
` (3 preceding siblings ...)
2023-01-26 16:46 ` [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html Frank Pursel
@ 2023-01-26 16:46 ` Frank Pursel
2023-01-26 16:53 ` [bug#60976] [PATCH v4 2/3] gnu: Add java-libbatik Frank Pursel
2023-01-26 17:01 ` [bug#60976] [PATCH v4 3/3] gnu: Add ditaa Frank Pursel
2023-01-26 16:46 ` [bug#60976] [PATCH 1/3] gnu: Add java-jericho-html Frank Pursel
` (3 subsequent siblings)
8 siblings, 2 replies; 16+ messages in thread
From: Frank Pursel @ 2023-01-26 16:46 UTC (permalink / raw)
To: 60976, julien
---
Posting a full update. I believe I've addressed all the identified
issues concerning java-jericho-html...
gnu/packages/java-xml.scm | 63 +++++++++++++++++++++++++++++++++++----
1 file changed, 58 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm
index 5b16806e27..faa51a66fd 100644
--- a/gnu/packages/java-xml.scm
+++ b/gnu/packages/java-xml.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2022 Christopher Baines <mail@cbaines.net>
+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,20 +24,72 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages java-xml)
- #:use-module (gnu packages)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages gtk)
#:use-module (gnu packages java)
- #:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix gexp)
- #:use-module (guix packages)
+ #:use-module (gnu packages)
+ #:use-module (guix build-system ant)
+ #:use-module (guix bzr-download)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
- #:use-module (guix build-system ant)
+ #:use-module (guix packages)
#:use-module (guix utils))
+(define-public java-jericho-html
+ (package
+ (name "java-jericho-html")
+ (version "3.4")
+ (source (origin
+ (method bzr-fetch)
+ (uri
+ (bzr-reference
+ (url
+ "http://jerichohtml.bzr.sourceforge.net/bzr/jerichohtml")
+ (revision (string-append "tag:" version))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "1zsf4i33jn05pma4y1658d6avhw7x4c12ggs96szhc06b7bxs8j0"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ (format #t "~%~a~%" "Removing sourced jar files.")
+ (for-each (lambda (jarf)
+ (delete-file jarf)
+ (format #t "Deleted: ~a~%" jarf))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name (string-append ,name ".jar")
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'add-ant-env-options
+ (lambda* _
+ (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1")
+ (let ((match-str
+ (string-append "jerichohtml-" ,version)))
+ (substitute* "build.xml"
+ ((match-str)
+ "")))))
+ (add-after 'build 'check-prep
+ (lambda* (#:key source #:allow-other-keys)
+ (mkdir-p "src/test/java"))))))
+ (native-inputs (list
+ java-commons-logging-minimal
+ java-junit
+ java-log4j-api
+ java-slf4j-api))
+ (home-page "http://jericho.htmlparser.net/docs/index.html")
+ (synopsis "Java HTML Parser library")
+ (description
+ "This Java library allowing analysis and manipulation of
+parts of an HTML document, including server-side tags, while
+reproducing verbatim any unrecognised or invalid HTML. It also
+provides high-level HTML form manipulation functions.")
+ (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0))))
+
(define-public java-simple-xml
(package
(name "java-simple-xml")
base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42
--
2.39.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH v4 2/3] gnu: Add java-libbatik
2023-01-26 16:46 ` [bug#60976] [PATCH v4 1/3] " Frank Pursel
@ 2023-01-26 16:53 ` Frank Pursel
2023-01-26 17:01 ` [bug#60976] [PATCH v4 3/3] gnu: Add ditaa Frank Pursel
1 sibling, 0 replies; 16+ messages in thread
From: Frank Pursel @ 2023-01-26 16:53 UTC (permalink / raw)
To: 60976, julien
---
Revised patch for java-libbatik. I don't believe I had access to the
upstream apache sources when I first posted this but this now points to
the apache upstream rather than debian sources.
gnu/packages/batik.scm | 100 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 93 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm
index 7f159010a5..22824a6575 100644
--- a/gnu/packages/batik.scm
+++ b/gnu/packages/batik.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,16 +20,101 @@
(define-module (gnu packages batik)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix utils)
- #:use-module (guix download)
- #:use-module (guix git-download)
- #:use-module (guix packages)
- #:use-module (guix build-system ant)
- #:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages java)
#:use-module (gnu packages java-xml)
- #:use-module (gnu packages textutils))
+ #:use-module (gnu packages javascript)
+ #:use-module (gnu packages textutils)
+ #:use-module (gnu packages xml)
+ #:use-module (gnu packages)
+ #:use-module (guix build-system ant)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils))
+
+(define-public java-libbatik
+ (package
+ (name "java-libbatik")
+ (version "1.16")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://dlcdn.apache.org/xmlgraphics/batik/source/batik-src-"
+ version
+ ".tar.gz"))
+ (sha256 (base32
+ "18ys0j7i861ydvimbm3a7dyvny48x5b37zfkvznlys7vcb2qz5z1"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Identify and delete bundled jars.
+ (format #t "~%~a~%" "Removing sourced jars")
+ (for-each
+ (lambda (f)
+ (delete-file f)
+ (format #t "Deleted: ~a~%" f))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "batik.jar"
+ #:source-dir "sources/src/main/java"
+ #:test-dir "sources/src/test"
+ ;; Tests are successful -- exclusions in lieu of
+ ;; deleting duplicated util tests.
+ #:test-exclude (list "**/util/*.java")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after
+ 'unpack 'src-consolidation
+ (lambda _
+ (mkdir-p "sources")
+ (let ((cwd (getcwd))
+ (sub-dirs (list "anim" "awt-util" "bridge"
+ "codec" "constants" "css"
+ "dom" "ext" "extension"
+ "gui-util" "gvt" "i18n"
+ "parser" "script" "slideshow"
+ "svgbrowser" "svg-dom"
+ "svggen" "svgpp"
+ "svgrasterizer" "swing" "test"
+ "test-svg" "transcoder" "ttf2svg"
+ "util" "xml" "test-swing")))
+ (for-each
+ (lambda (sdir)
+ (copy-recursively
+ (string-append
+ "batik-" sdir) "sources/"))
+ sub-dirs))
+ ;; Test prep
+ (copy-recursively
+ "test-resources" "sources")
+ ;; Remove scripting subdirs for jpython, and jacl.
+ (for-each
+ (lambda (rfile)
+ (delete-file rfile)
+ (format #t "Deleted: ~s\n" rfile))
+ (append
+ (find-files
+ "sources/src/main/java/org/apache/batik/script/jpython")
+ (find-files
+ "sources/src/main/java/org/apache/batik/script/jacl"))))))))
+ (native-inputs (list
+ java-jaxen
+ java-jdom quickjs
+ java-jaxp
+ java-junit
+ java-xerces
+ java-xmlgraphics-commons
+ libxslt
+ rhino))
+ (home-page "https://xmlgraphics.apache.org/batik")
+ (synopsis "Java based toolkit for Scalable Vector Graphics")
+ (description "Batik is a Java-based toolkit for applications or
+applets that want to use images in the Scalable Vector Graphics (SVG)
+format for various purposes, such as display, generation or manipulation.")
+ (license license:asl2.0)))
(define-public java-w3c-smil-3.0
(package
--
2.39.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH v4 3/3] gnu: Add ditaa
2023-01-26 16:46 ` [bug#60976] [PATCH v4 1/3] " Frank Pursel
2023-01-26 16:53 ` [bug#60976] [PATCH v4 2/3] gnu: Add java-libbatik Frank Pursel
@ 2023-01-26 17:01 ` Frank Pursel
2023-08-28 22:50 ` bug#60976: " Vagrant Cascadian
1 sibling, 1 reply; 16+ messages in thread
From: Frank Pursel @ 2023-01-26 17:01 UTC (permalink / raw)
To: 60976, julien
---
The final piece, again. I've moved it into java-graphic.scm.
Thanks for the feedback to get this on track.
Regards,
Frank Pursel
gnu/packages/java-graphics.scm | 131 +++++++++++++++++++++++++++++++--
1 file changed, 126 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm
index 9a71548b9c..6178bfbe4f 100644
--- a/gnu/packages/java-graphics.scm
+++ b/gnu/packages/java-graphics.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,15 +19,135 @@
(define-module (gnu packages java-graphics)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix packages)
- #:use-module (guix git-download)
- #:use-module (guix utils)
- #:use-module (guix build-system ant)
- #:use-module (gnu packages)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages batik)
#:use-module (gnu packages java)
+ #:use-module (gnu packages java-xml)
+ #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
+ #:use-module (gnu packages)
+ #:use-module (guix build utils)
+ #:use-module (guix build-system ant)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix modules)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (ice-9 match))
+(define-public ditaa
+ (package
+ (name "ditaa")
+ (version "0.11.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stathissideris/ditaa")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (format #t "~%~a~%" "Finding and removing embedded jars.")
+ (for-each
+ (lambda (jarf)
+ (delete-file jarf)
+ (format #t "Deleted: ~a~%" jarf))
+ (find-files "." "\\.jar$"))))))
+ (build-system ant-build-system)
+ (inputs (list bash-minimal))
+ (native-inputs (list
+ java-commons-cli
+ java-jericho-html
+ java-junit
+ java-libbatik
+ java-w3c-svg))
+ (arguments
+ `(#:build-target "release-all"
+ #:phases
+ (modify-phases %standard-phases
+ ;; Ant's buildfile and build tree need to be modified
+ ;; to provide access to the guix builds of the
+ ;; batik and the java-commons-cli
+ ;; jar files. Also some of the source requires java7.
+ (add-before 'build 'build-prep
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((batik-jar
+ (search-input-file
+ inputs
+ "share/java/batik.jar"))
+ (commons-cli-jar
+ (search-input-file
+ inputs
+ "lib/m2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar")))
+ (mkdir-p "lib")
+ (copy-file batik-jar "./lib/batik.jar")
+ (copy-file commons-cli-jar "./lib/commons-cli.jar"))
+ (with-directory-excursion "build"
+ (substitute* "release.xml"
+ (("source=\"1.6\"")
+ "source=\"7\"")
+ (("<file name=\"commons-cli-1.2.jar\"/>")
+ (string-append "<file name=\"commons-cli.jar\"/>"
+ "\n" "<file name=\"batik.jar\"/>"))))))
+ (replace 'build
+ (lambda* _
+ (setenv "ANT_OPTS"
+ (string-append "-Dversion.string="
+ ,version))
+ (with-directory-excursion "build"
+ (invoke "ant" "-f" "release.xml" "release-jar"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ (setenv "ANT_OPTS"
+ (string-append "-Dversion.string="
+ ,version))
+ (mkdir-p "tests/testlib")
+ (with-directory-excursion "build"
+ (invoke "ant" "-f" "release.xml"
+ "generate-test-images")
+ (invoke "ant" "test"))) #f)))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib"))
+ (bin (string-append out "/bin"))
+ (bash (search-input-file inputs "bin/bash"))
+ (java (search-input-file inputs "bin/java"))
+ (jre (search-input-directory inputs "jre"))
+ (ditaa (string-append out "/bin/ditaa"))
+ (jar-name (string-append ,name
+ ,version ".jar")))
+ (with-directory-excursion "releases"
+ (install-file jar-name lib))
+ (mkdir-p bin)
+ (with-output-to-file ditaa
+ (lambda _
+ (format #t "#!~a~%JAVA_HOME=~a ~a -jar ~a/~a $@~%"
+ bash jre java lib jar-name)))
+ (chmod ditaa #o755))))
+ (add-after 'install 'install-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((doc (string-append (assoc-ref outputs "out")
+ "/share/doc/")))
+ (for-each (lambda (filen)
+ (install-file filen doc))
+ (find-files "." ".*README\\.md"))))))))
+ (home-page "https://github.com/stathissideris/ditaa")
+ (synopsis "Create graphics from ascii art")
+ (description
+ "ditaa is a small command-line utility
+that converts diagrams drawn using ascii art
+('drawings' that contain characters that resemble lines like @samp{|}
+@samp{/} @samp{-}),
+into proper bitmap graphics.")
+ (license license:lgpl3)))
+
(define-public java-piccolo2d-core
(package
(name "java-piccolo2d-core")
--
2.39.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH 3/3] Add ditaa
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
` (5 preceding siblings ...)
2023-01-26 16:46 ` [bug#60976] [PATCH 1/3] gnu: Add java-jericho-html Frank Pursel
@ 2023-01-27 13:41 ` Frank Pursel
2023-01-28 4:49 ` [bug#60976] [PATCH] gnu: " Frank Pursel
2023-03-09 0:25 ` Frank Pursel
8 siblings, 0 replies; 16+ messages in thread
From: Frank Pursel @ 2023-01-27 13:41 UTC (permalink / raw)
To: 60976
My experience has been that after making a change it takes 4 days for
the QA process to produce other than an 'Unkown' outcome. Maybe the
size of the change has some impact but I suspect it has more to do with
the size of the outstanding queue.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
` (6 preceding siblings ...)
2023-01-27 13:41 ` [bug#60976] [PATCH 3/3] Add ditaa Frank Pursel
@ 2023-01-28 4:49 ` Frank Pursel
2023-03-09 0:25 ` Frank Pursel
8 siblings, 0 replies; 16+ messages in thread
From: Frank Pursel @ 2023-01-28 4:49 UTC (permalink / raw)
To: 60976
Well, it took only about 36 hours to move from 'Unknown' to
'Succeeding'. That is much better than my recent prior experience.
Kudos is owed to the qa team. :)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html
2023-01-26 16:46 ` [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html Frank Pursel
@ 2023-02-26 7:47 ` Julien Lepiller
0 siblings, 0 replies; 16+ messages in thread
From: Julien Lepiller @ 2023-02-26 7:47 UTC (permalink / raw)
To: Frank Pursel, 60976
Hi!
Since you're introducing jericho-html in this series, why don't you merge the first and fourth patch, to introduce the correct version immediately?
Note that phases do not need to end with #t anymore.
Usually, synopsis is put before description. The description should be a full sentence, it cannot start with "A". Maybe "This library is a…" or "This Java library allows analysing…"
I'm not a fan of having the hash and version outside the package dehinition with a let when it's not necessary. You can put the hash directly where it belongs, since it's used only once, and the version in the version fiild. You can refer to the version field in all subsequent fields, which is how we do it usually. Same with internal name, it won't change, so I would just use a string directly.
I'd also sort inputs in alphabetic order (even chough most packages in java.scm don't…)
Le 26 janvier 2023 17:46:25 GMT+01:00, Frank Pursel <frank.pursel@gmail.com> a écrit :
>---
>The main point here is to give us ditaa but we also want the ziggaraut
>to be fully guix maintainable. Hence here I submit another complete
>patch set providing all that preceeded plus changes to java-jericho-html
>that, in hindsight, I wish I had put in there in the first place.
>Better late than never.
>
>Regards,
>Frank Pursel
>
> gnu/packages/java-xml.scm | 79 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 79 insertions(+)
>
>diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm
>index 5b16806e27..9cf256549b 100644
>--- a/gnu/packages/java-xml.scm
>+++ b/gnu/packages/java-xml.scm
>@@ -6,6 +6,7 @@
> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
> ;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
> ;;; Copyright © 2022 Christopher Baines <mail@cbaines.net>
>+;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
>@@ -37,6 +38,84 @@ (define-module (gnu packages java-xml)
> #:use-module (guix build-system ant)
> #:use-module (guix utils))
>
>+(define-public java-jericho-html
>+ (let ((ver "3.4")
>+ (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i")
>+ (internal-name "jericho-html"))
>+ (package
>+ (name "java-jericho-html")
>+ (version ver)
>+ (source (origin
>+ (method url-fetch/zipbomb)
>+ (uri (string-append
>+ "https://sourceforge.net/projects/jerichohtml"
>+ "/files/jericho-html/3.4/jericho-html-3.4.zip/download"))
>+ (sha256
>+ (base32
>+ hash))
>+ (modules '((guix build utils)))
>+ (snippet '(begin
>+ (format #t "~%~a~%" "Removing sourced jar files.")
>+ (for-each (lambda (jarf)
>+ (delete-file jarf)
>+ (format #t "Deleted: ~a~%" jarf))
>+ (find-files "." "\\.jar$"))))))
>+ (build-system ant-build-system)
>+ (arguments
>+ `(#:jar-name (string-append ,name ".jar")
>+ #:source-dir (string-append ,internal-name "-"
>+ ,ver "/src/")
>+ #:test-dir (string-append ,internal-name "-"
>+ ,ver "/test/")
>+ #:test-exclude (list "**/StAXTest.java"
>+ "**/NodeIteratorTest.java"
>+ "**/ScriptTest.java"
>+ "**/SegmentGetStyleURISegmentsTest.java"
>+ "**/SegmentTest.java"
>+ "**/StreamedSourceTest.java"
>+ "**/HTMLSanitiserTest.java")
>+ #:phases (modify-phases %standard-phases
>+ (add-before 'build 'add-ant-env-options
>+ (lambda* _
>+ (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") #t))
>+ (add-after 'build 'check-prep
>+ (lambda* (#:key source #:allow-other-keys)
>+ (let* ((cwd (getcwd))
>+ (jericho-test (string-append cwd "/" ,internal-name
>+ "-" ,ver "/test"))
>+ (test (string-append jericho-test "/test"))
>+ (test-data (string-append jericho-test "/data"))
>+ (test-src (string-append jericho-test "/src"))
>+ (test-src-data (string-append test-src "/data")))
>+ (format #t "~%Check Prep dir: ~s\n" cwd)
>+ (substitute* "build.xml"
>+ (("\\$\\{test\\.home\\}/java")
>+ "${test.home}/src"))
>+ (mkdir-p (string-append cwd "/build/test-classes"))
>+ (copy-recursively (string-append cwd
>+ "/"
>+ ,internal-name
>+ "-"
>+ ,ver
>+ "/samples/console/classes")
>+ (string-append cwd
>+ "/build/test-classes/"))
>+ (mkdir-p test-src-data)
>+ (copy-recursively test-data
>+ test-src-data))
>+ #t)))))
>+ (native-inputs (list java-junit java-slf4j-api java-log4j-api
>+ java-commons-logging-minimal))
>+ (home-page "http://jericho.htmlparser.net/docs/index.html")
>+ (description
>+ "A java library allowing analysis and manipulation of
>+parts of an HTML document, including server-side tags, while
>+reproducing verbatim any unrecognised or invalid HTML. It also
>+provides high-level HTML form manipulation functions.
>+")
>+ (synopsis "Java HTML Parser library")
>+ (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0)))))
>+
> (define-public java-simple-xml
> (package
> (name "java-simple-xml")
>
>base-commit: 0e480ca7b60428a62fc4681d7aca6c7c067add42
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#60976] [PATCH] gnu: Add ditaa.
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
` (7 preceding siblings ...)
2023-01-28 4:49 ` [bug#60976] [PATCH] gnu: " Frank Pursel
@ 2023-03-09 0:25 ` Frank Pursel
8 siblings, 0 replies; 16+ messages in thread
From: Frank Pursel @ 2023-03-09 0:25 UTC (permalink / raw)
To: 60976
It is odd that this latest patchset obtained the qa successful badge a
few days after it was posted but then, seemingly spontaneously, the qa
badge reverted to unknown. This is not the first time I've seen the
system complete testing and post the results only to lose it's memory
and then reschedule the work. Seems like a persistence or memoization
mechanism is failing.
Regards,
Frank
^ permalink raw reply [flat|nested] 16+ messages in thread
* bug#60976: [PATCH v4 3/3] gnu: Add ditaa
2023-01-26 17:01 ` [bug#60976] [PATCH v4 3/3] gnu: Add ditaa Frank Pursel
@ 2023-08-28 22:50 ` Vagrant Cascadian
0 siblings, 0 replies; 16+ messages in thread
From: Vagrant Cascadian @ 2023-08-28 22:50 UTC (permalink / raw)
To: Frank Pursel; +Cc: 60976-done, julien
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
On 2023-01-26, Frank Pursel wrote:
> The final piece, again. I've moved it into java-graphic.scm.
>
> Thanks for the feedback to get this on track.
I've pushed this series as 541b1c3e74cbb7965b7398d342882a038c893fbb.
I fixed some minor things, namely:
* updated the commit messages.
* fixed some trailing whitespace.
* ran "guix style" on each package (keeping one-line per input, as
requested in earlier bug review)
* fixed some long line issues discovered by "guix lint" for each
package.
* Reverted re-ordering the use-modules sections to keep the diff only
relevent to the changes introduced by these packages.
Thanks for your contribution!
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-08-28 22:52 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-06 18:46 [bug#60976] [PATCH] gnu: Add ditaa Frank Pursel
2023-01-24 10:44 ` Simon Tournier
2023-01-25 2:50 ` Frank Pursel
2023-01-25 10:10 ` zimoun
2023-01-25 17:42 ` Frank Pursel
2023-01-26 12:36 ` Simon Tournier
2023-01-26 16:46 ` [bug#60976] [PATCH v3 1/4] gnu: Add java-jericho-html Frank Pursel
2023-02-26 7:47 ` Julien Lepiller
2023-01-26 16:46 ` [bug#60976] [PATCH v4 1/3] " Frank Pursel
2023-01-26 16:53 ` [bug#60976] [PATCH v4 2/3] gnu: Add java-libbatik Frank Pursel
2023-01-26 17:01 ` [bug#60976] [PATCH v4 3/3] gnu: Add ditaa Frank Pursel
2023-08-28 22:50 ` bug#60976: " Vagrant Cascadian
2023-01-26 16:46 ` [bug#60976] [PATCH 1/3] gnu: Add java-jericho-html Frank Pursel
2023-01-27 13:41 ` [bug#60976] [PATCH 3/3] Add ditaa Frank Pursel
2023-01-28 4:49 ` [bug#60976] [PATCH] gnu: " Frank Pursel
2023-03-09 0:25 ` Frank Pursel
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).