unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Mike Gerwitz <mtg@gnu.org>
To: 47789@debbugs.gnu.org
Subject: [bug#47789] [PATCH 4/6] gnu: Add java-jline-terminal.
Date: Thu, 15 Apr 2021 21:24:15 -0400	[thread overview]
Message-ID: <180b7d0e03b1f00f1904471815cf987c75e061a6.1618536137.git.mtg@gnu.org> (raw)
In-Reply-To: <cover.1618460450.git.mtg@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 4069 bytes --]

This is part of JLine 3.

I was able to get this working properly under Guix by providing ncurses'
infocmp, as well as ensuring the *.caps files were present in the JAR,
but similar methods didn't work for the tests; if you have Java
knowledge, I'd appreciate the help getting those tests enabled.

* gnu/packages/java.scm (java-jline-terminal): New variable.
---
 gnu/packages/java.scm | 58 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b4e4cafddb..9bf26b1dc7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -71,6 +71,7 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages maven)
   #:use-module (gnu packages maven-parent-pom)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages web)
@@ -12465,6 +12466,63 @@ features that bring it on par with the Z shell line editor.")
        ("java-junit" ,java-junit)
        ("java-hawtjni" ,java-hawtjni)))))
 
+(define-public java-jline-terminal
+  (package
+    (name "java-jline-terminal")
+    (version "3.14.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jline/jline3")
+                    (commit (string-append "jline-parent-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ilhk9ljp0pivl1rn0bb06syshc67p6imcjhrg6vr7kv15p3w4lr"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "jline-terminal.jar"
+       #:jdk ,openjdk11
+       #:tests? #f; TODO: tests fail on *.caps resource lookups
+       #:source-dir "terminal/src/main/java"
+       #:test-dir "terminal/src/test"
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-build-file
+           (lambda _
+             ;; Conflicts with build directory generated by ant-build-system.
+             (delete-file "build")))
+         (add-after 'unpack 'patch-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "terminal/src/main/java/org/jline/utils/OSUtils.java"
+               (("= \"infocmp\"")
+                (string-append "= \"" (assoc-ref inputs "ncurses")
+                               "/bin/infocmp\""))
+               (("= \"(s?tty)\"" _ cmd)
+                (string-append "= \"" (assoc-ref inputs "coreutils")
+                               "/bin/" cmd "\"")))))
+         ;; Resources are not added to the JAR by ant-build-system.
+         (add-after 'build 'add-resources
+           (lambda* (#:key jar-name source-dir #:allow-other-keys)
+             (let ((build (string-append (getcwd) "/build")))
+               (with-directory-excursion
+                   (string-append source-dir "/../resources")
+                 (apply invoke "jar" "-uvf"
+                        (string-append build "/jar/" jar-name)
+                        (find-files ".")))))))))
+    (inputs
+     `(("ncurses" ,ncurses))); infocmp
+    (home-page "https://github.com/jline/jline3")
+    (synopsis "Java JLine Terminal API and implementations")
+    (description "JLine is a Java library for handling console input.  It is
+similar in functionality to BSD editline and GNU readline but with additional
+features that bring it in par with ZSH line editor.  People familiar with the
+readline/editline capabilities for modern shells (such as bash and tcsh) will
+find most of the command editing features of JLine to be familiar.
+
+This package includes the @var{Terminal} API and implementations.")
+    (license license:bsd-3)))
+
 (define-public java-xmlunit
   (package
     (name "java-xmlunit")
-- 
Mike Gerwitz
Activist For User Freedom | GNU Maintainer & Volunteer
GPG: D6E9 B930 028A 6C38 F43B  2388 FEF6 3574 5E6F 6D05
https://mikegerwitz.com


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

  parent reply	other threads:[~2021-04-16  1:27 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-15  4:22 [bug#47789] [PATCH 0/6] Add TLA+ Tools (tla2tools) Mike Gerwitz
2021-04-15  4:25 ` [bug#47789] [PATCH 1/6] gnu: Add java-gson-2.8.6 Mike Gerwitz
2021-04-15  8:06   ` Maxime Devos
2021-04-16  1:13     ` Mike Gerwitz
2021-04-15 10:46   ` Julien Lepiller
2021-04-16  0:27     ` Mike Gerwitz
2021-04-15  4:26 ` [bug#47789] [PATCH 2/6] gnu: Add java-eclipse-xtext-xbase-lib Mike Gerwitz
2021-04-15  4:26 ` [bug#47789] [PATCH 3/6] gnu: Add java-eclipse-lsp4j packages Mike Gerwitz
2021-04-15  4:26 ` [bug#47789] [PATCH 4/6] gnu: Add java-jline-terminal Mike Gerwitz
2021-04-15  8:13   ` Maxime Devos
2021-04-16  0:55     ` Mike Gerwitz
2021-04-15  4:27 ` [bug#47789] [PATCH 5/6] gnu: Add java-jline-reader Mike Gerwitz
2021-04-15  4:27 ` [bug#47789] [PATCH 6/6] gnu: Add tla2tools Mike Gerwitz
2021-04-15  8:17   ` Maxime Devos
2021-04-16  0:57     ` Mike Gerwitz
2021-04-16  1:12     ` Mike Gerwitz
2021-04-16  1:23 ` [bug#47789] [PATCH 1/6] gnu: Add java-gson-2.8.6 Mike Gerwitz
2021-04-16  1:23 ` [bug#47789] [PATCH 2/6] gnu: Add java-eclipse-xtext-xbase-lib Mike Gerwitz
2021-04-16  1:24 ` [bug#47789] [PATCH 3/6] gnu: Add java-eclipse-lsp4j packages Mike Gerwitz
2021-04-16  1:24 ` Mike Gerwitz [this message]
2021-04-16  1:24 ` [bug#47789] [PATCH 5/6] gnu: Add java-jline-reader Mike Gerwitz
2021-04-16  1:24 ` [bug#47789] [PATCH 6/6] gnu: Add tla2tools Mike Gerwitz
2021-05-05 15:02   ` bug#47789: [PATCH 0/6] Add TLA+ Tools (tla2tools) Ludovic Courtès
2021-04-16  1:29 ` [bug#47789] " Mike Gerwitz

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=180b7d0e03b1f00f1904471815cf987c75e061a6.1618536137.git.mtg@gnu.org \
    --to=mtg@gnu.org \
    --cc=47789@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).