From: Frank Pursel <frank.pursel@gmail.com>
To: 54021@debbugs.gnu.org
Subject: [bug#54021] [PATCH] if, at first, you don't succeed...
Date: Fri, 18 Feb 2022 12:42:16 -0800 [thread overview]
Message-ID: <87k0drrjo7.fsf@gmail.com> (raw)
In-Reply-To: <87pmnnr2qq.fsf@gmail.com>
Hi,
I think this addresses all the identified issues and, best of all, does it
with a now, meaningful check phase.
Regards,
Frank
From e45fd6a53579327667067ca0642e97d0cb373d5c Mon Sep 17 00:00:00 2001
Message-Id: <e45fd6a53579327667067ca0642e97d0cb373d5c.1645216890.git.frank.pursel@gmail.com>
From: Frank Pursel <frank.pursel@gmail.com>
Date: Tue, 15 Feb 2022 14:07:28 -0800
Subject: [PATCH] Adding rhino javascript guix package.
* guix/gnu/package/javascript.scm (rhino): Added package.
---
gnu/packages/javascript.scm | 106 +++++++++++++++++++++++++++++++++++-
1 file changed, 105 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index c453ac432a..158abaded7 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +32,9 @@ (define-module (gnu packages javascript)
#: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)
@@ -38,7 +42,9 @@ (define-module (gnu packages javascript)
#:use-module (guix build-system cmake)
#:use-module (guix build-system trivial)
#:use-module (guix build-system minify)
- #:use-module (guix utils))
+ #:use-module (guix build-system ant)
+ #:use-module (guix utils)
+ #:use-module (guix gexp))
(define-public cjson
(package
@@ -788,3 +794,101 @@ (define-public duktape
your build, and use the Duktape API to call ECMAScript functions from C code
and vice versa.")
(license license:expat)))
+
+(define-public rhino
+ (let* ((rel-ver "1.7.7.2")
+ (commit "935942527ff434b205e797df4185518e5369466e"))
+ (package
+ (name "rhino")
+ (version rel-ver)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mozilla/rhino.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09i4yr98hs6855fs7fhgmrpiwpr90lhxdv2bvfj97nn4rv1d7wl8"))
+ (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"))
+ ;; Identify bundled jars
+ (format #t "~%~a~%" "Sourced jars")
+ (for-each (lambda (f)
+ (format #t "~/~a~%" f))
+ (find-files "." ".*\\.jar$"))))))
+ (build-system ant-build-system)
+ (inputs (list bash-minimal))
+ (native-inputs (list java-junit java-hamcrest-core java-snakeyaml))
+ (arguments
+ `(#:phases
+ (modify-phases
+ %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? inputs native-inputs
+ #:allow-other-keys)
+ (when tests?
+ (setenv "ANT_OPTS" "-Doffline=true")
+ (let ((junit-lib
+ (assoc-ref inputs "java-junit"))
+ (hamcrest-lib
+ (assoc-ref inputs "java-hamcrest-core"))
+ (snakeyaml-lib
+ (assoc-ref inputs "java-snakeyaml")))
+ (with-directory-excursion "testsrc"
+ (substitute* "build.xml"
+ (("<pathelement location=\"\\$\\{xbean.jar\\}\" */>" all)
+ (string-append "<!-- " all " -->"))
+ (("<pathelement location=\"\\$\\{jsr173.jar\\}\" */>" all)
+ (string-append "<!-- " all " -->"))
+ (("<pathelement path=\"\\$\\{coverage.classes.dir\\}\" */>" all)
+ (string-append "<!-- " all " -->"))
+ (("<pathelement path=\"lib/emma.jar\"/>" all)
+ (string-append "<!-- " all " -->"))
+ (("<pathelement path=\"lib/junit.jar\" ?/>")
+ (string-append
+ "<fileset dir=\"" junit-lib "\" includes=\"**/*.jar\"/>"))
+ (("<pathelement path=\"lib/hamcrest.jar\" ?/>")
+ (string-append "<fileset dir=\"" hamcrest-lib
+ "\" includes=\"**/*.jar\"/>"))
+ (("<pathelement path=\"lib/snakeyaml.jar\" ?/>")
+ (string-append "<fileset dir=\"" snakeyaml-lib
+ "\" includes=\"**/*.jar\"/>"))
+ ;; Disabling instrumentation.
+ (("(<target name=\"junit\" depends=\"junit-compile),.*" all pre)
+ (string-append pre "\">"))))
+ (invoke "ant" "junit")))))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (pkg+ver (string-append ,name ,version))
+ (bin (string-append out "/bin"))
+ (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 (string-append "build/" pkg+ver
+ "/js.jar")
+ (string-append out "/share/java"))
+ (with-output-to-file rhino
+ (lambda _
+ (format #t "#!~a~%~a -jar ~a $@~%"
+ (search-input-file inputs "/bin/bash")
+ (search-input-file inputs "/bin/java")
+ (string-append out "/share/java/js.jar"))))
+ (chmod rhino #o755)))))))
+ (home-page "https://mozilla.github.io/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))))
+
--
2.34.0
next prev parent reply other threads:[~2022-02-18 20:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 1:58 [bug#54021] [PATCH] Add rhino javascript package Frank Pursel
2022-02-16 17:00 ` Maxime Devos
2022-02-16 17:02 ` Maxime Devos
2022-02-16 17:08 ` Julien Lepiller
2022-02-16 17:08 ` Maxime Devos
2022-02-16 17:09 ` Maxime Devos
2022-02-16 17:21 ` Maxime Devos
2022-02-16 18:36 ` Frank Pursel
2022-02-16 18:43 ` Maxime Devos
2022-02-17 5:22 ` [bug#54021] [PATCH] Adding rhino package, revised patch Frank Pursel
2022-02-21 16:28 ` Maxime Devos
2022-02-18 20:42 ` Frank Pursel [this message]
2022-02-21 13:19 ` [bug#54021] [PATCH] if, at first, you don't succeed Efraim Flashner
2022-02-21 15:54 ` [bug#54021] [PATCH] Better rhino Frank Pursel
2022-02-21 18:45 ` [bug#54021] [PATCH] Removing all bundled jars prior to build Frank Pursel
2022-02-26 21:07 ` Julien Lepiller
2022-02-28 19:38 ` [bug#54021] [PATCH] package for rhino Frank Pursel
2022-02-28 20:45 ` Julien Lepiller
2022-02-28 21:45 ` [bug#54021] [PATCH] question -> answers Frank Pursel
2022-03-01 21:26 ` bug#54021: [PATCH] Add rhino javascript package Julien Lepiller
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=87k0drrjo7.fsf@gmail.com \
--to=frank.pursel@gmail.com \
--cc=54021@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).