Message ID | 87pmn6eq80.fsf@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [bug#54021] package for rhino | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
Thanks! I guess my only question remaining is why package this version instead of the latest, 1.7.15? Also the commit message should be: gnu: Add rhino. * gnu/packages/javascript.scm (rhino): New variable You didn't change the synopsis to spell JavaScript properly. Other than that, it's fine with me. We can take care of that, no need to resend a patch, unless Maxime has other comments :) On February 28, 2022 8:38:39 PM GMT+01:00, Frank Pursel <frank.pursel@gmail.com> wrote: >Julien, > >A single patch, to rule them all, as requested. :) This patch should add >the rhino package to the existing javascript.scm file. I think all the >issues have been addressed. Thank you for your patience. > >Regards, >Frank > >From a422095cf0ac8778936661952d375abd35293253 Mon Sep 17 00:00:00 2001 >Message-Id: <a422095cf0ac8778936661952d375abd35293253.1646075744.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 | 103 +++++++++++++++++++++++++++++++++++- > 1 file changed, 101 insertions(+), 2 deletions(-) > >diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm >index 779ffcb7b8..68d338de8d 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. > ;;; >@@ -26,7 +27,9 @@ (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) >@@ -34,10 +37,11 @@ (define-module (gnu packages javascript) > #: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 trivial) > #:use-module (guix utils)) > > (define-public cjson >@@ -791,3 +795,98 @@ (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 >+ (package >+ (name "rhino") >+ (version "1.7.7.2") >+ (source (origin >+ (method git-fetch) >+ (uri (git-reference >+ (url "https://github.com/mozilla/rhino.git") >+ (commit "935942527ff434b205e797df4185518e5369466e"))) >+ (file-name (git-file-name name version)) >+ (sha256 >+ (base32 >+ "09i4yr98hs6855fs7fhgmrpiwpr90lhxdv2bvfj97nn4rv1d7wl8")) >+ (modules '((guix build utils))) >+ (snippet '(begin >+ ;; Remove benchmark testing >+ (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 "~/Deleting: ~a~%" f) >+ (delete-file 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) >+ (install-file "man/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 > > > >
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 779ffcb7b8..68d338de8d 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. ;;; @@ -26,7 +27,9 @@ (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) @@ -34,10 +37,11 @@ (define-module (gnu packages javascript) #: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 trivial) #:use-module (guix utils)) (define-public cjson @@ -791,3 +795,98 @@ (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 + (package + (name "rhino") + (version "1.7.7.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla/rhino.git") + (commit "935942527ff434b205e797df4185518e5369466e"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09i4yr98hs6855fs7fhgmrpiwpr90lhxdv2bvfj97nn4rv1d7wl8")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove benchmark testing + (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 "~/Deleting: ~a~%" f) + (delete-file 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) + (install-file "man/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))) +
Julien, A single patch, to rule them all, as requested. :) This patch should add the rhino package to the existing javascript.scm file. I think all the issues have been addressed. Thank you for your patience. Regards, Frank From a422095cf0ac8778936661952d375abd35293253 Mon Sep 17 00:00:00 2001 Message-Id: <a422095cf0ac8778936661952d375abd35293253.1646075744.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 | 103 +++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-)