From e6839a2b43019e11e0d4887cd0e3c7c71df59edc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 3 Nov 2019 22:15:11 +0100 Subject: [PATCH] build: Cater for M2-Planet. WIP * configure: Drop MES_SEED, support M2-Planet. * kaem.run: Also build bin/mes. * build-aux/bootstrap.sh.in: Run kaem bootstrap. * build-aux/build.sh.in: Run kaem bootstrap. Build bin/mes. Update scripts and users. * build-aux/install.sh.in: Install all built bin/mes-* flavours. --- .gitignore | 2 -- build-aux/bootstrap.sh.in | 10 ++++++++-- build-aux/build-mes.sh | 3 ++- build-aux/build.sh.in | 25 +++++++++++++++++++++++-- build-aux/config.sh.in | 2 ++ build-aux/install.sh.in | 11 ++++++++++- build-aux/pre-inst-env.in | 4 ++-- configure | 27 ++++++++++++++------------- configure.sh | 4 ++++ doc/mes.texi | 2 +- kaem.run | 16 ++++++++++------ simple.make | 16 +++++++++------- tests/catch.test | 2 +- tests/closure.test | 2 +- tests/cwv.test | 2 +- tests/display.test | 2 +- tests/fluids.test | 2 +- tests/getopt-long.test | 2 +- tests/guile.test | 2 +- tests/let-syntax.test | 2 +- tests/let.test | 2 +- tests/macro.test | 2 +- tests/match.test | 2 +- tests/math.test | 2 +- tests/module.test | 2 +- tests/optargs.test | 2 +- tests/peg.test | 2 +- tests/perform.test | 2 +- tests/pmatch.test | 2 +- tests/posix.test | 2 +- tests/psyntax.test | 2 +- tests/read.test | 2 +- tests/srfi-0.test | 2 +- tests/srfi-1.test | 2 +- tests/srfi-13.test | 2 +- tests/srfi-14.test | 2 +- tests/srfi-16.test | 2 +- tests/srfi-43.test | 2 +- tests/srfi-9.test | 2 +- tests/syntax.test | 2 +- tests/vector.test | 2 +- 41 files changed, 114 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 12843de4..82858dad 100644 --- a/.gitignore +++ b/.gitignore @@ -69,8 +69,6 @@ /scaffold/read-m2 /scaffold/tiny-mes-m2 -/src/mes - /.config /.config.make /.store diff --git a/build-aux/bootstrap.sh.in b/build-aux/bootstrap.sh.in index 842707e9..e71da9a2 100644 --- a/build-aux/bootstrap.sh.in +++ b/build-aux/bootstrap.sh.in @@ -27,6 +27,11 @@ MES_STACK=${MES_STACK-5000000} export MES_STACK MES_PREFIX=${MES_PREFIX-$PWD} +if test -n "@M2_PLANET@"; then + echo " KAEM kaem.run" + kaem --strict --verbose +fi + . build-aux/configure-lib.sh CPPFLAGS="-D HAVE_CONFIG_H=1 -I include" @@ -83,8 +88,9 @@ for c in $mes_SOURCES; do o=$(basename $c .c).o objects="$objects $o" done -echo " CCLD src/mes" -$CC -nostdlib -o src/mes -L mescc-lib mescc-lib/crt1.o $objects -lc +echo " CCLD bin/mes-mescc" +$CC -nostdlib -o bin/mes-mescc -L mescc-lib mescc-lib/crt1.o $objects -lc +cp bin/mes-mescc bin/mes ( mkdir -p gcc-lib diff --git a/build-aux/build-mes.sh b/build-aux/build-mes.sh index 8bf90d1b..3c5adb10 100755 --- a/build-aux/build-mes.sh +++ b/build-aux/build-mes.sh @@ -40,4 +40,5 @@ done if test $mes_libc = system; then LIBS=-lmes fi -link src/mes +link bin/mes-$compiler +cp bin/mes-$compiler bin/mes diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in index 13952a90..0170a7e5 100644 --- a/build-aux/build.sh.in +++ b/build-aux/build.sh.in @@ -42,7 +42,9 @@ if $courageous; then set +e fi -${SHELL} ${srcdest}build-aux/build-scaffold.sh +if test "$compiler" != bootstrap; then + ${SHELL} ${srcdest}build-aux/build-scaffold.sh +fi if test -n "$GUILE" -a "$GUILE" != true; then ${SHELL} ${srcdest}build-aux/build-guile.sh @@ -108,6 +110,7 @@ export LIBS compiler=gcc ${SHELL} ${srcdest}build-aux/build-source-lib.sh ) + ( if test $compiler = gcc; then LDFLAGS="$LDFLAGS @@ -121,9 +124,27 @@ export LIBS -I ${srcdest}include -I ${srcdest}include/$mes_kernel/$mes_cpu " - ${SHELL} ${srcdest}build-aux/build-mes.sh + if test "$compiler" != bootstrap; then + ${SHELL} ${srcdest}build-aux/build-mes.sh + fi ) +if test -n "$M2_PLANET"; then + ( + . ${srcdest}build-aux/trace.sh + if [ -z "$V" -o "$V" = 0 ]; then + __verbose= + else + __verbose=--verbose + fi + trace "KAEM scaffold/main.kaem" kaem --strict $__verbose -f scaffold/main.kaem + trace "KAEM scaffold/hello.kaem" kaem --strict $__verbose -f scaffold/hello.kaem + trace "KAEM scaffold/argv.kaem" kaem --strict $__verbose -f scaffold/argv.kaem + trace "KAEM scaffold/read.kaem" kaem --strict $__verbose -f scaffold/read.kaem + trace "KAEM kaem.run" kaem --strict $__verbose + ) +fi + ( mkdir -p mescc-lib cp config.sh mescc-lib diff --git a/build-aux/config.sh.in b/build-aux/config.sh.in index 83fa015d..fd5f81d1 100644 --- a/build-aux/config.sh.in +++ b/build-aux/config.sh.in @@ -30,8 +30,10 @@ GUILE_EFFECTIVE_VERSION="@GUILE_EFFECTIVE_VERSION@" GUIX="@GUIX@" HELP2MAN="@HELP2MAN@" HEX2="@HEX2@" +KAEM="@KAEM@" MAKEINFO="@MAKEINFO@" M1="@M1@" +M2_PLANET="@M2_PLANET@" MES_FOR_BUILD="@MES_FOR_BUILD@" MES_SEED="@MES_SEED@" NYACC="@NYACC@" diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in index a78ed292..1d4d9d63 100644 --- a/build-aux/install.sh.in +++ b/build-aux/install.sh.in @@ -43,7 +43,16 @@ fi DESTDIR=${DESTDIR-} mkdir -p ${DESTDIR}${bindir} -cp $_v src/mes ${DESTDIR}${bindir}/mes +cp $_v bin/mes ${DESTDIR}${bindir}/mes +if test -f bin/mes-gcc; then + cp $_v bin/mes-gcc ${DESTDIR}${bindir}/mes-gcc +fi +if test -f bin/mes-m2; then + cp $_v bin/mes-m2 ${DESTDIR}${bindir}/mes-m2 +fi +if test -f bin/mes-mescc; then + cp $_v bin/mes-mescc ${DESTDIR}${bindir}/mes-mescc2 +fi cp $_v scripts/mesar ${DESTDIR}${bindir}/mesar cp $_v scripts/mescc.scm ${DESTDIR}${bindir}/mescc.scm cp $_v scripts/mescc ${DESTDIR}${bindir}/mescc diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index 3f6201ac..b8ef1151 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -36,10 +36,10 @@ if [ -n "$srcdest" ]; then fi export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH -PATH="$abs_top_builddir/scripts:$abs_top_builddir/scripts:$abs_top_builddir/src:$abs_top_builddir/build-aux:$PATH" +PATH="$abs_top_builddir/scripts:$abs_top_builddir/scripts:$abs_top_builddir/bin:$abs_top_builddir/build-aux:$PATH" export PATH -MES=${MES-${abs_top_builddir}/src/${program_prefix}mes} +MES=${MES-${abs_top_builddir}/bin/${program_prefix}mes} export MES bindir=${abs_top_builddir}/scripts diff --git a/configure b/configure index 7ae858e3..a79cfe91 100755 --- a/configure +++ b/configure @@ -364,7 +364,6 @@ Some influential environment variables: GUILE guile command GUILD guild command MES_FOR_BUILD build system MES [can be mes or guile] - MES_SEED location of mes-seed " PACKAGE VERSION (getenv "prefix"))) (define (main args) @@ -417,12 +416,7 @@ Some influential environment variables: (when %verbose? (stderr "configure args=~s\n" args)) (for-each (lambda (v) (apply setenv (string-split v #\=))) vars) - (let* ((mes-seed (or (getenv "MES_SEED") - (string-append srcdest "../mes-seed"))) - (mes-seed (and mes-seed - (file-exists? (string-append mes-seed "/x86-mes/mes.S")) - mes-seed)) - (tinycc-prefix (or (getenv "TINYCC_PREFIX") + (let* ((tinycc-prefix (or (getenv "TINYCC_PREFIX") (string-append srcdest "../tinycc-prefix"))) (gcc (or (getenv "CC") "gcc")) (tcc (or (getenv "TCC") "tcc")) @@ -430,7 +424,9 @@ Some influential environment variables: (deps (fold (lambda (program results) (cons (check-program-version program) results)) '() - (list (make-dep "hex2" #:version '(0 6)) + (list (make-dep "kaem" #:version '(0 6) #:optional? #t) + (make-dep "M2-Planet" #:version '(0 1 3) #:optional? #t) + (make-dep "hex2" #:version '(0 6)) (make-dep "M1" #:version '(0 6)) (make-dep "blood-elf" #:version '(0 6)) (make-dep "diff" #:optional? #t) @@ -479,7 +475,7 @@ Some influential environment variables: ")) deps) deps)) - (mesc? (file-name "cc is Mes C" deps)) + (mescc? (file-name "cc is Mes C" deps)) (deps (if cc (cons (check-compile-c cc (make-dep "cc is Tiny CC" #:data "#if !defined (__TINYCC__) #error no tinycc @@ -508,7 +504,11 @@ Some influential environment variables: (equal? "linux" (car kernel-list))) "linux") ((equal? '( "gnu") kernel-list) "gnu") (else "unknown"))) - (compiler (if gcc? "gcc" "mescc")) + (m2-planet (file-name "M2-Planet" deps)) + (compiler (or (and gcc? "gcc") + (and tcc? "tcc") + (and mescc? "mescc") + "bootstrap")) (mes-system (string-join (list mes-cpu mes-kernel "mes") "-"))) (define* (substitute file-name pairs @@ -594,10 +594,11 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system) ("@GUILE@" . ,guile) ("@GUIX@" . ,(or (file-name "guix" deps) "")) ("@HELP2MAN@" . ,(or (file-name "help2man" deps) "")) + ("@KAEM@" . ,(or (file-name "kaem" deps) "")) + ("@M2_PLANET@" . ,(or (file-name "M2-Planet" deps) "")) ("@MAKEINFO@" . ,(or (file-name "makeinfo" deps) "")) ("@MES_FOR_BUILD@" . ,(or (file-name "mes" deps) guile)) - ("@MES_SEED@" . ,(or mes-seed "")) ("@PERL@" . ,(or (file-name "perl" deps) "")) ("#SCHEME=\"@SCHEME@\"" . ,(if with-cheating? (string-append "\nSCHEME=\"" guile "\"") "")) ("@SCHEME@" . ,(if with-cheating? guile "")) @@ -615,8 +616,8 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system) deps)))) (when (and (not cc) - (not mes-seed)) - (format (current-error-port) "must supply C compiler or MES_SEED/x86-mes/mes.S\n") + (not m2-planet)) + (format (current-error-port) "must supply C compiler or M2-Planet\n") (exit 2)) (for-each (lambda (o) (let* ((src (string-append srcdest o)) diff --git a/configure.sh b/configure.sh index ca0677ab..b73a15c4 100755 --- a/configure.sh +++ b/configure.sh @@ -71,6 +71,8 @@ fi GUILE=${GUILE-$(command -v guile)} || true HEX2=${HEX2-$(command -v hex2)} M1=${M1-$(command -v M1)} +M2_PLANET=${M1-$(command -v M2-Planet)} +KAEM=${KAEM-$(command -v kaem)} MES_FOR_BUILD=${MES_FOR_BUILD-$(command -v mes || command -v guile || echo mes)} GIT=${GIT-$(command -v git)} || true PERL=${PERL-$(command -v perl)} || true @@ -154,6 +156,8 @@ subst () { -e s,"@HEX2FLAGS@,$HEX2FLAGS,"\ -e s,"@M1@,$M1,"\ -e s,"@M1FLAGS@,$M1FLAGS,"\ + -e s,"@M2_PLANET@,$M2_PLANET,"\ + -e s,"@KAEM@,$KAEM,"\ -e s,"@MES_FOR_BUILD@,$MES_FOR_BUILD,"\ -e s,"@MES_SEED@,$MES_SEED,"\ -e s,"@MES_SEED@,$MES_SEED,"\ diff --git a/doc/mes.texi b/doc/mes.texi index 67219e62..9bb3b1a6 100644 --- a/doc/mes.texi +++ b/doc/mes.texi @@ -520,7 +520,7 @@ build-aux/check-boot.sh Run a single Mes boot test @example -MES_BOOT=scaffold/boot/00-zero.scm src/mes +MES_BOOT=scaffold/boot/00-zero.scm bin/mes @end example Run a single Mes Scheme test diff --git a/kaem.run b/kaem.run index 5785c49c..e12cabad 100644 --- a/kaem.run +++ b/kaem.run @@ -19,6 +19,8 @@ # Usage: # kaem --verbose --strict +mkdir -p m2 + M2-Planet \ --debug \ --architecture x86 \ @@ -107,9 +109,9 @@ M2-Planet \ -f src/struct.c \ -f src/symbol.c \ -f src/vector.c \ - -o bin/mes.M1 + -o m2/mes.M1 -blood-elf -f bin/mes.M1 -o bin/mes.blood-elf-M1 +blood-elf -f m2/mes.M1 -o m2/mes.blood-elf-M1 M1 \ --LittleEndian \ @@ -117,18 +119,20 @@ M1 \ -f lib/m2/x86/x86_defs.M1 \ -f lib/x86-mes/x86.M1 \ -f lib/linux/x86-mes-m2/crt1.M1 \ - -f bin/mes.M1 \ - -f bin/mes.blood-elf-M1 \ - -o bin/mes.hex2 + -f m2/mes.M1 \ + -f m2/mes.blood-elf-M1 \ + -o m2/mes.hex2 +mkdir -p bin hex2 \ --LittleEndian \ --architecture x86 \ --BaseAddress 0x1000000 \ --exec_enable \ -f lib/x86-mes/elf32-header.hex2 \ - -f bin/mes.hex2 \ + -f m2/mes.hex2 \ -o bin/mes-m2 echo Running mes-m2 ./bin/mes-m2 -c "(display 'Hello,M2-mes!) (newline)" +cp bin/mes-m2 bin/mes diff --git a/simple.make b/simple.make index f6cc8ed2..9393625b 100644 --- a/simple.make +++ b/simple.make @@ -177,6 +177,7 @@ gc-m2: bin/gc-m2 bin/mes-gcc: simple.make $(GCC_SOURCES) $(MES_SOURCES) $(INCLUDES) | bin $(CC) $(CFLAGS) $(GCC_SOURCES) $(MES_SOURCES) -o $@ + cp -f $@ bin/mes bin/gc-gcc: simple.make $(GCC_SOURCES) $(TEST_GC_SOURCES) $(INCLUDES) | bin $(CC) $(CFLAGS) -D GC_TEST=1 $(GCC_SOURCES) $(TEST_GC_SOURCES) -o $@ @@ -194,33 +195,34 @@ M2_PLANET_SOURCES = \ $(M2_PLANET_INCLUDES:%.h=%.h) \ $(M2_SOURCES) -bin/mes-m2.M1: simple.make $(M2_PLANET_SOURCES) $(MES_SOURCES) $(M2_PLANET_INCLUDES) | bin +m2/mes-m2.M1: simple.make $(M2_PLANET_SOURCES) $(MES_SOURCES) $(M2_PLANET_INCLUDES) | bin $(M2_PLANET) $(M2_PLANET_FLAGS) $(M2_PLANET_SOURCES:%=-f %) $(MES_SOURCES:%.c=-f %.c) -o $@ || rm -f $@ -bin/mes-m2.blood-elf.M1: bin/mes-m2.M1 +m2/mes-m2.blood-elf.M1: m2/mes-m2.M1 # blood-elf --32 -f $< -o $@ blood-elf -f $< -o $@ -bin/mes-m2.hex2: bin/mes-m2.blood-elf.M1 +m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1 M1 \ --LittleEndian \ --architecture $(M2_PLANET_ARCH) \ -f lib/m2/x86/x86_defs.M1 \ -f lib/x86-mes/x86.M1 \ -f lib/linux/x86-mes-m2/crt1.M1 \ - -f bin/mes-m2.M1 \ - -f bin/mes-m2.blood-elf.M1 \ + -f m2/mes-m2.M1 \ + -f m2/mes-m2.blood-elf.M1 \ -o $@ -bin/mes-m2: bin/mes-m2.hex2 +bin/mes-m2: m2/mes-m2.hex2 hex2 \ --LittleEndian \ --architecture $(M2_PLANET_ARCH) \ --BaseAddress 0x1000000 \ --exec_enable \ -f lib/x86-mes/elf32-header.hex2 \ - -f bin/mes-m2.hex2 \ + -f m2/mes-m2.hex2 \ -o $@ + cp -f $@ bin/mes # Clean up after ourselves .PHONY: clean diff --git a/tests/catch.test b/tests/catch.test index 29ef9f79..a4510369 100755 --- a/tests/catch.test +++ b/tests/catch.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests catch)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests catch)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/closure.test b/tests/closure.test index dd977074..36d001ab 100755 --- a/tests/closure.test +++ b/tests/closure.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests closure)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests closure)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/cwv.test b/tests/cwv.test index 2e4b3c40..b58c6e60 100755 --- a/tests/cwv.test +++ b/tests/cwv.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests cwv)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests cwv)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/display.test b/tests/display.test index c920755e..e17e8ab9 100755 --- a/tests/display.test +++ b/tests/display.test @@ -1,5 +1,5 @@ #! /bin/sh -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests display)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests display)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/fluids.test b/tests/fluids.test index 5fce8e87..76e54e66 100755 --- a/tests/fluids.test +++ b/tests/fluids.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests fluids)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests fluids)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/getopt-long.test b/tests/getopt-long.test index ddb7b426..84d0d024 100755 --- a/tests/getopt-long.test +++ b/tests/getopt-long.test @@ -1,5 +1,5 @@ #! /bin/sh -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests getopt-long)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests getopt-long)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/guile.test b/tests/guile.test index cb63692b..f4e422b0 100755 --- a/tests/guile.test +++ b/tests/guile.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests guile)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests guile)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/let-syntax.test b/tests/let-syntax.test index c1dd59d5..52156b6d 100755 --- a/tests/let-syntax.test +++ b/tests/let-syntax.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests let-syntax)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests let-syntax)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/let.test b/tests/let.test index 3a6130f4..c7682c3a 100755 --- a/tests/let.test +++ b/tests/let.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests let)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests let)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/macro.test b/tests/macro.test index d98a0324..a1eb4ee9 100755 --- a/tests/macro.test +++ b/tests/macro.test @@ -2,7 +2,7 @@ # -*-scheme-*- if [ "$MES" != guile ]; then export MES_BOOT=boot-02.scm - MES=${MES-$(dirname $0)/../src/mes} + MES=${MES-$(dirname $0)/../bin/mes} $MES < $0 exit $? else diff --git a/tests/match.test b/tests/match.test index 34e1e18b..602760b7 100755 --- a/tests/match.test +++ b/tests/match.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests match)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests match)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/math.test b/tests/math.test index 8ff404da..157b55e5 100755 --- a/tests/math.test +++ b/tests/math.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests math)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests math)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/module.test b/tests/module.test index 1bb9665e..09904f2c 100755 --- a/tests/module.test +++ b/tests/module.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests module)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests module)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/optargs.test b/tests/optargs.test index 06f1c53b..4709e1da 100755 --- a/tests/optargs.test +++ b/tests/optargs.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests optargs)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests optargs)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/peg.test b/tests/peg.test index 5d134ea8..830bea32 100755 --- a/tests/peg.test +++ b/tests/peg.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests peg)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests peg)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/perform.test b/tests/perform.test index 1021b1f7..f57ff71e 100755 --- a/tests/perform.test +++ b/tests/perform.test @@ -1,7 +1,7 @@ #! /bin/sh # -*-scheme-*- if [ "$MES" != guile ]; then - MES=${MES-$(dirname $0)/../src/mes} + MES=${MES-$(dirname $0)/../bin/mes} MES_BOOT=boot-02.scm exec $MES < $0 exit $? fi diff --git a/tests/pmatch.test b/tests/pmatch.test index bf05622c..504c5c6e 100755 --- a/tests/pmatch.test +++ b/tests/pmatch.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests pmatch)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests pmatch)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/posix.test b/tests/posix.test index 648306c2..f231ed9f 100755 --- a/tests/posix.test +++ b/tests/posix.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-13)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-13)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/psyntax.test b/tests/psyntax.test index 10b502f7..fba50a03 100755 --- a/tests/psyntax.test +++ b/tests/psyntax.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -MES_ARENA=${MES_ARENA-10000000} exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests psyntax)' -s "$0" "$@" +MES_ARENA=${MES_ARENA-10000000} exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests psyntax)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/read.test b/tests/read.test index f307c122..f995f55d 100755 --- a/tests/read.test +++ b/tests/read.test @@ -23,7 +23,7 @@ # along with GNU Mes. If not, see . if [ "$MES" != guile ]; then - MES=${MES-$(dirname $0)/../src/mes} + MES=${MES-$(dirname $0)/../bin/mes} MES_BOOT=boot-02.scm exec $MES < $0 fi diff --git a/tests/srfi-0.test b/tests/srfi-0.test index 90c526aa..018aec34 100755 --- a/tests/srfi-0.test +++ b/tests/srfi-0.test @@ -2,7 +2,7 @@ # -*-scheme-*- if [ "$MES" != guile ]; then export MES_BOOT=boot-02.scm - MES=${MES-$(dirname $0)/../src/mes} + MES=${MES-$(dirname $0)/../bin/mes} $MES < $0 exit $? fi diff --git a/tests/srfi-1.test b/tests/srfi-1.test index 5580adf3..da90b71f 100755 --- a/tests/srfi-1.test +++ b/tests/srfi-1.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-1)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-1)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/srfi-13.test b/tests/srfi-13.test index 25bdc660..14280b62 100755 --- a/tests/srfi-13.test +++ b/tests/srfi-13.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-13)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-13)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/srfi-14.test b/tests/srfi-14.test index 4ef1493a..1cf24882 100755 --- a/tests/srfi-14.test +++ b/tests/srfi-14.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-14)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-14)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/srfi-16.test b/tests/srfi-16.test index 036ddbda..8da5ba15 100755 --- a/tests/srfi-16.test +++ b/tests/srfi-16.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-16)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-16)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/srfi-43.test b/tests/srfi-43.test index a9904e3d..8d89ead8 100755 --- a/tests/srfi-43.test +++ b/tests/srfi-43.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-43)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-43)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/srfi-9.test b/tests/srfi-9.test index 05e21883..04d50fe1 100755 --- a/tests/srfi-9.test +++ b/tests/srfi-9.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-9)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests srfi-9)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/syntax.test b/tests/syntax.test index f0770c87..8e5c4005 100755 --- a/tests/syntax.test +++ b/tests/syntax.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests syntax)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests syntax)' -s "$0" "$@" !# ;;; -*-scheme-*- diff --git a/tests/vector.test b/tests/vector.test index 3255ac3b..0bf8c185 100755 --- a/tests/vector.test +++ b/tests/vector.test @@ -1,6 +1,6 @@ #! /bin/sh # -*-scheme-*- -exec ${MES-src/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests vector)' -s "$0" "$@" +exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests vector)' -s "$0" "$@" !# ;;; -*-scheme-*-