From 14ab9372ab579a819f465c5a7a4d5c26afc35aae Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Sun, 24 May 2020 11:40:43 +0200 Subject: [PATCH] Update bin scripts No longer needed. Also uses zxbc as main executable. Zxb will still exits but marked for deprecation. --- bin/zxb | 12 ------------ bin/zxbasm | 18 ------------------ bin/zxbc | 10 ---------- bin/zxbpp | 19 ------------------- tests/functional/test.py | 2 +- zxb.py | 1 + 6 files changed, 2 insertions(+), 60 deletions(-) delete mode 100755 bin/zxb delete mode 100755 bin/zxbasm delete mode 100755 bin/zxbc delete mode 100755 bin/zxbpp diff --git a/bin/zxb b/bin/zxb deleted file mode 100755 index 54611943b..000000000 --- a/bin/zxb +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# vim: ts=4:sw=4:et: - -import sys - -import zxb - - -if __name__ == '__main__': - print('-' * 48 + '\n* WARNING: zxb is deprecated! Use zxbc instead *\n' + '-' * 48, file=sys.stderr) - sys.exit(zxb.main()) # Exit diff --git a/bin/zxbasm b/bin/zxbasm deleted file mode 100755 index 7a33008d9..000000000 --- a/bin/zxbasm +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# vim: ts=4:et:sw=4 - -# ---------------------------------------------------------------------- -# Copyleft (K), Jose M. Rodriguez-Rosa (a.k.a. Boriel) -# -# This program is Free Software and is released under the terms of -# the GNU General License -# -# This is the Parser for the ZXBASM (ZXBasic Assembler) -# ---------------------------------------------------------------------- - -import sys -import zxbasm - -if __name__ == '__main__': - sys.exit(zxbasm.main()) diff --git a/bin/zxbc b/bin/zxbc deleted file mode 100755 index e5fe559a2..000000000 --- a/bin/zxbc +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# vim: ts=4:sw=4:et: - -import sys - -import zxb - -if __name__ == '__main__': - sys.exit(zxb.main()) # Exit diff --git a/bin/zxbpp b/bin/zxbpp deleted file mode 100755 index a4bfcea79..000000000 --- a/bin/zxbpp +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# vim: ts=4:sw=4:et: - -# ---------------------------------------------------------------------- -# Copyleft (K), Jose M. Rodriguez-Rosa (a.k.a. Boriel) -# -# This program is Free Software and is released under the terms of -# the GNU General License -# -# This is the Parser for the ZXBpp (ZXBasic Preprocessor) -# ---------------------------------------------------------------------- - -import sys -import zxbpp - - -if __name__ == '__main__': - sys.exit(zxbpp.entry_point()) diff --git a/tests/functional/test.py b/tests/functional/test.py index 86962bace..59c3e93b2 100755 --- a/tests/functional/test.py +++ b/tests/functional/test.py @@ -22,7 +22,7 @@ FAILED = 0 CURR_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__))) ZXBASIC_ROOT = os.path.abspath(os.path.join(CURR_DIR, os.path.pardir, os.path.pardir)) -ZXB = os.path.join(ZXBASIC_ROOT, 'zxb.py') +ZXB = os.path.join(ZXBASIC_ROOT, 'zxbc.py') ZXBASM = os.path.join(ZXBASIC_ROOT, 'zxbasm.py') ZXBPP = os.path.join(ZXBASIC_ROOT, 'zxbpp.py') diff --git a/zxb.py b/zxb.py index e5fe559a2..31421532d 100755 --- a/zxb.py +++ b/zxb.py @@ -7,4 +7,5 @@ import zxb if __name__ == '__main__': + print('-' * 48 + '\n* WARNING: zxb is deprecated! Use zxbc instead *\n' + '-' * 48, file=sys.stderr) sys.exit(zxb.main()) # Exit