Merge pull request #316 from boriel/bugfix/update_setup_script

Update setup script

Author: boriel

bin/zxb

@@ -0,0 +1,12 @@
+#!/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

bin/zxbasm

@@ -0,0 +1,18 @@
+#!/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())

bin/zxbc

@@ -0,0 +1,10 @@
+#!/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

bin/zxbpp

@@ -0,0 +1,19 @@
+#!/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())

setup.py

@@ -25,7 +25,12 @@ def get_files(folders):
 
 setup(
     name='zxbasic',
-    scripts=['zxb.py', 'zxbasm.py', 'zxbpp.py'],
+    scripts=[
+        'bin/zxbc',
+        'bin/zxb',  # deprecated
+        'bin/zxbasm',
+        'bin/zxbpp'
+    ],
     py_modules=['asm', 'asmlex', 'asmparse', 'keywords', 'optimizer', 'version', 'identityset',
                 'parsetab', 'zxbpptab', 'zxbasmtab', 'basic',
                 'z80', 'zxblex', 'zxbparser', 'zxbpplex', 'zxbasmpplex'],
@@ -42,13 +47,6 @@ def get_files(folders):
     keywords=['compiler', 'zxspectrum', 'BASIC', 'z80'],  # arbitrary keywords
     data_files=data_files,
     license='GPL3',
-    entry_points={
-        'console_scripts': [
-            'zxb = zxb:main',
-            'zxbasm = zxbasm:main',
-            'zxbpp = zxbpp:entry_point'
-        ],
-    },
     classifiers=[
         # How mature is this project? Common values are
         #   3 - Alpha
@@ -68,6 +66,5 @@ def get_files(folders):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
-    install_requires=['ply'],
     tags=['BASIC', 'zxspectrum', 'compiler', 'z80']
 )

zxbc.py

@@ -0,0 +1,10 @@
+#!/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