build: Remove scripts/mes symlink.

2018-04-07 18:27:26 +02:00 · 2018-04-07 18:27:26 +02:00 · 28b3ec954b
parent 4958921abc
commit 28b3ec954b
34 changed files with 40 additions and 40 deletions
--- a/build.sh
+++ b/build.sh
@ -52,7 +52,7 @@ $HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\
      -f mes.hex2\
      -f mes-blood-elf-footer.hex2\
      --exec_enable\
-      -o mes
+      -o src/mes

 $M1 --LittleEndian --Architecture=1 -f\
    stage0/x86.M1\
--- a/check-boot.sh
+++ b/check-boot.sh
@ -21,7 +21,7 @@
 set -e

 export GUILE=${GUILE-guile}
-export MES=${MES-./mes}
+export MES=${MES-./src/mes}

 tests="

--- a/check-mescc.sh
+++ b/check-mescc.sh
@ -18,12 +18,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Mes.  If not, see <http://www.gnu.org/licenses/>.

-export MES=${MES-src/mes.gcc}
+export MES=${MES-src/mes}
 export MESCC=${MESCC-scripts/mescc.mes}
 #export MES_ARENA=${MES_ARENA-200000000} > 12GB mem

 GUILE=${GUILE-guile}
-MES=${MES-./mes}
+MES=${MES-src/mes}
 M1=${M1-M1}
 HEX2=${HEX2-hex2}
 MESCC=${MESCC-guile/mescc.scm}
--- a/check.sh
+++ b/check.sh
@ -19,7 +19,7 @@
 # along with Mes.  If not, see <http://www.gnu.org/licenses/>.

 export GUILE=${GUILE-guile}
-export MES=${MES-./mes}
+export MES=${MES-src/mes}
 #export MES_ARENA=${MES_ARENA-200000000} #9GiB

 set -e
--- a/install.sh
+++ b/install.sh
@ -8,7 +8,7 @@ MES_SEED=${MES_SEED-../mes-seed}
 TINYCC_SEED=${TINYCC_SEED-../tinycc-seed}

 mkdir -p $PREFIX/bin
-cp mes $PREFIX/bin/mes
+cp src/mes $PREFIX/bin/mes

 mkdir -p $PREFIX/lib
 mkdir -p $MES_PREFIX/lib
--- a/test.sh
+++ b/test.sh
@ -28,25 +28,25 @@ M1=${M1-M1}
 HEX2=${HEX2-hex2}
 MESCC=${MESCC-guile/mescc.scm}

-$MESCC -E -o scaffold/tests/$t.E scaffold/tests/$t.c
-$MESCC -c -o scaffold/tests/$t.M1 scaffold/tests/$t.E
+sh $MESCC -E -o scaffold/tests/$t.E scaffold/tests/$t.c
+sh $MESCC -c -o scaffold/tests/$t.M1 scaffold/tests/$t.E
 $M1 --LittleEndian --Architecture=1\
    -f stage0/x86.M1\
    -f scaffold/tests/$t.M1\
-    >  scaffold/tests/$t.hex2
+    -o scaffold/tests/$t.hex2

 # $MESCC -E -o lib/crt1.E lib/crt1.c
 # $MESCC -c -o lib/crt1.M1 lib/crt1.E
 # $M1 --LittleEndian --Architecture=1 \
 #     -f stage0/x86.M1\
 #     -f lib/crt1.M1\
-#     > lib/crt1.hex2
+#     -o lib/crt1.hex2
 # $MESCC -E -o lib/libc-mes.E lib/libc-mes.c
 # $MESCC -c -o lib/libc-mes.M1 lib/libc-mes.E
 # $M1 --LittleEndian --Architecture=1\
 #     -f stage0/x86.M1\
 #     -f lib/libc-mes.M1\
-#     > lib/libc-mes.hex2
+#     -o lib/libc-mes.hex2

 $HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\
      -f stage0/elf32-header.hex2\
@ -54,7 +54,7 @@ $HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\
      -f lib/libc-mes.hex2\
      -f scaffold/tests/$t.hex2\
      -f stage0/elf32-footer-single-main.hex2\
-      > scaffold/tests/$t.mes-out
+      -o scaffold/tests/$t.mes-out
 chmod +x scaffold/tests/$t.mes-out

 r=0
--- a/tests/base.test
+++ b/tests/base.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/boot.test
+++ b/tests/boot.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/catch.test
+++ b/tests/catch.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/closure.test
+++ b/tests/closure.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/cwv.test
+++ b/tests/cwv.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/display.test
+++ b/tests/display.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/fluids.test
+++ b/tests/fluids.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/getopt-long.test
+++ b/tests/getopt-long.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/guile.test
+++ b/tests/guile.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/let-syntax.test
+++ b/tests/let-syntax.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/let.test
+++ b/tests/let.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/match.test
+++ b/tests/match.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/math.test
+++ b/tests/math.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/module.test
+++ b/tests/module.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 #echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES "$@"
 #paredit:||
 cat module/mes/base-0.mes $0 | $MES "$@"
--- a/tests/optargs.test
+++ b/tests/optargs.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/peg.test
+++ b/tests/peg.test
@ -2,7 +2,7 @@
 # -*-scheme-*-
 MES_ARENA=${MES_ARENA-10000000}
 export MES_ARENA
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS $MES_FLAGS"$@"
 #paredit:||
 exit $?
--- a/tests/pmatch.test
+++ b/tests/pmatch.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/psyntax.test
+++ b/tests/psyntax.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/quasiquote.test
+++ b/tests/quasiquote.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/read.test
+++ b/tests/read.test
@ -1,7 +1,7 @@
 #! /bin/sh
 # -*-scheme-*-
 # ***REMOVE THIS BLOCK COMMENT INITIALLY***
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/record.test
+++ b/tests/record.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/scm.test
+++ b/tests/scm.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/srfi-1.test
+++ b/tests/srfi-1.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/srfi-13.test
+++ b/tests/srfi-13.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/srfi-14.test
+++ b/tests/srfi-14.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/srfi-16.test
+++ b/tests/srfi-16.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/syntax.test
+++ b/tests/syntax.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?
--- a/tests/vector.test
+++ b/tests/vector.test
@ -1,6 +1,6 @@
 #! /bin/sh
 # -*-scheme-*-
-MES=${MES-$(dirname $0)/../scripts/mes}
+MES=${MES-$(dirname $0)/../src/mes}
 echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
 #paredit:||
 exit $?