diff --git a/mes/module/mescc/M1.mes b/mes/module/mescc/M1.mes deleted file mode 100644 index 342af07e..00000000 --- a/mes/module/mescc/M1.mes +++ /dev/null @@ -1,28 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (srfi srfi-1)) -(mes-use-module (srfi srfi-26)) -(mes-use-module (mes misc)) -(mes-use-module (mes optargs)) -(mes-use-module (mes pmatch)) -(mes-use-module (mescc as)) -(mes-use-module (mescc info)) -(include-from-path "mescc/M1.scm") diff --git a/mes/module/mescc/armv4/as.mes b/mes/module/mescc/armv4/as.mes deleted file mode 100644 index 8e68de53..00000000 --- a/mes/module/mescc/armv4/as.mes +++ /dev/null @@ -1,23 +0,0 @@ -;;; -*-scheme-*- - -;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2018, 2019 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 . - -(mes-use-module (mescc as)) -(mes-use-module (mescc info)) -(include-from-path "mescc/armv4/as.scm") diff --git a/mes/module/mescc/armv4/info.mes b/mes/module/mescc/armv4/info.mes deleted file mode 100644 index d68f7af0..00000000 --- a/mes/module/mescc/armv4/info.mes +++ /dev/null @@ -1,23 +0,0 @@ -;;; -*-scheme-*- - -;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2018,2019 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 . - -(mes-use-module (mescc info)) -(mes-use-module (mescc armv4 as)) -(include-from-path "mescc/armv4/info.scm") diff --git a/mes/module/mescc/as.mes b/mes/module/mescc/as.mes deleted file mode 100644 index 02a56e7a..00000000 --- a/mes/module/mescc/as.mes +++ /dev/null @@ -1,23 +0,0 @@ -;;; -*-scheme-*- - -;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2016,2017 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 . - -(mes-use-module (srfi srfi-1)) -(mes-use-module (mescc bytevectors)) -(include-from-path "mescc/as.scm") diff --git a/mes/module/mescc/bytevectors.mes b/mes/module/mescc/bytevectors.mes deleted file mode 100644 index ccd0d9a3..00000000 --- a/mes/module/mescc/bytevectors.mes +++ /dev/null @@ -1,21 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(include-from-path "mescc/bytevectors.scm") diff --git a/mes/module/mescc/compile.mes b/mes/module/mescc/compile.mes deleted file mode 100644 index b28a64c4..00000000 --- a/mes/module/mescc/compile.mes +++ /dev/null @@ -1,33 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (srfi srfi-1)) -(mes-use-module (srfi srfi-13)) -(mes-use-module (srfi srfi-26)) -(mes-use-module (mes pmatch)) -(mes-use-module (mes optargs)) -(mes-use-module (mes misc)) -(mes-use-module (nyacc lang c99 pprint)) - -(mes-use-module (mescc as)) -(mes-use-module (mescc i386 as)) -(mes-use-module (mescc info)) -(mes-use-module (mescc M1)) -(include-from-path "mescc/compile.scm") diff --git a/mes/module/mescc/i386/as.mes b/mes/module/mescc/i386/as.mes deleted file mode 100644 index c65bbcb4..00000000 --- a/mes/module/mescc/i386/as.mes +++ /dev/null @@ -1,23 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (mescc as)) -(mes-use-module (mescc info)) -(include-from-path "mescc/i386/as.scm") diff --git a/mes/module/mescc/i386/info.mes b/mes/module/mescc/i386/info.mes deleted file mode 100644 index 47a502dc..00000000 --- a/mes/module/mescc/i386/info.mes +++ /dev/null @@ -1,23 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (mescc info)) -(mes-use-module (mescc i386 as)) -(include-from-path "mescc/i386/info.scm") diff --git a/mes/module/mescc/info.mes b/mes/module/mescc/info.mes deleted file mode 100644 index d9bbf860..00000000 --- a/mes/module/mescc/info.mes +++ /dev/null @@ -1,28 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -;;; Commentary: - -;;; Code: - -(mes-use-module (srfi srfi-9)) -(mes-use-module (srfi srfi-9 gnu)) -(mes-use-module (mes optargs)) -(include-from-path "mescc/info.scm") diff --git a/mes/module/mescc/mescc.mes b/mes/module/mescc/mescc.mes deleted file mode 100644 index 7303e0e1..00000000 --- a/mes/module/mescc/mescc.mes +++ /dev/null @@ -1,34 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (srfi srfi-1)) -(mes-use-module (srfi srfi-13)) -(mes-use-module (srfi srfi-26)) -(mes-use-module (mes misc)) -(mes-use-module (mes getopt-long)) -(mes-use-module (mes guile)) - -(mes-use-module (mescc armv4 info)) -(mes-use-module (mescc i386 info)) -(mes-use-module (mescc x86_64 info)) -(mes-use-module (mescc preprocess)) -(mes-use-module (mescc compile)) -(mes-use-module (mescc M1)) -(include-from-path "mescc/mescc.scm") diff --git a/mes/module/mescc/preprocess.mes b/mes/module/mescc/preprocess.mes deleted file mode 100644 index 022a372c..00000000 --- a/mes/module/mescc/preprocess.mes +++ /dev/null @@ -1,28 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (mes optargs)) -(mes-use-module (mes pmatch)) -(mes-use-module (srfi srfi-1)) -(mes-use-module (srfi srfi-13)) -(mes-use-module (srfi srfi-26)) -(mes-use-module (nyacc lang c99 parser)) -(mes-use-module (nyacc version)) -(include-from-path "mescc/preprocess.scm") diff --git a/mes/module/mescc/x86_64/as.mes b/mes/module/mescc/x86_64/as.mes deleted file mode 100644 index f18591a3..00000000 --- a/mes/module/mescc/x86_64/as.mes +++ /dev/null @@ -1,24 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (mescc as)) -(mes-use-module (mescc info)) -(mes-use-module (mescc x86_64 info)) -(include-from-path "mescc/x86_64/as.scm") diff --git a/mes/module/mescc/x86_64/info.mes b/mes/module/mescc/x86_64/info.mes deleted file mode 100644 index d86ea013..00000000 --- a/mes/module/mescc/x86_64/info.mes +++ /dev/null @@ -1,23 +0,0 @@ -;;; -*-scheme-*- - -;;; 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 . - -(mes-use-module (mescc info)) -(mes-use-module (mescc x86_64 as)) -(include-from-path "mescc/x86_64/info.scm") diff --git a/module/mescc.scm b/module/mescc.scm index f76e0806..b7fa510b 100644 --- a/module/mescc.scm +++ b/module/mescc.scm @@ -1,5 +1,5 @@ ;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Mes. ;;; @@ -19,23 +19,10 @@ (define-module (mescc) #:use-module (srfi srfi-1) #:use-module (ice-9 getopt-long) - #:use-module (mes guile) #:use-module (mes misc) #:use-module (mescc mescc) #:export (mescc:main)) -(cond-expand - (mes - (define (set-port-encoding! port encoding) #t) - (mes-use-module (mes guile)) - (mes-use-module (mes misc)) - (mes-use-module (mes getopt-long)) - (mes-use-module (mes display)) - (mes-use-module (mescc mescc)) - ) - (guile - (define-macro (mes-use-module . rest) #t))) - (define %host-arch (or (getenv "%arch") %arch)) (define %host-kernel (or (getenv "%kernel") "linux")) ;; FIXME (define %prefix (or (getenv "%prefix") "mes")) @@ -191,5 +178,3 @@ General help using GNU software: (compile? (mescc:compile options)) (assemble? (mescc:assemble options)) (else (mescc:link options))))) - -(define main mescc:main) diff --git a/scripts/mescc.in b/scripts/mescc.in index e5b08d63..7057aa81 100644 --- a/scripts/mescc.in +++ b/scripts/mescc.in @@ -63,7 +63,6 @@ fi ${SCHEME-$MES} \ --no-auto-compile\ - -e main\ -L @guile_site_dir@\ -C @guile_site_ccache_dir@\ $bindir/mescc.scm\ diff --git a/scripts/mescc.scm.in b/scripts/mescc.scm.in index 0fa613a5..48dc75bc 100644 --- a/scripts/mescc.scm.in +++ b/scripts/mescc.scm.in @@ -1,5 +1,5 @@ #! @GUILE@ \ ---no-auto-compile -e main -L @guile_site_dir@ -C @guile_site_ccache_dir@ -s +--no-auto-compile -L @guile_site_dir@ -C @guile_site_ccache_dir@ -s !# ;;; GNU Mes --- Maxwell Equations of Software ;;; Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen @@ -61,12 +61,6 @@ (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)))) +(use-modules (mescc)) -(define (main args) - (mescc:main args)) +(mescc:main (command-line))