unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#65930] [PATCH 0/1] gnu: Add dzaima-apl.
@ 2023-09-14  4:26 B. Wilson via Guix-patches via
  2023-09-14  4:28 ` [bug#65930] [PATCH 1/1] " B. Wilson via Guix-patches via
  0 siblings, 1 reply; 3+ messages in thread
From: B. Wilson via Guix-patches via @ 2023-09-14  4:26 UTC (permalink / raw)
  To: 65930; +Cc: B. Wilson

Spiritually an open source implementation of Dyalog APL, but also with some extensions. Quite different from GNU APL.

B. Wilson (1):
  gnu: Add dzaima-apl.

 gnu/packages/apl.scm | 85 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)


base-commit: 2afa9353a0f69dabf4ddec54b58b60308092c794
-- 
2.41.0





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [bug#65930] [PATCH 1/1] gnu: Add dzaima-apl.
  2023-09-14  4:26 [bug#65930] [PATCH 0/1] gnu: Add dzaima-apl B. Wilson via Guix-patches via
@ 2023-09-14  4:28 ` B. Wilson via Guix-patches via
  2023-10-18 20:40   ` bug#65930: " Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: B. Wilson via Guix-patches via @ 2023-09-14  4:28 UTC (permalink / raw)
  To: 65930; +Cc: B. Wilson

* gnu/packages/apl.scm (dzaim-apl): New variable.
---
 gnu/packages/apl.scm | 85 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index 6a8d97848b..eb2793dd0f 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -28,8 +28,11 @@ (define-module (gnu packages apl)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages readline)
@@ -120,3 +123,85 @@ (define-public font-apl2741-unicode
 including both uppercase and lowercase underscored alphabets, as-of-yet unused
 symbols, and almost all Latin-1 accented letters.")
       (license license:unlicense))))
+
+(define-public dzaima-apl
+  (package
+    (name "dzaima-apl")
+    (version "0.2.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/dzaima/APL.git")
+               (commit (string-append "v" version))))
+        (sha256
+          (base32 "1hnrq0mlff6b9c9129afphcnmzd05wdyyfs905n421diyd5xa0il"))
+        (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (inputs (list bash-minimal openjdk18))
+    (native-inputs (list `(,openjdk18 "jdk") zip))
+    (arguments
+      (list
+       #:imported-modules `(,@%gnu-build-system-modules
+                            (guix build syscalls)
+                            (guix build ant-build-system))
+       #:modules `((guix build gnu-build-system)
+                   ((guix build ant-build-system) #:prefix ant:)
+                   (guix build utils)
+                   (ice-9 ftw)
+                   (ice-9 regex)
+                   (srfi srfi-26))
+       #:phases
+       `(modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'build
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((javac   (search-input-file inputs "/bin/javac"))
+                    (jar     (search-input-file inputs "/bin/jar")))
+               (mkdir-p "src/build")
+               (apply invoke javac "-encoding" "UTF-8" "-d" "src/build"
+                      (let ((files '()))
+                        (ftw "src/APL/"
+                          (lambda (filename statinfo flags)
+                            (if (string-match ".*\\.java" filename)
+                              (set! files (cons filename files)))
+                            #t))
+                        files))
+               (with-directory-excursion "src/build"
+                 (invoke jar "--create" "--verbose"
+                             "--file=dzaima-apl.jar"
+                             "--main-class=APL.Main"
+                             "APL")))))
+         (delete 'check) ;; Upstream implements no tests
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (bin     (string-append out "/bin"))
+                    (share   (string-append out "/share/java"))
+                    (wrapper (string-append bin "/dzaima-apl")))
+               (mkdir-p share)
+               (mkdir-p bin)
+               (install-file "src/build/dzaima-apl.jar" share)
+               (with-output-to-file wrapper
+                 (lambda _
+                   (display (string-append
+                              "#!" (search-input-file inputs "/bin/sh") "\n"
+                              (search-input-file inputs "/bin/java")
+                              " -jar " share "/dzaima-apl.jar \"$@\""))))
+               (chmod wrapper #o555))))
+         (add-after 'install 'reorder-jar-content
+           (lambda* (#:key outputs #:allow-other-keys)
+              (apply (assoc-ref ant:%standard-phases 'reorder-jar-content)
+                     #:outputs (list outputs))))
+         (add-after 'reorder-jar-content 'generate-jar-indices
+           (lambda* (#:key outputs #:allow-other-keys)
+              (apply (assoc-ref ant:%standard-phases 'generate-jar-indices)
+                     #:outputs (list outputs))))
+         (add-after 'generate-jar-indices 'reorder-jar-content
+           (lambda* (#:key outputs #:allow-other-keys)
+              (apply (assoc-ref ant:%standard-phases 'reorder-jar-content)
+                     #:outputs (list outputs)))))))
+    (home-page "https://github.com/dzaima/APL")
+    (synopsis "APL implementation in Java")
+    (description "An implementation of Extended Dyalog APL.")
+    (license license:expat-0)))
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#65930: [PATCH 1/1] gnu: Add dzaima-apl.
  2023-09-14  4:28 ` [bug#65930] [PATCH 1/1] " B. Wilson via Guix-patches via
@ 2023-10-18 20:40   ` Ludovic Courtès
  0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2023-10-18 20:40 UTC (permalink / raw)
  To: B. Wilson; +Cc: 65930-done

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

Hi,

"B. Wilson" <elaexuotee@wilsonb.com> skribis:

> * gnu/packages/apl.scm (dzaim-apl): New variable.

I made the changes below and applied it, thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1193 bytes --]

diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index eb2793dd0f..afe02736ad 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -141,9 +141,8 @@ (define-public dzaima-apl
     (inputs (list bash-minimal openjdk18))
     (native-inputs (list `(,openjdk18 "jdk") zip))
     (arguments
-      (list
+     (list
        #:imported-modules `(,@%gnu-build-system-modules
-                            (guix build syscalls)
                             (guix build ant-build-system))
        #:modules `((guix build gnu-build-system)
                    ((guix build ant-build-system) #:prefix ant:)
@@ -202,6 +201,8 @@ (define-public dzaima-apl
               (apply (assoc-ref ant:%standard-phases 'reorder-jar-content)
                      #:outputs (list outputs)))))))
     (home-page "https://github.com/dzaima/APL")
-    (synopsis "APL implementation in Java")
-    (description "An implementation of Extended Dyalog APL.")
-    (license license:expat-0)))
+    (synopsis "Implementation of the APL programming language in Java")
+    (description
+     "This package provides an implementation of APL in Java, extended from
+Dyalog APL.")
+    (license license:expat)))

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-10-18 20:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-14  4:26 [bug#65930] [PATCH 0/1] gnu: Add dzaima-apl B. Wilson via Guix-patches via
2023-09-14  4:28 ` [bug#65930] [PATCH 1/1] " B. Wilson via Guix-patches via
2023-10-18 20:40   ` bug#65930: " Ludovic Courtès

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).