Skip to content

Commit 309a9d4

Browse files
committed
Update setup script
Also deprecates zxb in favour if zxbc. Fixes Issue #313
1 parent 3d275f9 commit 309a9d4

6 files changed

Lines changed: 75 additions & 9 deletions

File tree

bin/zxb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
# vim: ts=4:sw=4:et:
4+
5+
import sys
6+
7+
import zxb
8+
9+
10+
if __name__ == '__main__':
11+
print('-' * 48 + '\n* WARNING: zxb is deprecated! Use zxbc instead *\n' + '-' * 48, file=sys.stderr)
12+
sys.exit(zxb.main()) # Exit

bin/zxbasm

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
# vim: ts=4:et:sw=4
4+
5+
# ----------------------------------------------------------------------
6+
# Copyleft (K), Jose M. Rodriguez-Rosa (a.k.a. Boriel)
7+
#
8+
# This program is Free Software and is released under the terms of
9+
# the GNU General License
10+
#
11+
# This is the Parser for the ZXBASM (ZXBasic Assembler)
12+
# ----------------------------------------------------------------------
13+
14+
import sys
15+
import zxbasm
16+
17+
if __name__ == '__main__':
18+
sys.exit(zxbasm.main())

bin/zxbc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
# vim: ts=4:sw=4:et:
4+
5+
import sys
6+
7+
import zxb
8+
9+
if __name__ == '__main__':
10+
sys.exit(zxb.main()) # Exit

bin/zxbpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
# vim: ts=4:sw=4:et:
4+
5+
# ----------------------------------------------------------------------
6+
# Copyleft (K), Jose M. Rodriguez-Rosa (a.k.a. Boriel)
7+
#
8+
# This program is Free Software and is released under the terms of
9+
# the GNU General License
10+
#
11+
# This is the Parser for the ZXBpp (ZXBasic Preprocessor)
12+
# ----------------------------------------------------------------------
13+
14+
import sys
15+
import zxbpp
16+
17+
18+
if __name__ == '__main__':
19+
sys.exit(zxbpp.entry_point())

setup.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ def get_files(folders):
2525

2626
setup(
2727
name='zxbasic',
28-
scripts=['zxb.py', 'zxbasm.py', 'zxbpp.py'],
28+
scripts=[
29+
'bin/zxbc',
30+
'bin/zxb', # deprecated
31+
'bin/zxbasm',
32+
'bin/zxbpp'
33+
],
2934
py_modules=['asm', 'asmlex', 'asmparse', 'keywords', 'optimizer', 'version', 'identityset',
3035
'parsetab', 'zxbpptab', 'zxbasmtab', 'basic',
3136
'z80', 'zxblex', 'zxbparser', 'zxbpplex', 'zxbasmpplex'],
@@ -42,13 +47,6 @@ def get_files(folders):
4247
keywords=['compiler', 'zxspectrum', 'BASIC', 'z80'], # arbitrary keywords
4348
data_files=data_files,
4449
license='GPL3',
45-
entry_points={
46-
'console_scripts': [
47-
'zxb = zxb:main',
48-
'zxbasm = zxbasm:main',
49-
'zxbpp = zxbpp:entry_point'
50-
],
51-
},
5250
classifiers=[
5351
# How mature is this project? Common values are
5452
# 3 - Alpha
@@ -68,6 +66,5 @@ def get_files(folders):
6866
'Programming Language :: Python :: 3.5',
6967
'Programming Language :: Python :: 3.6',
7068
],
71-
install_requires=['ply'],
7269
tags=['BASIC', 'zxspectrum', 'compiler', 'z80']
7370
)

zxbc.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
# vim: ts=4:sw=4:et:
4+
5+
import sys
6+
7+
import zxb
8+
9+
if __name__ == '__main__':
10+
sys.exit(zxb.main()) # Exit

0 commit comments

Comments
 (0)