mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-09 21:05:24 +01:00
Add mes and mescc-tools-extra
mescc-tools-extra contains two important tools: - cp - chmod mes first builds itself from a mes 0.21 seed as used by guix, and then builds a mes 0.22 and then mes 0.22 using that created mes 0.22. It does /not/ use bootstrap.sh as we don't have a proper shell at this point, it has been manually adapted for kaem.
This commit is contained in:
fosslinux
parent
2706e07556
commit
649d7b68dc
1029 changed files with 120985 additions and 18 deletions
140
sysa/mes-0.22/scripts/diff.scm
Executable file
140
sysa/mes-0.22/scripts/diff.scm
Executable file
|
|
@ -0,0 +1,140 @@
|
|||
#! /bin/sh
|
||||
# -*-scheme-*-
|
||||
mes_p=$(command -v mes)
|
||||
if [ "$mes_p" -a -z "$MES" ]; then
|
||||
MES=guile
|
||||
fi
|
||||
exec ${MES-mes} -L ${0%/*} -e '(diff)' -s "$0" "$@"
|
||||
!#
|
||||
|
||||
;;; GNU Mes --- Maxwell Equations of Software
|
||||
;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; mes-snarf.scm: 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/>.
|
||||
|
||||
(define-module (diff)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (ice-9 rdelim)
|
||||
#:export (main))
|
||||
|
||||
(cond-expand
|
||||
(mes
|
||||
(define %scheme "mes"))
|
||||
(guile-2
|
||||
(define %scheme "guile")
|
||||
(define-macro (mes-use-module . rest) #t))
|
||||
(guile
|
||||
(use-modules (ice-9 syncase))
|
||||
(define %scheme "guile")
|
||||
(define-macro (mes-use-module . rest) #t)))
|
||||
|
||||
(mes-use-module (mes guile))
|
||||
|
||||
(format (current-error-port) "diff[~a]...\n" %scheme)
|
||||
|
||||
(define (plus a)
|
||||
(string-append "+" a))
|
||||
(define (minus a)
|
||||
(string-append "-" a))
|
||||
(define (keep a)
|
||||
(string-append " " a))
|
||||
|
||||
(define-record-type <hunk> (make-hunk context after removed added)
|
||||
hunk?
|
||||
(context hunk.context)
|
||||
(after hunk.after)
|
||||
(removed hunk.removed)
|
||||
(added hunk.added))
|
||||
|
||||
(define (hunk->lines o)
|
||||
(append `(,(format #f "@@ -~a,~a +~a,~a" (length (hunk.removed o)) (+ 3 (car (hunk.context o))) (length (hunk.added o)) (+ 3 (cadr (hunk.context o))))
|
||||
,@(map keep (filter identity (cddr (hunk.context o)))))
|
||||
(map minus (hunk.removed o))
|
||||
(map plus (hunk.added o))
|
||||
(map keep (hunk.after o))))
|
||||
|
||||
(define (safe-list-head lst n)
|
||||
(list-head lst (min n (length lst))))
|
||||
|
||||
(define (line-equal? a b)
|
||||
(equal? (string-trim-right a) (string-trim-right b)))
|
||||
|
||||
(define (diff-files a b)
|
||||
(let ((a-lines (string-split (with-input-from-file a read-string) #\newline))
|
||||
(b-lines (string-split (with-input-from-file b read-string) #\newline)))
|
||||
(let loop ((context '(1 1 #f #f #f)) (a-lines a-lines) (b-lines b-lines))
|
||||
;;(format (current-error-port) "loop context=~s\n" context)
|
||||
(cond ((and (null? a-lines) (null? b-lines)) '())
|
||||
((null? a-lines)
|
||||
(list (make-hunk context (safe-list-head a-lines 3) '() b-lines)))
|
||||
((null? b-lines)
|
||||
(list (make-hunk context (safe-list-head a-lines 3) a-lines '())))
|
||||
((line-equal? (car a-lines) (car b-lines))
|
||||
(loop `(,(1+ (car context))
|
||||
,(1+ (cadr context))
|
||||
,@(cdddr context)
|
||||
,(car a-lines))
|
||||
(cdr a-lines) (cdr b-lines)))
|
||||
(else
|
||||
(cond ((and (pair? (cdr b-lines)) (line-equal? (car a-lines) (cadr b-lines)))
|
||||
(cons (make-hunk context (safe-list-head a-lines 3) '() (list (car b-lines)))
|
||||
(loop `(,(+ 1 (car context))
|
||||
,(+ 2 (cadr context))
|
||||
,@(cdddr context)
|
||||
,(car a-lines))
|
||||
(cdr a-lines) (cddr b-lines))))
|
||||
((and (pair? (cdr a-lines)) (line-equal? (cadr a-lines) (car b-lines)))
|
||||
(cons (make-hunk context (safe-list-head a-lines 3) (list (car a-lines)) '())
|
||||
(loop `(,(+ 2 (car context))
|
||||
,(+ 1 (cadr context))
|
||||
,@(cddddr context)
|
||||
,(car a-lines)
|
||||
,(cadr a-lines))
|
||||
(cddr a-lines) (cdr b-lines))))
|
||||
(else (cons (make-hunk context (safe-list-head a-lines 3) (list (car a-lines)) (list (car b-lines)))
|
||||
(loop `(,(1+ (car context))
|
||||
,(1+ (cadr context))
|
||||
,@(cdddr context)
|
||||
,(car a-lines))
|
||||
(cdr a-lines) (cdr b-lines))))))))))
|
||||
|
||||
(define (main args)
|
||||
(let ((files (cdr args)))
|
||||
(when (or (null? files)
|
||||
(equal? (car files) "-h")
|
||||
(equal? (car files) "--help"))
|
||||
(display "
|
||||
Usage: diff.scm [OPTION]... FILES
|
||||
Compare FILES line by line.
|
||||
|
||||
Options:
|
||||
-u,--unified display unified diff (default)
|
||||
-h,--help display this help and exit
|
||||
-V,--version display version information and exit
|
||||
")
|
||||
(exit (if (null? files) 2 0)))
|
||||
(when (or (equal? (car files) "-V")
|
||||
(equal? (car files) "--version"))
|
||||
(display "
|
||||
diff.scm (GNU Mes) 0.20
|
||||
"))
|
||||
(let* ((files (if (string-prefix? "-" (car files)) (cdr files) files))
|
||||
(hunks (apply diff-files (list-head files 2))))
|
||||
(when (pair? hunks)
|
||||
(display (string-join (append-map hunk->lines hunks) "\n"))
|
||||
(newline)
|
||||
(exit 1)))))
|
||||
82
sysa/mes-0.22/scripts/mesar.in
Normal file
82
sysa/mes-0.22/scripts/mesar.in
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
#! @SHELL@
|
||||
|
||||
# GNU Mes --- Maxwell Equations of Software
|
||||
# Copyright © 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/>.
|
||||
|
||||
if [ "$V" = 2 ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
# parse arguments
|
||||
while [ $# -gt 0 ]; do
|
||||
case $1 in
|
||||
(-h|--help)
|
||||
cat <<EOF
|
||||
Usage: mesar [OPTION]... COMMAND ARCHIVE-FILE FILE...
|
||||
Archiver for MesCC.
|
||||
|
||||
Commands:
|
||||
r[ab][f][u] - replace existing or insert new file(s) into the archive
|
||||
[c] - do not warn if the library had to be created
|
||||
[D] - use zero for timestamps and uids/gids (default)
|
||||
|
||||
are ignored and assumed to be "crD".
|
||||
|
||||
Options:
|
||||
-h,--help display this help and exit
|
||||
-V,--version display version information and exit
|
||||
EOF
|
||||
exit 0
|
||||
;;
|
||||
(-V|--version)
|
||||
cat <<EOF
|
||||
mesar (GNU Mes) @VERSION@
|
||||
EOF
|
||||
exit 0
|
||||
;;
|
||||
-*) shift
|
||||
;;
|
||||
*) break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
command=$1
|
||||
shift
|
||||
if [ -z "$command" ]; then
|
||||
echo "AR: Usage error: missing command." 1>&2
|
||||
exit 2
|
||||
fi
|
||||
archive=$1
|
||||
shift
|
||||
if [ -z "$archive" ]; then
|
||||
echo "AR: Usage error: missing archive" 1>&2
|
||||
exit 2
|
||||
fi
|
||||
if [ $# -eq 0 ]; then
|
||||
echo "AR: Usage error: missing object files" 1>&2
|
||||
exit 2
|
||||
fi
|
||||
M1_archive=$(dirname "$archive")/$(basename "$archive" .a).s
|
||||
for o in "$@"; do
|
||||
s=$(dirname "$o")/$(basename "$o" .o).s
|
||||
M1_objects="$M1_objects $s"
|
||||
done
|
||||
mkdir -p $(dirname "$archive")
|
||||
cat $M1_objects > "$M1_archive"
|
||||
cat "$@" > "$archive"
|
||||
65
sysa/mes-0.22/scripts/mescc.in
Normal file
65
sysa/mes-0.22/scripts/mescc.in
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
#! @BASH@
|
||||
|
||||
# GNU Mes --- Maxwell Equations of Software
|
||||
# Copyright © 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/>.
|
||||
|
||||
if [ "$V" = 2 ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
MES_ARENA=${MES_ARENA-20000000}
|
||||
export MES_ARENA
|
||||
|
||||
MES_MAX_ARENA=${MES_MAX_ARENA-${MES_ARENA}}
|
||||
export MES_MAX_ARENA
|
||||
|
||||
MES_STACK=${MES_STACK-5000000}
|
||||
export MES_STACK
|
||||
|
||||
MES_PREFIX=${MES_PREFIX-@prefix@}
|
||||
export MES_PREFIX
|
||||
|
||||
GUILE_LOAD_PATH=@guile_site_dir@${GUILE_LOAD_PATH+:}${GUILE_LOAD_PATH}
|
||||
export GUILE_LOAD_PATH
|
||||
|
||||
MES=${MES-@prefix@/bin/mes}
|
||||
bindir=${bindir-@bindir@}
|
||||
includedir=${includedir-@includedir@}
|
||||
export includedir
|
||||
libdir=${libdir-@libdir@}
|
||||
export libdir
|
||||
numbered_arch=${numbered_arch=@numbered_arch@}
|
||||
export numbered_arch
|
||||
|
||||
if [ ! -f $bindir/mescc.scm ]; then
|
||||
bindir=$(dirname $0)
|
||||
fi
|
||||
|
||||
sep=
|
||||
if [ "$(basename ${SCHEME-$MES})" = "mes" ]; then
|
||||
sep=--
|
||||
fi
|
||||
|
||||
${SCHEME-$MES} \
|
||||
--no-auto-compile\
|
||||
-e main\
|
||||
-L @guile_site_dir@\
|
||||
-C @guile_site_ccache_dir@\
|
||||
$bindir/mescc.scm\
|
||||
$sep\
|
||||
"$@"
|
||||
72
sysa/mes-0.22/scripts/mescc.scm.in
Normal file
72
sysa/mes-0.22/scripts/mescc.scm.in
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
#! @GUILE@ \
|
||||
--no-auto-compile -e main -L @guile_site_dir@ -C @guile_site_ccache_dir@ -s
|
||||
!#
|
||||
;;; 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" "@prefix@")
|
||||
""
|
||||
"@prefix@")))
|
||||
|
||||
(define %includedir (or (getenv "includedir")
|
||||
(string-append %prefix "/include")))
|
||||
|
||||
(define %libdir (or (getenv "libdir")
|
||||
(string-append %prefix "/lib")))
|
||||
|
||||
(define %version (if (string-prefix? "@VERSION" "@VERSION@") "git"
|
||||
"@VERSION@"))
|
||||
|
||||
(define %arch (if (string-prefix? "@mes_cpu" "@mes_cpu@") %arch
|
||||
"@mes_cpu@"))
|
||||
|
||||
(define %kernel (if (string-prefix? "@mes_kernel" "@mes_kernel@") %kernel
|
||||
"@mes_kernel@"))
|
||||
|
||||
(define %numbered-arch? (if (getenv "numbered_arch") (and=> (getenv "numbered_arch")
|
||||
(lambda (x) (equal? x "true")))
|
||||
(if (string-prefix? "@numbered_arch" "@numbered_arch@") #f
|
||||
(equal? "@numbered_arch@" "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))
|
||||
Loading…
Add table
Add a link
Reference in a new issue