From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6Gj2KyDBd2Bc1wAAgWs5BA (envelope-from ) for ; Thu, 15 Apr 2021 06:29:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id zHXRJSDBd2AORAAAB5/wlQ (envelope-from ) for ; Thu, 15 Apr 2021 04:29:20 +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 35C4020709 for ; Thu, 15 Apr 2021 06:29:20 +0200 (CEST) Received: from localhost ([::1]:53380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWtd1-0000bP-BL for larch@yhetil.org; Thu, 15 Apr 2021 00:29:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWtcl-0000ZG-PJ for guix-patches@gnu.org; Thu, 15 Apr 2021 00:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWtcl-0001lU-ID for guix-patches@gnu.org; Thu, 15 Apr 2021 00:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWtcl-0007iX-Fi for guix-patches@gnu.org; Thu, 15 Apr 2021 00:29:03 -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: Thu, 15 Apr 2021 04:29:03 +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.161846093729615 (code B ref 47789); Thu, 15 Apr 2021 04:29:03 +0000 Received: (at 47789) by debbugs.gnu.org; 15 Apr 2021 04:28:57 +0000 Received: from localhost ([127.0.0.1]:36221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWtcf-0007hU-DG for submit@debbugs.gnu.org; Thu, 15 Apr 2021 00:28:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWtce-0007gr-0h for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 00:28:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57385) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWtcY-0001Zy-RV for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 00:28:50 -0400 Received: from localhost ([::1]:48860 helo=mikegerwitz-pc) by fencepost.gnu.org with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lWtcX-0006Gz-Sg for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 00:28:50 -0400 From: Mike Gerwitz In-Reply-To: Date: Thu, 15 Apr 2021 00:26:55 -0400 References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) X-From-Line: 392710e13edd524ecac953dcecee73be459ea852 Mon Sep 17 00:00:00 2001 Message-Id: <392710e13edd524ecac953dcecee73be459ea852.1618460450.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=1618460960; 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=Zvv5ELkC5aKa+v97zCcTBfy8gKqMOnMl66HUKE4vniY=; b=WCI7dpQAGEkYzyzR8ZzP/m9YJLplg1KNWZpetsCr08kIpxPLfj1F7RCOUFIWSHlOQu/oK2 zSl5cPtEzmAbK/mEEoNHGuW4M0u/jG6iCTHFxc55G+fIiShu9w9pI3qMOppuGGBX4z40cB ZJsTwdCACAtw7AxMDken5b1d+3R5k1HJFwtpgxJu6pDlfAXEd2w5e8XNQM9PvYK2Te+Ihd n2iM0dUS8ZhDGCugsE6wYlWiwU/Y/0+yc4PcDlfrCNBWggXZ+iKc+GfCHdEGQxSFBlVuXb Wl2tjAJDd/FUKW8Dk+wONwIHowbZeresx7s5Vnep949fmF7Tpm/gfwdRwxHDyA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618460960; a=rsa-sha256; cv=none; b=kRhZX1AoCD5Txdh7n+LgZRMBy/xwVzVFRoakLbzZt/1dXHhsI3RPTikWHLqmlYaO2AtQjC U5s8Ae2jQ524UkWok0IaTXsB6GRniuGKcRXiXXA1yOg/pYFr2BdNApJOHLYNDpLyDXHI5P soaEw1vGyV5ugRq/70xuSicTXBENnpNsO2nuULwdAa+tJ0VKXcfvdhetvpeagFaQyIwwaq vBXBWIQRt4/uf5JlaRb9TPOeE0lNk7IuYLUbKEL98dCmOg+XqPEuXaH1l8Tc0bUqJqi9MW NhUoZyNZitLurlOoWdHYbkCw2PCbga+WDtdqr16SH8f3ZZdPLLQhP4b4CqR81Q== 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: -0.04 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: 35C4020709 X-Spam-Score: -0.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9jAp0kGLO5qY --=-=-= 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 | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e82e828df0..aef857661d 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) @@ -12477,6 +12478,62 @@ 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") + #t)) + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "terminal/src/main/java/org/jline/utils/OSUtils.= java" + (("=3D \"(s?tty|infocmp)\"" _ cmd) + (string-append "=3D \"" (which cmd) "\""))) + #t)) + ;; 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 ".")))) + #t))))) + (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----- iQIzBAEBCgAdFiEEtyLNo03iHAANpWtgjJF7f13FG6IFAmB3wJEACgkQjJF7f13F G6KYPQ//dadG7AbdLkgzcYVY37ZHh1zjWVw4G30tkJNyKBCx9rUv+GAC/P7Ss516 wXr14MAX2Yn7Pa+F0bGI6FhwiEEsY2PkPbpJyi+Ug71g2YjjfGd0G+c7XBuqTngr zMMxaAYhvngAyqc2W4CslY5nxj9WT0JigbvKuAgaPdhSTAgzwD+aYEop/rdWfRDi ABj2fVZb1lx8/wkmUAhqRYFhzEHCIUVgGXPDmAUD4bz70DDi2YvpIGMBPjkQqi/W rBLhSWKgZECyxBi8MJ6iOW+1Kff4sGLEU48+QzkLoFsa0LAhTpLtK9EwRaIvox2v i5HoIJqMBLBckit74ED/cwLAeYgKz7LSmaHSCyeuiwpXm5ChIkLyLgykpH4oPg2m YD+ivZOJKUNW8b6qWbqSMOIirP9XeyY/vJD25BpCIfh+etrMvAQHDNJ4Y7i/lhDJ dcne/j158hVujd+e1ecrt+zat/yU7U2q+rxZcjeEoWnILb97DaL4GOoh/0+mHG4U KK0R8Xup67OMppluEdA/klDiJ4HZ1RnTtRXfMht2NIOccC8hSy2KBSjFy2smo3vA mYM9cwLNfosn1iAuOOXRmSVw9rMCxFG5EfqJej5w6glylNS+91EZ1/lJqK3Q3NoR pdq/m8/rQPqf4P5BUiyqpedTGCydWDyfnIFg4eXgO9Ep5jMa490= =fGE6 -----END PGP SIGNATURE----- --=-=-=--