From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gDryOQzoeGDtRwEAgWs5BA (envelope-from ) for ; Fri, 16 Apr 2021 03:27:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eNaVNAzoeGDHUwAA1q6Kng (envelope-from ) for ; Fri, 16 Apr 2021 01:27:40 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 87EF3F324 for ; Fri, 16 Apr 2021 03:27:40 +0200 (CEST) Received: from localhost ([::1]:43040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXDGl-0005uT-Mf for larch@yhetil.org; Thu, 15 Apr 2021 21:27:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXDGM-0005tS-N9 for guix-patches@gnu.org; Thu, 15 Apr 2021 21:27:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXDGC-0003Jd-9p for guix-patches@gnu.org; Thu, 15 Apr 2021 21:27:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXDGC-0008S0-7Y for guix-patches@gnu.org; Thu, 15 Apr 2021 21:27:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47789] [PATCH 4/6] gnu: Add java-jline-terminal. Resent-From: Mike Gerwitz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Apr 2021 01:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47789@debbugs.gnu.org Received: via spool by 47789-submit@debbugs.gnu.org id=B47789.161853641632425 (code B ref 47789); Fri, 16 Apr 2021 01:27:04 +0000 Received: (at 47789) by debbugs.gnu.org; 16 Apr 2021 01:26:56 +0000 Received: from localhost ([127.0.0.1]:39644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXDG3-0008Qu-Uq for submit@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXDG1-0008QW-Pq for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47763) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXDFw-0003Go-Jh for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:48 -0400 Received: from localhost ([::1]:39237 helo=mikegerwitz-pc) by fencepost.gnu.org with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lXDFs-0000i3-HK for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:47 -0400 From: Mike Gerwitz In-Reply-To: Date: Thu, 15 Apr 2021 21:24:15 -0400 References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) X-From-Line: 180b7d0e03b1f00f1904471815cf987c75e061a6 Mon Sep 17 00:00:00 2001 Message-Id: <180b7d0e03b1f00f1904471815cf987c75e061a6.1618536137.git.mtg@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618536460; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=kTr3bpUWkRs6FNWSoW7KGIbkTgWTYAsRH87Rd4idoNM=; b=F0VBmt2oeT5w5DffepItKDptjSEl1Q1euw+QXGV2WhyDcS9gp+8gReHFm5l0fjW7iTedRM y3+Dqxd4c9QBW9MsSCCsr9ObRDO4vrc0sBjJrisbnEzlVZ7QJUwQT7QhekY5EsEbI3BHVL EC2Pfmlb+V0MXumLdSAcHNySfgDXhFePtQjBBhWH+xxjmklr4/I1/Ny2JKvJQKgtbqDGIu SeyPcvmRBOyQjRqqwsMjsUSWYk9sBr7AePhvdRMiBZcNrbqSO94jfyOQF8f9DRuqXkFk6A We/YBoW/VyT+Yl9EHUSWJBLUpWVVv65eNJ3KOSq+qvQlMhA4mRTV/wbuOHmqyQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618536460; a=rsa-sha256; cv=none; b=bTnsPDEUe9Sk4bvUrfQtVksE/iF8AHW01io4Kze/Y/CdZy8Y786AmRw1AWUwe7vI7dlNzG EuLk3ihG4Ue2M6oMIz4ay3b+UujTj0AW6RQShUW4Y/RCTu5KwjPLPrPO/nyF02y4+dzY+Z pKY0swjZqeJW1i3bW338+cXYdGwwlxVlFGRm7c76r2bgj03J3VcZ8ol+cCh3z4j2CiOeJR 5UcLFWujSmDyVDF9bA/uw3U5VckLFwCMfqH5JrR2S69m9/f/s5Qn3jnVCpNLmpM/k6ZucT NEVajlYCG+zhe4ksdDUNF8nDgp1kOTm1VcjwOcCCgfERO4ImVk9kTpyCCC2Qbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.54 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 87EF3F324 X-Spam-Score: -1.54 X-Migadu-Scanner: scn0.migadu.com X-TUID: y+Sv+aJdCIVu --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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. =2D-- 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 =2D-- 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 lin= e editor.") ("java-junit" ,java-junit) ("java-hawtjni" ,java-hawtjni))))) =20 +(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-syst= em. + (delete-file "build"))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "terminal/src/main/java/org/jline/utils/OSUtils.= java" + (("=3D \"infocmp\"") + (string-append "=3D \"" (assoc-ref inputs "ncurses") + "/bin/infocmp\"")) + (("=3D \"(s?tty)\"" _ cmd) + (string-append "=3D \"" (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 additio= nal +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) w= ill +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") =2D-=20 Mike Gerwitz Activist For User Freedom | GNU Maintainer & Volunteer GPG: D6E9 B930 028A 6C38 F43B 2388 FEF6 3574 5E6F 6D05 https://mikegerwitz.com --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEtyLNo03iHAANpWtgjJF7f13FG6IFAmB450IACgkQjJF7f13F G6KpFw//TSP3+7OiRKDJPMCYW5ZRlVGQUWDqpRmspbL9M9/Q522P6Ad7Ev/xvQbF eXf/NGPk6IKbqXKpDKAb/CFSLwoM7uoPfkuzwyQ9tZ85L4P1UOUPMVsupdE3wR1e 8bc/FL3VOdX67veHtGYMVSyNa+D/jw6/jt6hmoMagVqglsxJP1v/EJmGIFSw57mZ 3S38OaJxNH/aIsyCVGBzSU5SCgjY+vEiFYT5XbBnc48txRSdTi721Uk7wDsq0HH6 zc46Qh51bFq9BIf47cAYL7S5ZUs6tLAAO6gjMlZBJ/uTRdUQyW6atJ4J8I9gAkgV JwMbYMI+oaBxjUD+MUOy20ytNM+dxIoBMd50eeoIA4pdwTug799gX31Vg/+Rorqf Sa/qlavEGlxDcOBiodt+JpMk6ZzMnvCOK+QPj88CCBGnoUseKkyCXhZmdooTGj0d QjiYAEinobp+/mq2C5pztqBqNGKHjCqGTEhrsR+p5NIzpNA2jP/ag4erQeG2m1LZ s5khPKkBT8GvunuC1u+GyI08ftXjPHdan6IuAJRShDPlYrIp4pzFSTEcxYMFYxDD Pva4DFlY6/M3c09ohRrkKL+K6r0LMhsqcjfRK8U/WsBP4uSOjgYTWUrfgD9GNYPJ zybDVB/MGFJisuMpVDMzLePkNLKvGBtwDDCeWlq8q+afKPpP3V8= =aWsF -----END PGP SIGNATURE----- --=-=-=--