build: Remove scripts/mes symlink.

This commit is contained in:
Jan Nieuwenhuizen 2018-04-07 18:27:26 +02:00
parent 4958921abc
commit 28b3ec954b
34 changed files with 40 additions and 40 deletions

View file

@ -52,7 +52,7 @@ $HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\
-f mes.hex2\ -f mes.hex2\
-f mes-blood-elf-footer.hex2\ -f mes-blood-elf-footer.hex2\
--exec_enable\ --exec_enable\
-o mes -o src/mes
$M1 --LittleEndian --Architecture=1 -f\ $M1 --LittleEndian --Architecture=1 -f\
stage0/x86.M1\ stage0/x86.M1\

View file

@ -21,7 +21,7 @@
set -e set -e
export GUILE=${GUILE-guile} export GUILE=${GUILE-guile}
export MES=${MES-./mes} export MES=${MES-./src/mes}
tests=" tests="

View file

@ -18,12 +18,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Mes. If not, see <http://www.gnu.org/licenses/>. # 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 MESCC=${MESCC-scripts/mescc.mes}
#export MES_ARENA=${MES_ARENA-200000000} > 12GB mem #export MES_ARENA=${MES_ARENA-200000000} > 12GB mem
GUILE=${GUILE-guile} GUILE=${GUILE-guile}
MES=${MES-./mes} MES=${MES-src/mes}
M1=${M1-M1} M1=${M1-M1}
HEX2=${HEX2-hex2} HEX2=${HEX2-hex2}
MESCC=${MESCC-guile/mescc.scm} MESCC=${MESCC-guile/mescc.scm}

View file

@ -19,7 +19,7 @@
# along with Mes. If not, see <http://www.gnu.org/licenses/>. # along with Mes. If not, see <http://www.gnu.org/licenses/>.
export GUILE=${GUILE-guile} export GUILE=${GUILE-guile}
export MES=${MES-./mes} export MES=${MES-src/mes}
#export MES_ARENA=${MES_ARENA-200000000} #9GiB #export MES_ARENA=${MES_ARENA-200000000} #9GiB
set -e set -e

View file

@ -8,7 +8,7 @@ MES_SEED=${MES_SEED-../mes-seed}
TINYCC_SEED=${TINYCC_SEED-../tinycc-seed} TINYCC_SEED=${TINYCC_SEED-../tinycc-seed}
mkdir -p $PREFIX/bin mkdir -p $PREFIX/bin
cp mes $PREFIX/bin/mes cp src/mes $PREFIX/bin/mes
mkdir -p $PREFIX/lib mkdir -p $PREFIX/lib
mkdir -p $MES_PREFIX/lib mkdir -p $MES_PREFIX/lib

12
test.sh
View file

@ -28,25 +28,25 @@ M1=${M1-M1}
HEX2=${HEX2-hex2} HEX2=${HEX2-hex2}
MESCC=${MESCC-guile/mescc.scm} MESCC=${MESCC-guile/mescc.scm}
$MESCC -E -o scaffold/tests/$t.E scaffold/tests/$t.c sh $MESCC -E -o scaffold/tests/$t.E scaffold/tests/$t.c
$MESCC -c -o scaffold/tests/$t.M1 scaffold/tests/$t.E sh $MESCC -c -o scaffold/tests/$t.M1 scaffold/tests/$t.E
$M1 --LittleEndian --Architecture=1\ $M1 --LittleEndian --Architecture=1\
-f stage0/x86.M1\ -f stage0/x86.M1\
-f scaffold/tests/$t.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 -E -o lib/crt1.E lib/crt1.c
# $MESCC -c -o lib/crt1.M1 lib/crt1.E # $MESCC -c -o lib/crt1.M1 lib/crt1.E
# $M1 --LittleEndian --Architecture=1 \ # $M1 --LittleEndian --Architecture=1 \
# -f stage0/x86.M1\ # -f stage0/x86.M1\
# -f lib/crt1.M1\ # -f lib/crt1.M1\
# > lib/crt1.hex2 # -o lib/crt1.hex2
# $MESCC -E -o lib/libc-mes.E lib/libc-mes.c # $MESCC -E -o lib/libc-mes.E lib/libc-mes.c
# $MESCC -c -o lib/libc-mes.M1 lib/libc-mes.E # $MESCC -c -o lib/libc-mes.M1 lib/libc-mes.E
# $M1 --LittleEndian --Architecture=1\ # $M1 --LittleEndian --Architecture=1\
# -f stage0/x86.M1\ # -f stage0/x86.M1\
# -f lib/libc-mes.M1\ # -f lib/libc-mes.M1\
# > lib/libc-mes.hex2 # -o lib/libc-mes.hex2
$HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\ $HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\
-f stage0/elf32-header.hex2\ -f stage0/elf32-header.hex2\
@ -54,7 +54,7 @@ $HEX2 --LittleEndian --Architecture=1 --BaseAddress=0x1000000\
-f lib/libc-mes.hex2\ -f lib/libc-mes.hex2\
-f scaffold/tests/$t.hex2\ -f scaffold/tests/$t.hex2\
-f stage0/elf32-footer-single-main.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 chmod +x scaffold/tests/$t.mes-out
r=0 r=0

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-scheme-*-
MES=${MES-$(dirname $0)/../scripts/mes} MES=${MES-$(dirname $0)/../src/mes}
echo ' ()' | cat $0 /dev/stdin | $MES $MES_FLAGS "$@" echo ' ()' | cat $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" #echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES "$@"
#paredit:|| #paredit:||
cat module/mes/base-0.mes $0 | $MES "$@" cat module/mes/base-0.mes $0 | $MES "$@"

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -2,7 +2,7 @@
# -*-scheme-*- # -*-scheme-*-
MES_ARENA=${MES_ARENA-10000000} MES_ARENA=${MES_ARENA-10000000}
export MES_ARENA 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"$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS $MES_FLAGS"$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-scheme-*-
# ***REMOVE THIS BLOCK COMMENT INITIALLY*** # ***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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?

View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# -*-scheme-*- # -*-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 "$@" echo ' ()' | cat $(dirname $0)/../module/mes/base-0.mes $0 /dev/stdin | $MES $MES_FLAGS "$@"
#paredit:|| #paredit:||
exit $? exit $?