From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6NeVBPO1E2JJHwEAgWs5BA (envelope-from ) for ; Mon, 21 Feb 2022 16:55:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qPjMAPO1E2JNTwEAauVa8A (envelope-from ) for ; Mon, 21 Feb 2022 16:55:31 +0100 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 3F2663F26E for ; Mon, 21 Feb 2022 16:55:30 +0100 (CET) Received: from localhost ([::1]:38170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMB28-0006Jc-KB for larch@yhetil.org; Mon, 21 Feb 2022 10:55:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMB1i-0006JM-AF for guix-patches@gnu.org; Mon, 21 Feb 2022 10:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMB1i-0001wH-0p for guix-patches@gnu.org; Mon, 21 Feb 2022 10:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMB1i-00012A-18 for guix-patches@gnu.org; Mon, 21 Feb 2022 10:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54021] [PATCH] Better rhino References: <87pmnnr2qq.fsf@gmail.com> In-Reply-To: <87pmnnr2qq.fsf@gmail.com> Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Feb 2022 15:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54021@debbugs.gnu.org Received: via spool by 54021-submit@debbugs.gnu.org id=B54021.16454588713892 (code B ref 54021); Mon, 21 Feb 2022 15:55:01 +0000 Received: (at 54021) by debbugs.gnu.org; 21 Feb 2022 15:54:31 +0000 Received: from localhost ([127.0.0.1]:38692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMB1C-00010i-RI for submit@debbugs.gnu.org; Mon, 21 Feb 2022 10:54:31 -0500 Received: from mail-pj1-f42.google.com ([209.85.216.42]:35573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMB1A-00010E-H4 for 54021@debbugs.gnu.org; Mon, 21 Feb 2022 10:54:28 -0500 Received: by mail-pj1-f42.google.com with SMTP id t4-20020a17090a3b4400b001bc40b548f9so2720350pjf.0 for <54021@debbugs.gnu.org>; Mon, 21 Feb 2022 07:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=TJZlamT6hQW5ex2uLsFgqrtwesw8syof6BhBnQFzezw=; b=O8G94rIh786mmcw7EmMBDDxNXpkl6PCI9gRHyD+EFNY0vJKmD04n/mfnzJAJlz0yeh V3jvXbim/Zfk2ZlU+XIvdtVd371PHSz/Kz2vwmOKex6wWbBc+Hx7Q28cnPy51BgjX37d e5DGj/RLUWcsaIfm7HMVNE8OKMqm6VewwrztOlpa42UqDuAjk4YTd8Ky3pMgFa/u2AOj SwdfWvr5Bhp//lhHdnSU91HTl0coPwZC48l4pxfsrZzUfTkYjcn3JCY2l9bgsknJH+N9 Q/AsZXxodZFEJShknVsNwlrrb6Tpte6W/HJIFLzs9jenvulmoP9RLoMO3ysSoSHoEwlF 7Riw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=TJZlamT6hQW5ex2uLsFgqrtwesw8syof6BhBnQFzezw=; b=Mf5/dR2G4gegS4QsjWx/1BCUnd6GflndDH29TszH9DmDYmDvOGDO6ZjCZ78XBIF6pe 5L/7rx2fT0YucTA91yhftOYfXQOfToE1zhz69CNGKHwPFAyRzAEP3k27CoeoKszTFt+H WQrgPIOulWfqQ6iCoJDOwMYH2kMZM9Ys/O5jZhMFn6nhlHtTwoLgzx/IS2cvgvQnwWV7 2aM445lVNFndgDaU4Tbnuyc+AqMhMWXraS3QjiRYvZhKfLdMrSZI6kDEP5EyhoYE9/Pp z7FGFQxirslEQQOGwJmJADrftRkol//0oeDnHxf8wQbmpcmxXmIwPLoinikl/Liw41W6 7qPw== X-Gm-Message-State: AOAM5308SZnDbETUPQooC/jv2L7rc2gCd0mpV2e1okYDVE8ib3Wg1QER a7JklN15Y6Gx7D3SM6XkxgofIgoiIJM= X-Google-Smtp-Source: ABdhPJzrTXELIvqsO6JwHz9uSElf4QJk5XSJIQEX8pBM8IWqiY8a0/9wNcery+IHWzEdiQGnjzHptw== X-Received: by 2002:a17:90b:1894:b0:1b9:c2dc:6315 with SMTP id mn20-20020a17090b189400b001b9c2dc6315mr22278516pjb.138.1645458861925; Mon, 21 Feb 2022 07:54:21 -0800 (PST) Received: from Ginko.local ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id 13sm8110992pje.50.2022.02.21.07.54.20 for <54021@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 07:54:20 -0800 (PST) From: Frank Pursel Date: Mon, 21 Feb 2022 07:54:18 -0800 Message-ID: <87h78sqkph.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645458930; 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: dkim-signature; bh=TJZlamT6hQW5ex2uLsFgqrtwesw8syof6BhBnQFzezw=; b=na5IfcxCkcNM8TOCZmSvQFhAplBajP5anraSh913WxkVthP7KjSHy7cA4RMBXdMACKuhAs 60GFzuhb9gQ4yRi/5Nb7Ow3Lwj4YljtTkA52dJ86keech9LUd+v/Rn5840db1JrvrC0M8f XbkPS9m+r0g5UOemnoSrx15s3XWKKexMyMLc41YGtenV9JAP9507SAT9Lz1pcN6stPYIe5 vZM713YqJKDnt1coSixmPkheqJHJvZyZE9I73BcFvwifxZtShAO7JzTC+3UhLVNuOkZed8 1xg+/hTyOD5s8N68mqAeTm/99FE2QmqXr65W0iOpWyyjAKMNee/Etdq5q9ustA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645458930; a=rsa-sha256; cv=none; b=ZRfKK1sFE9UTeSFk1JfP2LY+27W+ZxyCUwZYMgsKpSR5ZEzd7q+ou6KmyK1YNHX2m9/T2P nKBg9XbM6XppeJwwEcM7KsBVDwuSwBewlHXz83X25NUeJsSGbId6IKDTf8MlFXMSSMZuWA mHOvPmm/PjggJePIbnx2/hl/E6rlf7P4E7hOxN0Hdi3mGhZN5J3fXh0HlkHK06YCg4HnxP ahQvqHL6T0A+8Qjce2FkvH9c70JoPLSJa4lu7FLycQYWxbKOgHcPY8Zy1y87WFpuZ4kf0n AAMhbqScsbiYJTHEM79L67fS8Md3fhcT8Ks3qeCpDVDhsakMTCDvoaMvfj9n9A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=O8G94rIh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=O8G94rIh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3F2663F26E X-Spam-Score: -2.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: YMNcf+G50Ivh Efraim, Thank you for your comments. I always wonder what is preferred here -- a clean single patch or the diff of changes. Here I'm providing the diff; if you would like me to create a single patch I'm happy to provide it. Regards, Frank >From 135ea5541a9a5e4e009b9ee90eae36bec2b74dce Mon Sep 17 00:00:00 2001 Message-Id: <135ea5541a9a5e4e009b9ee90eae36bec2b74dce.1645458837.git.frank.pursel@gmail.com> From: Frank Pursel Date: Mon, 21 Feb 2022 07:48:07 -0800 Subject: [PATCH] Additional refinements. --- gnu/packages/javascript.scm | 44 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 158abaded7..d8ebee3c3f 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -27,24 +27,22 @@ (define-module (gnu packages javascript) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages java) #:use-module (gnu packages node) #:use-module (gnu packages readline) #:use-module (gnu packages uglifyjs) #:use-module (gnu packages web) - #:use-module (gnu packages java) - #:use-module (gnu packages bash) - #:use-module (gnu packages perl) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system gnu) + #:use-module (guix build-system ant) #:use-module (guix build-system cmake) - #:use-module (guix build-system trivial) + #:use-module (guix build-system gnu) #:use-module (guix build-system minify) - #:use-module (guix build-system ant) - #:use-module (guix utils) - #:use-module (guix gexp)) + #:use-module (guix build-system trivial) + #:use-module (guix utils)) (define-public cjson (package @@ -796,16 +794,14 @@ (define-public duktape (license license:expat))) (define-public rhino - (let* ((rel-ver "1.7.7.2") - (commit "935942527ff434b205e797df4185518e5369466e")) (package (name "rhino") - (version rel-ver) + (version "1.7.7.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/mozilla/rhino.git") - (commit commit))) + (commit "935942527ff434b205e797df4185518e5369466e"))) (file-name (git-file-name name version)) (sha256 (base32 @@ -813,17 +809,14 @@ (define-public rhino (modules '((guix build utils))) (snippet '(begin ;; Remove benchmark testing - (with-directory-excursion - "testsrc" - (delete-file-recursively "benchmarks")) - (with-directory-excursion - "testsrc/org/mozilla/javascript" - (delete-file-recursively "benchmarks")) + (delete-file-recursively "testsrc/benchmarks") + (delete-file-recursively + "testsrc/org/mozilla/javascript/benchmarks") ;; Identify bundled jars (format #t "~%~a~%" "Sourced jars") (for-each (lambda (f) (format #t "~/~a~%" f)) - (find-files "." ".*\\.jar$")))))) + (find-files "." "\\.jar$")))))) (build-system ant-build-system) (inputs (list bash-minimal)) (native-inputs (list java-junit java-hamcrest-core java-snakeyaml)) @@ -848,7 +841,8 @@ (define-public rhino (string-append "")) (("" all) (string-append "")) - (("" all) + (("" + all) (string-append "")) (("" all) (string-append "")) @@ -862,7 +856,8 @@ (define-public rhino (string-append "")) ;; Disabling instrumentation. - (("(")))) (invoke "ant" "junit"))))) (replace 'install @@ -873,8 +868,7 @@ (define-public rhino (rhino (string-append bin "/rhino")) (man (string-append out "/share/man/man1"))) (mkdir-p bin) - (with-directory-excursion "man" - (install-file "rhino.1" man)) + (install-file "man/rhino.1" man) (install-file (string-append "build/" pkg+ver "/js.jar") (string-append out "/share/java")) @@ -889,6 +883,6 @@ (define-public rhino (synopsis "Javascript implemented in Java") (description "Rhino implements ECMAScript, also known as JavaScript, in Java as -specified in the fifth edition of ECMA-262") - (license license:mpl2.0)))) +specified in the fifth edition of ECMA-262.") + (license license:mpl2.0))) -- 2.34.0