[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
137/285: gnu: Add axoloti-patcher-next.
From: |
guix-commits |
Subject: |
137/285: gnu: Add axoloti-patcher-next. |
Date: |
Sun, 29 Dec 2019 20:44:16 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome3.34
in repository guix.
commit bb8dffa8b1a53a36fd471df04cd2fc388947e3a4
Author: Ricardo Wurmus <address@hidden>
Date: Wed Dec 25 11:05:58 2019 +0100
gnu: Add axoloti-patcher-next.
* gnu/packages/axoloti.scm (axoloti-patcher-next): New variable.
---
gnu/packages/axoloti.scm | 274 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 274 insertions(+)
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index e1e70ba..18221dc 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -32,6 +32,7 @@
#:use-module (gnu packages embedded)
#:use-module (gnu packages flashing-tools)
#:use-module (gnu packages java)
+ #:use-module (gnu packages java-graphics)
#:use-module (gnu packages libusb)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages textutils)
@@ -357,3 +358,276 @@ runtime.")
for sketching digital audio algorithms. The patches run on a standalone
powerful microcontroller board: Axoloti Core. This package provides the
patcher application.")))
+
+(define-public axoloti-patcher-next
+ (package
+ (name "axoloti-patcher-next")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/axoloti/axoloti.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "022p993wf9l9mp6vg94x592vfqd1k1sjrq5f6x45h5r16qy6bdzh"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove pre-built Java binaries.
+ (delete-file-recursively "lib/")
+ #t))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; there's a Java test which is run as part of the Java
build.
+ #:modules ((guix build gnu-build-system)
+ ((guix build ant-build-system) #:prefix ant:)
+ (guix build utils)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (ice-9 match)
+ (ice-9 regex)
+ (sxml simple)
+ (sxml xpath)
+ (sxml transform))
+ #:imported-modules ((guix build ant-build-system)
+ (guix build syscalls)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda* (#:key inputs #:allow-other-keys)
+ (copy-recursively (assoc-ref inputs "elfloader")
+ "firmware/elfloader")
+ (for-each make-file-writable (find-files "."))
+ #t))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; prepare ChibiOS
+ (invoke "7z" "x" (assoc-ref inputs "chibios"))
+ (with-directory-excursion "ChibiOS_19.1.3/ext"
+ (invoke "7z" "x" "fatfs-0.13_patched.7z"))
+ #;
+ (substitute* "firmware/Makefile"
+ (("USE_COPT =") "USE_COPT = -std=gnu99"))
+
+ ;; Hardcode full path to compiler tools
+ (substitute*
+
'("ChibiOS_19.1.3/os/common/startup/ARMCMx/compilers/GCC/mk/arm-none-eabi.mk"
+ "env/arm-none-eabi.mk")
+ (("TRGT =.*")
+ (string-append "TRGT = "
+ (assoc-ref inputs "cross-toolchain")
+ "/bin/arm-none-eabi-\n")))
+
+ ;; Hardcode path to "make"
+ (substitute* "src/main/java/axoloti/shell/ShellTask.java"
+ (("return \"make\"")
+ (string-append "return \"" (which "make") "\"")))
+
+ ;; Hardcode path to "dfu-util"
+ (substitute* "src/main/java/axoloti/shell/UploadFirmwareDFU.java"
+ (("Axoloti.getReleaseDir\\(\\) \\+
\"/platform_.+/bin/dfu-util\"")
+ (string-append "\"" (which "dfu-util") "\"")))
+ #t))
+ (delete 'configure)
+ (replace 'build
+ ;; Build Axoloti firmware with cross-compiler
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((toolchain (assoc-ref inputs "cross-toolchain"))
+ (headers (string-append
+ toolchain
+ "/arm-none-eabi/include:"
+ toolchain
+
"/arm-none-eabi/include/arm-none-eabi/armv7e-m")))
+ (setenv "CROSS_CPATH" headers)
+ (setenv "CROSS_CPLUS_INCLUDE_PATH" headers)
+ (setenv "CROSS_LIBRARY_PATH"
+ (string-append toolchain
+ "/arm-none-eabi/lib")))
+ (with-directory-excursion "platform_linux"
+ (invoke "sh" "compile_firmware.sh"))))
+ (add-after 'build 'build-patcher
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
+ ;; We want to use our own jar files instead of the pre-built
+ ;; stuff in lib. So we replace the zipfileset tags in the
+ ;; build.xml with new ones that reference our jars.
+ (let* ((build.xml (with-input-from-file "build.xml"
+ (lambda _
+ (xml->sxml #:trim-whitespace? #t))))
+ (jars (append-map (match-lambda
+ (((? (cut string-prefix? "java-"
<>)
+ label) . directory)
+ (find-files directory "\\.jar$"))
+ (_ '()))
+ inputs))
+ (classpath (string-join jars ":"))
+ (fileset (map (lambda (jar)
+ `(zipfileset (@ (excludes
"META-INF/*.SF")
+ (src ,jar))))
+ jars)))
+ (call-with-output-file "build.xml"
+ (lambda (port)
+ (sxml->xml
+ (pre-post-order
+ build.xml
+ `( ;; Remove all zipfileset tags from the "jar" tree and
+ ;; inject our own tags.
+ (jar . ,(lambda (tag . kids)
+ `(jar ,@(append-map
+ (filter (lambda (e)
+ (not (eq? 'zipfileset (car
e)))))
+ kids)
+ ,@fileset)))
+ ;; Skip the "bundle" target (and the "-post-jar" target
+ ;; that depends on it), because we don't need it and it
+ ;; confuses sxml->xml.
+ (target . ,(lambda (tag . kids)
+ (let ((name ((sxpath '(name *text*))
+ (car kids))))
+ (if (or (member "bundle" name)
+ (member "-post-jar" name))
+ '() ; skip
+ `(,tag ,@kids)))))
+ (*default* . ,(lambda (tag . kids) `(,tag ,@kids)))
+ (*text* . ,(lambda (_ txt)
+ (match txt
+ ;; Remove timestamp.
+ ("${TODAY}" "(unknown)")
+ (_ txt))))))
+ port)))
+
+ ;; Build it!
+ (invoke "ant"
+ (string-append "-Djavac.classpath=" classpath)
+ "-Dbuilt_by=guix"
+ "-Dbuild.time=01/01/1970 00:00:00"
+ "-Djavac.source=1.8"
+ "-Djavac.target=1.8"
+ (string-append "-Dshort.version="
+ ,version)
+ ;; TODO: this is the output of:
+ ;; git describe --long --tags --dirty --always
+ (string-append "-Dbuild.version="
+ ,version "-0-g88b60feb")))))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (share (string-append out "/share/axoloti/")))
+
+ ;; TODO: don't copy *everything* from these directories.
+ (for-each (lambda (dir)
+ (copy-recursively dir (string-append share "/"
dir)))
+ '("api"
+ "archive"
+ "doc"
+ "env"
+ "firmware"
+ "nbproject"
+ "platform_linux"))
+ (install-file "dist/Axoloti.jar" share)
+
+ ;; Install old firmware
+ (let ((target (string-append share "/old_firmware/"))
+ (old-firmware
+ (string-append (assoc-ref inputs "axoloti-runtime")
+ "/share/axoloti/firmware/")))
+ (mkdir-p target)
+ (install-file (string-append old-firmware
+
"flasher/flasher_build/flasher.bin")
+ target)
+ ;; TODO: the old file differs from the file that is included
+ ;; in this repository as the old firmware.
+ (install-file (string-append old-firmware
+ "build/axoloti.bin")
+ target))
+
+ ;; We do this to ensure that this package retains references to
+ ;; other Java packages' jar files.
+ (install-file "build.xml" share)
+
+ ;; Create a launcher script
+ (mkdir (string-append out "/bin"))
+ (let ((target (string-append out "/bin/Axoloti")))
+ (with-output-to-file target
+ (lambda ()
+ (let* ((dir (string-append (assoc-ref outputs "out")
+ "/share/axoloti"))
+ (toolchain (assoc-ref inputs "cross-toolchain"))
+ (includes (string-append
+ toolchain
+ "/arm-none-eabi/include:"
+ toolchain
+
"/arm-none-eabi/include/arm-none-eabi/armv7e-m")))
+ (display
+ (string-append "#!" (which "sh") "\n"
+ "export CROSS_CPATH=" includes "\n"
+ "export CROSS_CPLUS_INCLUDE_PATH="
includes "\n"
+ "export CROSS_LIBRARY_PATH="
+ toolchain "/arm-none-eabi/lib" "\n"
+ (which "java")
+
+ ;; Renderer arguments
+ " -Xbootclasspath/a:"
+ (assoc-ref inputs
"java-marlin-renderer")
+ "/lib/marlin.jar"
+ "
-Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
+ " -Daxoloti_release=" share
+ " -jar " dir "/Axoloti.jar")))))
+ (chmod target #o555))
+ #t)))
+ (add-after 'install 'strip-jar-timestamps
+ (assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))
+ (inputs
+ `(("jdk" ,icedtea "jdk")
+ ("cross-toolchain" ,arm-none-eabi-nano-toolchain-7-2018-q2-update)
+ ;; for compiling patches
+ ("make" ,gnu-make)
+ ;; for uploading compiled patches and firmware
+ ("dfu-util" ,dfu-util-for-axoloti)
+ ;; for org/apache/commons/lang3/tuple/ImmutablePair
+ ("java-commons-lang3" ,java-commons-lang3)
+ ("java-jgit" ,java-jgit-4.2)
+ ("java-jsch" ,java-jsch)
+ ("java-marlin-renderer" ,java-marlin-renderer)
+ ("java-piccolo2d-core" ,java-piccolo2d-core)
+ ("java-piccolo2d-extras" ,java-piccolo2d-extras)
+ ("java-rsyntaxtextarea" ,java-rsyntaxtextarea)
+ ("java-simple-xml" ,java-simple-xml)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-usb4java" ,java-usb4java)))
+ (native-inputs
+ `(("ant" ,ant)
+ ("axoloti-runtime" ,axoloti-runtime) ; for old firmware
+ ("java-junit" ,java-junit)
+ ("java-hamcrest-core" ,java-hamcrest-core)
+ ("p7zip" ,p7zip)
+ ("zip" ,zip) ; for repacking the jar
+ ("elfloader"
+ ,(let ((commit "d0f93acac6577a069b8739bf42c9500e9a862988"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/JohannesTaelman/elfloader.git")
+ (commit commit)))
+ (file-name (git-file-name "elfloader" commit))
+ (sha256
+ (base32
+ "0zsy6w784amfq4vr1qnx8xvy70v33gvffz1vljllwppdc8s3khmn")))))
+ ("chibios"
+ ,(origin
+ (method url-fetch)
+ (uri "http://rwthaachen.dl.osdn.jp/chibios/70739/ChibiOS_19.1.3.7z")
+ (sha256
+ (base32
+ "1090alqp1z1bhj1z8ls04a350kbs8hsjcpkfddbprds73zbnnpk9"))))))
+ (home-page "http://www.axoloti.com/")
+ (synopsis "Audio development environment for the Axoloti core board")
+ (description
+ "The Axoloti patcher offers a “patcher” environment similar to Pure Data
+for sketching digital audio algorithms. The patches run on a standalone
+powerful microcontroller board: Axoloti Core.")
+ (license (list license:gpl3+ ; the whole project and GUI
+ license:bsd-3)))) ; the elfloader
- 113/285: gnu: dunst: Don't use unstable tarball., (continued)
- 113/285: gnu: dunst: Don't use unstable tarball., guix-commits, 2019/12/29
- 114/285: gnu: vc-dwim: Update to 1.9., guix-commits, 2019/12/29
- 118/285: gnu: tidy-html: Don't use unstable tarball., guix-commits, 2019/12/29
- 116/285: gnu: di: Update to 4.47.3., guix-commits, 2019/12/29
- 119/285: gnu: java-jsoup: Don't use unstable tarball., guix-commits, 2019/12/29
- 122/285: gnu: bochs: Update to 2.6.10., guix-commits, 2019/12/29
- 138/285: Revert "gnu: gnome-shell-extension-dash-to-dock: Update to 67.", guix-commits, 2019/12/29
- 131/285: gnu: Add gcc-arm-none-eabi-7-2018-q2-update., guix-commits, 2019/12/29
- 142/285: gnu: xvid: Update to 1.3.6., guix-commits, 2019/12/29
- 145/285: gnu: gaupol: Update to 1.7., guix-commits, 2019/12/29
- 137/285: gnu: Add axoloti-patcher-next.,
guix-commits <=
- 146/285: gnu: xvid: Update source uri., guix-commits, 2019/12/29
- 148/285: gnu: msgpack: Update to 3.2.1., guix-commits, 2019/12/29
- 147/285: gnu: nginx: Update to 1.17.7., guix-commits, 2019/12/29
- 150/285: gnu: pan: Update to 0.146., guix-commits, 2019/12/29
- 149/285: gnu: dovecot: Update to 2.3.9.2 [fixes CVE-2019-19722]., guix-commits, 2019/12/29
- 152/285: gnu: lxtask: Update to 0.1.9., guix-commits, 2019/12/29
- 156/285: gnu: squashfs-tools: Update to 4.4., guix-commits, 2019/12/29
- 158/285: gnu: Add dvdbackup., guix-commits, 2019/12/29
- 115/285: gnu: Add gnome-font-viewer., guix-commits, 2019/12/29
- 120/285: gnu: xmobar: Update to 0.32., guix-commits, 2019/12/29