From 8df367b3a2114b908209d6225dc0bde669f7c1c7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 15 Oct 2018 13:48:50 +0200 Subject: [PATCH] build: factor-out snarfing. * build-aux/snarf.sh: New file. * build-aux/build-cc.sh: Use it. * build-aux/build-cc32.sh: Likewise. * build-aux/build-cc64.sh: Likewise. * build-aux/build-mes.sh: Likewise. * build-aux/build-x86_64-mes.sh: Likewise. * build-aux/snarf.sh: Likewise. --- build-aux/build-cc.sh | 8 +------- build-aux/build-cc32.sh | 18 +----------------- build-aux/build-cc64.sh | 8 +------- build-aux/build-mes.sh | 8 +------- build-aux/build-x86_64-mes.sh | 8 +------- build-aux/snarf.sh | 36 +++++++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 45 deletions(-) create mode 100755 build-aux/snarf.sh diff --git a/build-aux/build-cc.sh b/build-aux/build-cc.sh index 45e85811..0b60c545 100755 --- a/build-aux/build-cc.sh +++ b/build-aux/build-cc.sh @@ -24,13 +24,7 @@ set -e . ${srcdest}build-aux/trace.sh # native -trace "SNARF gc.c" ${srcdest}build-aux/mes-snarf.scm src/gc.c -trace "SNARF lib.c" ${srcdest}build-aux/mes-snarf.scm src/lib.c -trace "SNARF math.c" ${srcdest}build-aux/mes-snarf.scm src/math.c -trace "SNARF mes.c" ${srcdest}build-aux/mes-snarf.scm src/mes.c -trace "SNARF posix.c" ${srcdest}build-aux/mes-snarf.scm src/posix.c -trace "SNARF reader.c" ${srcdest}build-aux/mes-snarf.scm src/reader.c -trace "SNARF vector.c" ${srcdest}build-aux/mes-snarf.scm src/vector.c +sh ${srcdest}build-aux/snarf.sh ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc.sh lib/libmes sh ${srcdest}build-aux/cc.sh src/mes diff --git a/build-aux/build-cc32.sh b/build-aux/build-cc32.sh index 2712b87e..d33c3bad 100755 --- a/build-aux/build-cc32.sh +++ b/build-aux/build-cc32.sh @@ -27,23 +27,7 @@ LIBC=${LIBC-c} ##moduledir=${moduledir-${datadir}${datadir:+/}module} -# native -# trace "SNARF gc.c" ${srcdest}build-aux/mes-snarf.scm src/gc.c -# trace "SNARF lib.c" ${srcdest}build-aux/mes-snarf.scm src/lib.c -# trace "SNARF math.c" ${srcdest}build-aux/mes-snarf.scm src/math.c -# trace "SNARF mes.c" ${srcdest}build-aux/mes-snarf.scm src/mes.c -# trace "SNARF posix.c" ${srcdest}build-aux/mes-snarf.scm src/posix.c -# trace "SNARF reader.c" ${srcdest}build-aux/mes-snarf.scm src/reader.c -# trace "SNARF vector.c" ${srcdest}build-aux/mes-snarf.scm src/vector.c - -# cc32-mes -trace "SNARF.mes gc.c" ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c -trace "SNARF.mes lib.c" ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c -trace "SNARF.mes math.c" ${srcdest}build-aux/mes-snarf.scm --mes src/math.c -trace "SNARF.mes mes.c" ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c -trace "SNARF.mes posix.c" ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c -trace "SNARF.mes reader.c" ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c -trace "SNARF.mes vector.c" ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c +sh ${srcdest}build-aux/snarf.sh --mes ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc32-mes.sh lib/linux/x86-mes-gcc/crt0 ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc32-mes.sh lib/linux/x86-mes-gcc/crt1 diff --git a/build-aux/build-cc64.sh b/build-aux/build-cc64.sh index 41304665..edfcf9a7 100755 --- a/build-aux/build-cc64.sh +++ b/build-aux/build-cc64.sh @@ -26,13 +26,7 @@ set -e LIBC=${LIBC-c} # cc64-mes -trace "SNARF.mes gc.c" ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c -trace "SNARF.mes lib.c" ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c -trace "SNARF.mes math.c" ${srcdest}build-aux/mes-snarf.scm --mes src/math.c -trace "SNARF.mes mes.c" ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c -trace "SNARF.mes posix.c" ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c -trace "SNARF.mes reader.c" ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c -trace "SNARF.mes vector.c" ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c +sh ${srcdest}build-aux/snarf.sh --mes ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/linux/x86_64-mes-gcc/crt0 ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/linux/x86_64-mes-gcc/crt1 diff --git a/build-aux/build-mes.sh b/build-aux/build-mes.sh index 8c301fab..6288251d 100755 --- a/build-aux/build-mes.sh +++ b/build-aux/build-mes.sh @@ -128,13 +128,7 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+gnu ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libgetopt MES_ARENA=${MES_ARENA-100000000} -trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c -trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c -trace "SNARF.mes math.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/math.c -trace "SNARF.mes mes.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c -trace "SNARF.mes posix.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c -trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c -trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c +sh ${srcdest}build-aux/snarf.sh --mes if [ -n "$SEED" ]; then bash ${srcdest}build-aux/cc-mes.sh src/mes diff --git a/build-aux/build-x86_64-mes.sh b/build-aux/build-x86_64-mes.sh index 67f867fc..ba76cad5 100755 --- a/build-aux/build-x86_64-mes.sh +++ b/build-aux/build-x86_64-mes.sh @@ -123,13 +123,7 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libc+gnu ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libgetopt MES_ARENA=${MES_ARENA-100000000} -trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c -trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c -trace "SNARF.mes math.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/math.c -trace "SNARF.mes mes.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c -trace "SNARF.mes posix.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c -trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c -trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c +sh ${srcdest}build-aux/snarf.sh --mes if [ -n "$SEED" ]; then bash ${srcdest}build-aux/cc-mes.sh src/mes diff --git a/build-aux/snarf.sh b/build-aux/snarf.sh new file mode 100755 index 00000000..2229c88d --- /dev/null +++ b/build-aux/snarf.sh @@ -0,0 +1,36 @@ +#! /bin/sh + +# GNU Mes --- Maxwell Equations of Software +# Copyright © 2018 Jan (janneke) Nieuwenhuizen +# +# 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 . + +set -e + +. ${srcdest}build-aux/config.sh +. ${srcdest}build-aux/trace.sh + +snarf=" " +if [ -n "$1" ]; then + snarf=.mes +fi +trace "SNARF$snarf gc.c" ${srcdest}build-aux/mes-snarf.scm $1 src/gc.c +trace "SNARF$snarf lib.c" ${srcdest}build-aux/mes-snarf.scm $1 src/lib.c +trace "SNARF$snarf math.c" ${srcdest}build-aux/mes-snarf.scm $1 src/math.c +trace "SNARF$snarf mes.c" ${srcdest}build-aux/mes-snarf.scm $1 src/mes.c +trace "SNARF$snarf posix.c" ${srcdest}build-aux/mes-snarf.scm $1 src/posix.c +trace "SNARF$snarf reader.c" ${srcdest}build-aux/mes-snarf.scm $1 src/reader.c +trace "SNARF$snarf vector.c" ${srcdest}build-aux/mes-snarf.scm $1 src/vector.c