Release 0.19.

* configure (VERSION): Update to 0.19.
(main): Likewise.
* configure.sh (VERSION): Likewise.
* guix/git/mes.scm (mes, mes.git): Likewise.
This commit is contained in:
Jan Nieuwenhuizen 2018-12-16 14:51:18 +01:00
parent 32dcd3a575
commit b2056c105d
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 35 additions and 30 deletions

2
configure vendored
View file

@ -65,7 +65,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
(define *shell* "sh") (define *shell* "sh")
(define PACKAGE "mes") (define PACKAGE "mes")
(define VERSION "0.18") (define VERSION "0.19")
;;; Utility ;;; Utility
(define (logf port string . rest) (define (logf port string . rest)

View file

@ -20,7 +20,7 @@
set -e set -e
VERSION=0.18 VERSION=0.19
srcdir=${srcdir-$(dirname $0)} srcdir=${srcdir-$(dirname $0)}
. ${srcdest}build-aux/trace.sh . ${srcdest}build-aux/trace.sh

View file

@ -67,24 +67,28 @@
(any (cut string-suffix? <> file) files)) (any (cut string-suffix? <> file) files))
(_ #f))))) (_ #f)))))
(define-public nyacc-for-mes (define-public nyacc
(let ((commit "ba24561b77306cd876bb9fd5ac412b15c7535f02") (package
(revision "0") (name "nyacc")
(version "0.86.0")) (version "0.86.0")
(package (source (origin
(inherit nyacc) (method url-fetch)
(version (if commit (string-append version "-" revision "." (string-take commit 7)) (uri (string-append "mirror://savannah/nyacc/"
version)) name "-" version ".tar.gz"))
(source (origin (patches (search-patches "nyacc-binary-literals.patch"))
(method url-fetch) (sha256
(uri (if commit (base32
(string-append "http://git.savannah.nongnu.org/cgit/nyacc.git/snapshot/nyacc-" "0lkd9lyspvhxlfs0496gsllwinh62jk9wij6gpadvx9gwz6yavd9"))))
commit ".tar.gz") (build-system gnu-build-system)
(string-append "http://download.savannah.nongnu.org/releases/nyacc/nyacc-" (native-inputs
version ".tar.gz"))) `(("guile" ,guile-2.2)))
(sha256 (synopsis "LALR(1) Parser Generator in Guile")
(base32 (description
"08y8ihwm21i333w7b0g1gs4s184ky0wy6fnl1rcakpgrqan9r1ql"))))))) "NYACC is an LALR(1) parser generator implemented in Guile.
The syntax and nomenclature should be considered not stable. It comes with
extensive examples, including parsers for the Javascript and C99 languages.")
(home-page "https://savannah.nongnu.org/projects/nyacc")
(license (list gpl3+ lgpl3+))))
(define-public mescc-tools (define-public mescc-tools
(package (package
@ -118,7 +122,7 @@ hex2 linker.")
(define-public mes (define-public mes
(let ((triplet "i686-unknown-linux-gnu") (let ((triplet "i686-unknown-linux-gnu")
(version "0.18")) (version "0.19"))
(package (package
(name "mes") (name "mes")
(version version) (version version)
@ -132,7 +136,7 @@ hex2 linker.")
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs
`(("mescc-tools" ,mescc-tools) `(("mescc-tools" ,mescc-tools)
("nyacc" ,nyacc-for-mes))) ("nyacc" ,nyacc)))
(native-inputs (native-inputs
`(("git" ,git) `(("git" ,git)
("guile" ,guile-2.2) ("guile" ,guile-2.2)
@ -148,24 +152,25 @@ hex2 linker.")
("perl" ,perl) ; build-aux/gitlog-to-changelog ("perl" ,perl) ; build-aux/gitlog-to-changelog
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(arguments (arguments
`(#:phases `(#:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'make-git-source-writable (add-before 'build 'make-git-source-writable
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(for-each make-file-writable (for-each make-file-writable
(find-files "." ".*\\.M1")))) (find-files "." ".*\\.M1")))))))
(delete 'strip)))) ; binutil's strip b0rkes Mescc/M1/hex2 binaries
(synopsis "Scheme interpreter and C compiler for full source bootstrapping") (synopsis "Scheme interpreter and C compiler for full source bootstrapping")
(description (description
"GNU Mes [Maxwell Equations of Software] aims to create full source "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed
bootstrapping for GuixSD. It consists of a mutual self-hosting [close to bootstrap to Guix and aims to help create full source bootstrapping for
Guile-] Scheme interpreter prototype in C and a Nyacc-based C compiler in GNU/Linux distributions. It consists of a mutual self-hosting Scheme
[Guile] Scheme.") interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with
Guile.")
(home-page "https://www.gnu.org/software/mes") (home-page "https://www.gnu.org/software/mes")
(license gpl3+)))) (license gpl3+))))
(define-public mes.git (define-public mes.git
(let ((version "0.18") (let ((version "0.19")
(revision "0") (revision "0")
(commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ)))) (commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ))))
(package (package