Build mes-m2.

rootfs.sh

@@ -29,6 +29,7 @@ mkdir tmp/bin
 mkdir tmp/after/bin -p
 mkdir tmp/after/{lib,include}
 mkdir tmp/after/include/{mes,gnu,linux,sys,mach}
+mkdir tmp/after/include/linux/x86
 # put all the kaems for after in
 cp after.kaem tmp/
 cp after.kaem.run tmp/after/kaem.run
@@ -44,11 +45,13 @@ mkdir blynn-compiler/{bin,generated}
 popd
 
 # mes
-cp -r mes-0.22 tmp/after/
-ln -s . tmp/after/mes-0.22/x86-mes
-#cp -r nyacc-0.99.3 tmp/after/
-cp -r mes-bins tmp/after/
+cp -r mes tmp/after/
+ln -s lib/x86-mes tmp/after/mes/x86-mes
+cp -r nyacc tmp/after/
 cp mes.kaem tmp/after/
+cp mes-files/mescc.scm tmp/after/bin/
+cp mes-files/config.h tmp/after/mes/include/mes/
+mkdir tmp/after/mes/{bin,m2}
 
 # General cleanup
 find tmp -name .git -exec rm -rf \;

sysa/mes-files/config.h

@@ -0,0 +1,2 @@
+#undef SYSTEM_LIBC
+#define MES_VERSION "0.22-m2"

sysa/mes-files/mescc.scm

@@ -0,0 +1,69 @@
+;;; GNU Mes --- Maxwell Equations of Software
+;;; Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;;
+;;; This file is part of GNU Mes.
+;;;
+;;; GNU Mes is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Mes is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+(cond-expand
+ (mes)
+ (guile
+  (define %arch (car (string-split %host-type #\-)))
+  (define %kernel (car (filter
+                        (compose not
+                                 (lambda (x) (member x '("pc" "portbld" "unknown"))))
+                        (cdr (string-split %host-type #\-)))))))
+
+(define %prefix (or (getenv "MES_PREFIX")
+                      (if (string-prefix? "@prefix" "/after")
+                          ""
+                          "/after")))
+
+(define %includedir (or (getenv "includedir")
+                        (string-append %prefix "/include")))
+
+(define %libdir (or (getenv "libdir")
+                    (string-append %prefix "/lib")))
+
+(define %version (if (string-prefix? "@VERSION" "0.22-m2") "git"
+                     "0.22"))
+
+(define %arch (if (string-prefix? "@mes_cpu" "x86") %arch
+                  "x86"))
+
+(define %kernel (if (string-prefix? "@mes_kernel" "linux") %kernel
+                    "linux"))
+
+(define %numbered-arch? (if (getenv "numbered_arch") (and=> (getenv "numbered_arch")
+                                                            (lambda (x) (equal? x "true")))
+                            (if (string-prefix? "@numbered_arch" "false") #f
+                                (equal? "false" "true"))))
+
+(setenv "%prefix" %prefix)
+(setenv "%includedir" %includedir)
+(setenv "%libdir" %libdir)
+(setenv "%version" %version)
+(setenv "%arch" %arch)
+(setenv "%kernel" %kernel)
+(setenv "%numbered_arch" (if %numbered-arch? "true" "false"))
+
+(cond-expand
+ (mes
+  (mes-use-module (mescc))
+  (mescc:main (command-line)))
+ (guile
+  (use-modules (mescc))))
+
+(define (main args)
+  (mescc:main args))