Release 0.18.

* configure (VERSION): Update to 0.18. (main): Likewise. * configure.sh (VERSION): Likewise. * guix/git/mes.scm (mes, mes.git): Likewise. * guix/mescc-tools-boot.patch: New file.
2018-10-04 23:15:25 +02:00 · 2018-10-04 23:15:25 +02:00 · 761cdc65ed
parent bb6d786736
commit 761cdc65ed
4 changed files with 240 additions and 17 deletions
--- a/6
+++ b/6
@ -61,7 +61,7 @@ exec ${guile} -L . --no-auto-compile -e '(configure)' -s "$0" ${1+"$@"}

 (define *shell* "sh")
 (define PACKAGE "mes")
-(define VERSION "0.17.1")
+(define VERSION "0.18")

 ;;; Utility
 (define (logf port string . rest)
@ -355,10 +355,10 @@ Some influential environment variables:
                             (make-dep "guix" '(0 13) #:optional? #t)
                             (make-dep "bash" '(2 0) #:optional? #t)
                             (make-dep "guile-tools" '(2 0))
-                             (make-dep "mes-seed" '(0 17 1) #:optional? #t
+                             (make-dep "mes-seed" '(0 18) #:optional? #t
                                       #:commands (list (string-append mes-seed "/refresh.sh"))
                                       #:file-name mes-seed)
-                             (make-dep "tinycc-seed" '(0 17 1) #:optional? #t
+                             (make-dep "tinycc-seed" '(0 18) #:optional? #t
                                       #:commands (list (string-append tinycc-seed "/refresh.sh"))
                                       #:file-name tinycc-seed)
                             (make-dep "cc" '(2 95) #:commands '("gcc"))
--- a/configure.sh
+++ b/configure.sh
@ -20,7 +20,7 @@

 set -e

-VERSION=0.17.1
+VERSION=0.18

 # parse --prefix=prefix
 cmdline=$(echo "$@")
--- a/guix/git/mes.scm
+++ b/guix/git/mes.scm
@ -89,17 +89,18 @@
 (define-public mescc-tools
  (package
    (name "mescc-tools")
-    (version "0.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/oriansj/mescc-tools/archive/Release_"
-                    version
-                    ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0rsxbjc3bg0jl3h7ai4hndxx2iyyk8bvwj9nd3xv2vgz3bmypnah"))))
+    (version "0.5.2")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "http://git.savannah.nongnu.org/cgit/"
+                                   "mescc-tools.git/snapshot/"
+                                   "mescc-tools-Release_" version
+                                   ".tar.gz"))
+               (patches (search-patches "mescc-tools-boot.patch"))
+               (file-name (string-append name "-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2"))))
    (build-system gnu-build-system)
    (supported-systems '("i686-linux" "x86_64-linux"))
    (arguments
@ -117,7 +118,7 @@ hex2 linker.")

 (define-public mes
  (let ((triplet "i686-unknown-linux-gnu")
-        (version "0.17.1"))
+        (version "0.18"))
    (package
      (name "mes")
      (version version)
@ -164,7 +165,7 @@ Guile-] Scheme interpreter prototype in C and a Nyacc-based C compiler in
      (license gpl3+))))

 (define-public mes.git
- (let ((version "0.17.1")
+ (let ((version "0.18")
        (revision "0")
        (commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ))))
    (package
--- a/guix/mescc-tools-boot.patch
+++ b/guix/mescc-tools-boot.patch
@ -0,0 +1,222 @@
+From c184e95096881a13f29ebd7fc507fe305d3d8de5 Mon Sep 17 00:00:00 2001
+From: Jan Nieuwenhuizen <janneke@gnu.org>
+Date: Thu, 4 Oct 2018 22:03:31 +0200
+Subject: [PATCH] build.sh: Update for mes 0.18.
+
+---
+ build.sh   | 92 +++++++++++++++++++++++++++++++++++++-----------------
+ install.sh |  6 ++--
+ 2 files changed, 66 insertions(+), 32 deletions(-)
+
+diff --git a/build.sh b/build.sh
+index 335a7bb..19a0029 100755
+--- a/build.sh
+++ b/build.sh
+@@ -18,7 +18,8 @@
+ # along with mescc-tools.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ set -eux
+-MES_SEED=${MES_SEED-../mescc-tools-seed/libs}
+MES_PREFIX=${MES_PREFIX-../mes}
+MES_SEED=${MES_SEED-../mes-seed}
+ MESCC_TOOLS_SEED=${MESCC_TOOLS_SEED-../mescc-tools-seed}
+ 
+ #########################################
+@@ -32,15 +33,23 @@ MESCC_TOOLS_SEED=${MESCC_TOOLS_SEED-../mescc-tools-seed}
+ # blood-elf
+ # Create proper debug segment
+ $MESCC_TOOLS_SEED/blood-elf\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/blood-elf.M1\
+     -o blood-elf-blood-elf-footer.M1
+ 
+ # Build
+ # M1-macro phase
+ $MESCC_TOOLS_SEED/M1 --LittleEndian --Architecture 1\
+-    -f $MES_SEED/x86.M1\
+-    -f $MES_SEED/crt1.M1\
+-    -f $MES_SEED/libc+tcc-mes.M1\
+    -f $MES_PREFIX/lib/x86-mes/x86.M1\
+    -f $MES_SEED/x86-mes/crt1.S\
+    -f $MES_SEED/x86-mes/libc+tcc.S\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/blood-elf.M1\
+     -f blood-elf-blood-elf-footer.M1\
+     -o blood-elf.hex2
+@@ -49,7 +58,7 @@ $MESCC_TOOLS_SEED/hex2\
+     --LittleEndian\
+     --Architecture 1\
+     --BaseAddress 0x1000000\
+-    -f $MES_SEED/elf32-header.hex2\
+    -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\
+     -f blood-elf.hex2\
+     --exec_enable\
+     -o bin/blood-elf
+@@ -65,9 +74,13 @@ $MESCC_TOOLS_SEED/hex2\
+ $MESCC_TOOLS_SEED/M1 \
+     --LittleEndian\
+     --Architecture 1\
+-    -f $MES_SEED/x86.M1\
+-    -f $MES_SEED/crt1.M1\
+-    -f $MES_SEED/libc+tcc-mes.M1\
+    -f $MES_PREFIX/lib/x86-mes/x86.M1\
+    -f $MES_SEED/x86-mes/crt1.S\
+    -f $MES_SEED/x86-mes/libc+tcc.S\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/M1.M1\
+     -f M1-footer.M1\
+     -o M1.hex2
+@@ -76,7 +89,7 @@ $MESCC_TOOLS_SEED/hex2 \
+     --LittleEndian\
+     --Architecture 1\
+     --BaseAddress 0x1000000\
+-    -f $MES_SEED/elf32-header.hex2\
+    -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\
+     -f M1.hex2\
+     --exec_enable\
+     -o bin/M1
+@@ -92,9 +105,13 @@ $MESCC_TOOLS_SEED/hex2 \
+ ./bin/M1 \
+     --LittleEndian\
+     --Architecture 1\
+-    -f $MES_SEED/x86.M1\
+-    -f $MES_SEED/crt1.M1\
+-    -f $MES_SEED/libc+tcc-mes.M1\
+    -f $MES_PREFIX/lib/x86-mes/x86.M1\
+    -f $MES_SEED/x86-mes/crt1.S\
+    -f $MES_SEED/x86-mes/libc+tcc.S\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/hex2.M1\
+     -f hex2-footer.M1\
+     -o hex2.hex2
+@@ -103,10 +120,10 @@ $MESCC_TOOLS_SEED/hex2 \
+       --LittleEndian\
+       --Architecture 1\
+       --BaseAddress 0x1000000\
+-      -f $MES_SEED/elf32-header.hex2\
+      -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\
+       -f hex2.hex2\
+       --exec_enable\
+-      -o bin/hex2
+      -o bin/hex2-0
+ 
+ #########################
+ # Phase-1 Self-host     #
+@@ -123,18 +140,22 @@ $MESCC_TOOLS_SEED/hex2 \
+ ./bin/M1 \
+     --LittleEndian\
+     --Architecture 1\
+-    -f $MES_SEED/x86.M1\
+-    -f $MES_SEED/crt1.M1\
+-    -f $MES_SEED/libc+tcc-mes.M1\
+    -f $MES_PREFIX/lib/x86-mes/x86.M1\
+    -f $MES_SEED/x86-mes/crt1.S\
+    -f $MES_SEED/x86-mes/libc+tcc.S\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/blood-elf.M1\
+     -f blood-elf-blood-elf-footer.M1\
+     -o blood-elf.hex2
+ # Hex2-linker phase
+-./bin/hex2 \
+./bin/hex2-0 \
+     --LittleEndian\
+     --Architecture 1\
+     --BaseAddress 0x1000000\
+-    -f $MES_SEED/elf32-header.hex2\
+    -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\
+     -f blood-elf.hex2\
+     --exec_enable\
+     -o blood-elf
+@@ -150,18 +171,22 @@ $MESCC_TOOLS_SEED/hex2 \
+ ./bin/M1 \
+     --LittleEndian\
+     --Architecture 1\
+-    -f $MES_SEED/x86.M1\
+-    -f $MES_SEED/crt1.M1\
+-    -f $MES_SEED/libc+tcc-mes.M1\
+    -f $MES_PREFIX/lib/x86-mes/x86.M1\
+    -f $MES_SEED/x86-mes/crt1.S\
+    -f $MES_SEED/x86-mes/libc+tcc.S\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/M1.M1\
+     -f M1-footer.M1\
+     -o M1.hex2
+ # Hex2-linker phase
+-./bin/hex2 \
+./bin/hex2-0 \
+     --LittleEndian\
+     --Architecture 1\
+     --BaseAddress 0x1000000\
+-    -f $MES_SEED/elf32-header.hex2\
+    -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\
+     -f M1.hex2\
+     --exec_enable\
+     -o bin/M1
+@@ -177,18 +202,27 @@ $MESCC_TOOLS_SEED/hex2 \
+ ./bin/M1 \
+     --LittleEndian\
+     --Architecture 1\
+-    -f $MES_SEED/x86.M1\
+-    -f $MES_SEED/crt1.M1\
+-    -f $MES_SEED/libc+tcc-mes.M1\
+    -f $MES_PREFIX/lib/x86-mes/x86.M1\
+    -f $MES_SEED/x86-mes/crt1.S\
+    -f $MES_SEED/x86-mes/libc+tcc.S\
+    -f $MESCC_TOOLS_SEED/file_print.M1\
+    -f $MESCC_TOOLS_SEED/match.M1\
+    -f $MESCC_TOOLS_SEED/numerate_number.M1\
+    -f $MESCC_TOOLS_SEED/string.M1\
+     -f $MESCC_TOOLS_SEED/hex2.M1\
+     -f hex2-footer.M1\
+     -o hex2.hex2
+ # Hex2-linker phase
+-./bin/hex2 \
+./bin/hex2-0 \
+       --LittleEndian\
+       --Architecture 1\
+       --BaseAddress 0x1000000\
+-      -f $MES_SEED/elf32-header.hex2\
+      -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\
+       -f hex2.hex2\
+       --exec_enable\
+       -o bin/hex2
+
+# TODO
+touch bin/exec_enable
+touch bin/get_machine
+touch bin/kaem
+diff --git a/install.sh b/install.sh
+index e4dccff..29e58d6 100644
+--- a/install.sh
+++ b/install.sh
+@@ -18,6 +18,6 @@
+ PREFIX=${PREFIX-usr}
+ 
+ mkdir -p "$PREFIX/bin"
+-cp blood-elf "$PREFIX/bin/blood-elf"
+-cp hex2 "$PREFIX/bin/hex2"
+-cp M1 "$PREFIX/bin/M1"
+cp bin/blood-elf "$PREFIX/bin/blood-elf"
+cp bin/hex2 "$PREFIX/bin/hex2"
+cp bin/M1 "$PREFIX/bin/M1"
+-- 
+2.18.0
+