diff --git a/.gitmodules b/.gitmodules index b2fe87096d..ec860c8149 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ansipipe"] - path = ansipipe + path = pcbasic/ansipipe url = git://github.com/robhagemans/ansipipe.git diff --git a/docsrc/makeusage.py b/docsrc/makeusage.py index aa45465a29..3c5275b352 100755 --- a/docsrc/makeusage.py +++ b/docsrc/makeusage.py @@ -61,7 +61,7 @@ def parse_element(e, blocklist): def makeusage(): usage_html = open(basepath + '/options.html', mode='r').read() # output usage - with open(basepath + '/../USAGE.txt', 'w') as textfile: + with open(basepath + '/../pcbasic/USAGE.txt', 'w') as textfile: textfile.write(html_to_text(usage_html)) if __name__ == '__main__': diff --git a/pcbasic/__init__.py b/pcbasic/__init__.py new file mode 100644 index 0000000000..9a0e743b47 --- /dev/null +++ b/pcbasic/__init__.py @@ -0,0 +1,6 @@ +""" +PC-BASIC - GW-BASIC/BASICA/Cartridge BASIC compatible interpreter + +(c) 2013, 2014, 2015, 2016 Rob Hagemans +This file is released under the GNU GPL version 3 or later. +""" diff --git a/pcbasic.py b/pcbasic/__main__.py similarity index 98% rename from pcbasic.py rename to pcbasic/__main__.py index 04291934e6..17c91b93b4 100755 --- a/pcbasic.py +++ b/pcbasic/__main__.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python2 - """ PC-BASIC - GW-BASIC/BASICA/Cartridge BASIC compatible interpreter @@ -23,10 +21,10 @@ # NOTE that this affects str.upper() etc. locale.setlocale(locale.LC_ALL, '') -import ansipipe -import basic -import interface -from interface import config +from . import ansipipe +from . import basic +from . import interface +from . import config def main(): diff --git a/ansipipe b/pcbasic/ansipipe similarity index 100% rename from ansipipe rename to pcbasic/ansipipe diff --git a/basic/__init__.py b/pcbasic/basic/__init__.py similarity index 100% rename from basic/__init__.py rename to pcbasic/basic/__init__.py diff --git a/basic/basictoken.py b/pcbasic/basic/basictoken.py similarity index 100% rename from basic/basictoken.py rename to pcbasic/basic/basictoken.py diff --git a/basic/bytestream.py b/pcbasic/basic/bytestream.py similarity index 100% rename from basic/bytestream.py rename to pcbasic/basic/bytestream.py diff --git a/basic/cassette.py b/pcbasic/basic/cassette.py similarity index 100% rename from basic/cassette.py rename to pcbasic/basic/cassette.py diff --git a/basic/codepage/1258.ucp b/pcbasic/basic/codepage/1258.ucp similarity index 100% rename from basic/codepage/1258.ucp rename to pcbasic/basic/codepage/1258.ucp diff --git a/basic/codepage/437.ucp b/pcbasic/basic/codepage/437.ucp similarity index 100% rename from basic/codepage/437.ucp rename to pcbasic/basic/codepage/437.ucp diff --git a/basic/codepage/720.ucp b/pcbasic/basic/codepage/720.ucp similarity index 100% rename from basic/codepage/720.ucp rename to pcbasic/basic/codepage/720.ucp diff --git a/basic/codepage/737.ucp b/pcbasic/basic/codepage/737.ucp similarity index 100% rename from basic/codepage/737.ucp rename to pcbasic/basic/codepage/737.ucp diff --git a/basic/codepage/775.ucp b/pcbasic/basic/codepage/775.ucp similarity index 100% rename from basic/codepage/775.ucp rename to pcbasic/basic/codepage/775.ucp diff --git a/basic/codepage/806.ucp b/pcbasic/basic/codepage/806.ucp similarity index 100% rename from basic/codepage/806.ucp rename to pcbasic/basic/codepage/806.ucp diff --git a/basic/codepage/850.ucp b/pcbasic/basic/codepage/850.ucp similarity index 100% rename from basic/codepage/850.ucp rename to pcbasic/basic/codepage/850.ucp diff --git a/basic/codepage/851.ucp b/pcbasic/basic/codepage/851.ucp similarity index 100% rename from basic/codepage/851.ucp rename to pcbasic/basic/codepage/851.ucp diff --git a/basic/codepage/852.ucp b/pcbasic/basic/codepage/852.ucp similarity index 100% rename from basic/codepage/852.ucp rename to pcbasic/basic/codepage/852.ucp diff --git a/basic/codepage/853.ucp b/pcbasic/basic/codepage/853.ucp similarity index 100% rename from basic/codepage/853.ucp rename to pcbasic/basic/codepage/853.ucp diff --git a/basic/codepage/855.ucp b/pcbasic/basic/codepage/855.ucp similarity index 100% rename from basic/codepage/855.ucp rename to pcbasic/basic/codepage/855.ucp diff --git a/basic/codepage/856.ucp b/pcbasic/basic/codepage/856.ucp similarity index 100% rename from basic/codepage/856.ucp rename to pcbasic/basic/codepage/856.ucp diff --git a/basic/codepage/857.ucp b/pcbasic/basic/codepage/857.ucp similarity index 100% rename from basic/codepage/857.ucp rename to pcbasic/basic/codepage/857.ucp diff --git a/basic/codepage/858.ucp b/pcbasic/basic/codepage/858.ucp similarity index 100% rename from basic/codepage/858.ucp rename to pcbasic/basic/codepage/858.ucp diff --git a/basic/codepage/860.ucp b/pcbasic/basic/codepage/860.ucp similarity index 100% rename from basic/codepage/860.ucp rename to pcbasic/basic/codepage/860.ucp diff --git a/basic/codepage/861.ucp b/pcbasic/basic/codepage/861.ucp similarity index 100% rename from basic/codepage/861.ucp rename to pcbasic/basic/codepage/861.ucp diff --git a/basic/codepage/862.ucp b/pcbasic/basic/codepage/862.ucp similarity index 100% rename from basic/codepage/862.ucp rename to pcbasic/basic/codepage/862.ucp diff --git a/basic/codepage/863.ucp b/pcbasic/basic/codepage/863.ucp similarity index 100% rename from basic/codepage/863.ucp rename to pcbasic/basic/codepage/863.ucp diff --git a/basic/codepage/864.ucp b/pcbasic/basic/codepage/864.ucp similarity index 100% rename from basic/codepage/864.ucp rename to pcbasic/basic/codepage/864.ucp diff --git a/basic/codepage/865.ucp b/pcbasic/basic/codepage/865.ucp similarity index 100% rename from basic/codepage/865.ucp rename to pcbasic/basic/codepage/865.ucp diff --git a/basic/codepage/866.ucp b/pcbasic/basic/codepage/866.ucp similarity index 100% rename from basic/codepage/866.ucp rename to pcbasic/basic/codepage/866.ucp diff --git a/basic/codepage/868.ucp b/pcbasic/basic/codepage/868.ucp similarity index 100% rename from basic/codepage/868.ucp rename to pcbasic/basic/codepage/868.ucp diff --git a/basic/codepage/869.ucp b/pcbasic/basic/codepage/869.ucp similarity index 100% rename from basic/codepage/869.ucp rename to pcbasic/basic/codepage/869.ucp diff --git a/basic/codepage/874.ucp b/pcbasic/basic/codepage/874.ucp similarity index 100% rename from basic/codepage/874.ucp rename to pcbasic/basic/codepage/874.ucp diff --git a/basic/codepage/932.ucp b/pcbasic/basic/codepage/932.ucp similarity index 100% rename from basic/codepage/932.ucp rename to pcbasic/basic/codepage/932.ucp diff --git a/basic/codepage/934.ucp b/pcbasic/basic/codepage/934.ucp similarity index 100% rename from basic/codepage/934.ucp rename to pcbasic/basic/codepage/934.ucp diff --git a/basic/codepage/936.ucp b/pcbasic/basic/codepage/936.ucp similarity index 100% rename from basic/codepage/936.ucp rename to pcbasic/basic/codepage/936.ucp diff --git a/basic/codepage/938.ucp b/pcbasic/basic/codepage/938.ucp similarity index 100% rename from basic/codepage/938.ucp rename to pcbasic/basic/codepage/938.ucp diff --git a/basic/codepage/949.ucp b/pcbasic/basic/codepage/949.ucp similarity index 100% rename from basic/codepage/949.ucp rename to pcbasic/basic/codepage/949.ucp diff --git a/basic/codepage/950.ucp b/pcbasic/basic/codepage/950.ucp similarity index 100% rename from basic/codepage/950.ucp rename to pcbasic/basic/codepage/950.ucp diff --git a/basic/codepage/__init__.py b/pcbasic/basic/codepage/__init__.py similarity index 100% rename from basic/codepage/__init__.py rename to pcbasic/basic/codepage/__init__.py diff --git a/basic/codepage/alternativnyj.ucp b/pcbasic/basic/codepage/alternativnyj.ucp similarity index 100% rename from basic/codepage/alternativnyj.ucp rename to pcbasic/basic/codepage/alternativnyj.ucp diff --git a/basic/codepage/armscii8a.ucp b/pcbasic/basic/codepage/armscii8a.ucp similarity index 100% rename from basic/codepage/armscii8a.ucp rename to pcbasic/basic/codepage/armscii8a.ucp diff --git a/basic/codepage/big5-2003.ucp b/pcbasic/basic/codepage/big5-2003.ucp similarity index 100% rename from basic/codepage/big5-2003.ucp rename to pcbasic/basic/codepage/big5-2003.ucp diff --git a/basic/codepage/big5-hkscs.ucp b/pcbasic/basic/codepage/big5-hkscs.ucp similarity index 100% rename from basic/codepage/big5-hkscs.ucp rename to pcbasic/basic/codepage/big5-hkscs.ucp diff --git a/basic/codepage/georgian-academy.ucp b/pcbasic/basic/codepage/georgian-academy.ucp similarity index 100% rename from basic/codepage/georgian-academy.ucp rename to pcbasic/basic/codepage/georgian-academy.ucp diff --git a/basic/codepage/georgian-ps.ucp b/pcbasic/basic/codepage/georgian-ps.ucp similarity index 100% rename from basic/codepage/georgian-ps.ucp rename to pcbasic/basic/codepage/georgian-ps.ucp diff --git a/basic/codepage/iransystem.ucp b/pcbasic/basic/codepage/iransystem.ucp similarity index 100% rename from basic/codepage/iransystem.ucp rename to pcbasic/basic/codepage/iransystem.ucp diff --git a/basic/codepage/iscii-as.ucp b/pcbasic/basic/codepage/iscii-as.ucp similarity index 100% rename from basic/codepage/iscii-as.ucp rename to pcbasic/basic/codepage/iscii-as.ucp diff --git a/basic/codepage/iscii-be.ucp b/pcbasic/basic/codepage/iscii-be.ucp similarity index 100% rename from basic/codepage/iscii-be.ucp rename to pcbasic/basic/codepage/iscii-be.ucp diff --git a/basic/codepage/iscii-de.ucp b/pcbasic/basic/codepage/iscii-de.ucp similarity index 100% rename from basic/codepage/iscii-de.ucp rename to pcbasic/basic/codepage/iscii-de.ucp diff --git a/basic/codepage/iscii-gu.ucp b/pcbasic/basic/codepage/iscii-gu.ucp similarity index 100% rename from basic/codepage/iscii-gu.ucp rename to pcbasic/basic/codepage/iscii-gu.ucp diff --git a/basic/codepage/iscii-ka.ucp b/pcbasic/basic/codepage/iscii-ka.ucp similarity index 100% rename from basic/codepage/iscii-ka.ucp rename to pcbasic/basic/codepage/iscii-ka.ucp diff --git a/basic/codepage/iscii-ma.ucp b/pcbasic/basic/codepage/iscii-ma.ucp similarity index 100% rename from basic/codepage/iscii-ma.ucp rename to pcbasic/basic/codepage/iscii-ma.ucp diff --git a/basic/codepage/iscii-or.ucp b/pcbasic/basic/codepage/iscii-or.ucp similarity index 100% rename from basic/codepage/iscii-or.ucp rename to pcbasic/basic/codepage/iscii-or.ucp diff --git a/basic/codepage/iscii-pa.ucp b/pcbasic/basic/codepage/iscii-pa.ucp similarity index 100% rename from basic/codepage/iscii-pa.ucp rename to pcbasic/basic/codepage/iscii-pa.ucp diff --git a/basic/codepage/iscii-ta.ucp b/pcbasic/basic/codepage/iscii-ta.ucp similarity index 100% rename from basic/codepage/iscii-ta.ucp rename to pcbasic/basic/codepage/iscii-ta.ucp diff --git a/basic/codepage/iscii-te.ucp b/pcbasic/basic/codepage/iscii-te.ucp similarity index 100% rename from basic/codepage/iscii-te.ucp rename to pcbasic/basic/codepage/iscii-te.ucp diff --git a/basic/codepage/kamenicky.ucp b/pcbasic/basic/codepage/kamenicky.ucp similarity index 100% rename from basic/codepage/kamenicky.ucp rename to pcbasic/basic/codepage/kamenicky.ucp diff --git a/basic/codepage/koi8-r.ucp b/pcbasic/basic/codepage/koi8-r.ucp similarity index 100% rename from basic/codepage/koi8-r.ucp rename to pcbasic/basic/codepage/koi8-r.ucp diff --git a/basic/codepage/koi8-ru.ucp b/pcbasic/basic/codepage/koi8-ru.ucp similarity index 100% rename from basic/codepage/koi8-ru.ucp rename to pcbasic/basic/codepage/koi8-ru.ucp diff --git a/basic/codepage/koi8-u.ucp b/pcbasic/basic/codepage/koi8-u.ucp similarity index 100% rename from basic/codepage/koi8-u.ucp rename to pcbasic/basic/codepage/koi8-u.ucp diff --git a/basic/codepage/mazovia.ucp b/pcbasic/basic/codepage/mazovia.ucp similarity index 100% rename from basic/codepage/mazovia.ucp rename to pcbasic/basic/codepage/mazovia.ucp diff --git a/basic/codepage/mik.ucp b/pcbasic/basic/codepage/mik.ucp similarity index 100% rename from basic/codepage/mik.ucp rename to pcbasic/basic/codepage/mik.ucp diff --git a/basic/codepage/osnovnoj.ucp b/pcbasic/basic/codepage/osnovnoj.ucp similarity index 100% rename from basic/codepage/osnovnoj.ucp rename to pcbasic/basic/codepage/osnovnoj.ucp diff --git a/basic/codepage/pascii.ucp b/pcbasic/basic/codepage/pascii.ucp similarity index 100% rename from basic/codepage/pascii.ucp rename to pcbasic/basic/codepage/pascii.ucp diff --git a/basic/codepage/ruscii.ucp b/pcbasic/basic/codepage/ruscii.ucp similarity index 100% rename from basic/codepage/ruscii.ucp rename to pcbasic/basic/codepage/ruscii.ucp diff --git a/basic/codepage/russup3.ucp b/pcbasic/basic/codepage/russup3.ucp similarity index 100% rename from basic/codepage/russup3.ucp rename to pcbasic/basic/codepage/russup3.ucp diff --git a/basic/codepage/russup4ac.ucp b/pcbasic/basic/codepage/russup4ac.ucp similarity index 100% rename from basic/codepage/russup4ac.ucp rename to pcbasic/basic/codepage/russup4ac.ucp diff --git a/basic/codepage/russup4na.ucp b/pcbasic/basic/codepage/russup4na.ucp similarity index 100% rename from basic/codepage/russup4na.ucp rename to pcbasic/basic/codepage/russup4na.ucp diff --git a/basic/codepage/viscii.ucp b/pcbasic/basic/codepage/viscii.ucp similarity index 100% rename from basic/codepage/viscii.ucp rename to pcbasic/basic/codepage/viscii.ucp diff --git a/basic/console.py b/pcbasic/basic/console.py similarity index 100% rename from basic/console.py rename to pcbasic/basic/console.py diff --git a/basic/debug.py b/pcbasic/basic/debug.py similarity index 100% rename from basic/debug.py rename to pcbasic/basic/debug.py diff --git a/basic/devices.py b/pcbasic/basic/devices.py similarity index 100% rename from basic/devices.py rename to pcbasic/basic/devices.py diff --git a/basic/disk.py b/pcbasic/basic/disk.py similarity index 100% rename from basic/disk.py rename to pcbasic/basic/disk.py diff --git a/basic/display.py b/pcbasic/basic/display.py similarity index 100% rename from basic/display.py rename to pcbasic/basic/display.py diff --git a/basic/draw_and_play.py b/pcbasic/basic/draw_and_play.py similarity index 100% rename from basic/draw_and_play.py rename to pcbasic/basic/draw_and_play.py diff --git a/basic/eascii.py b/pcbasic/basic/eascii.py similarity index 100% rename from basic/eascii.py rename to pcbasic/basic/eascii.py diff --git a/basic/error.py b/pcbasic/basic/error.py similarity index 100% rename from basic/error.py rename to pcbasic/basic/error.py diff --git a/basic/events.py b/pcbasic/basic/events.py similarity index 100% rename from basic/events.py rename to pcbasic/basic/events.py diff --git a/basic/files.py b/pcbasic/basic/files.py similarity index 100% rename from basic/files.py rename to pcbasic/basic/files.py diff --git a/basic/font/GPL2.txt b/pcbasic/basic/font/GPL2.txt similarity index 100% rename from basic/font/GPL2.txt rename to pcbasic/basic/font/GPL2.txt diff --git a/basic/font/LICENSE.md b/pcbasic/basic/font/LICENSE.md similarity index 100% rename from basic/font/LICENSE.md rename to pcbasic/basic/font/LICENSE.md diff --git a/basic/font/__init__.py b/pcbasic/basic/font/__init__.py similarity index 100% rename from basic/font/__init__.py rename to pcbasic/basic/font/__init__.py diff --git a/basic/font/cga_08.hex b/pcbasic/basic/font/cga_08.hex similarity index 100% rename from basic/font/cga_08.hex rename to pcbasic/basic/font/cga_08.hex diff --git a/basic/font/cgathin_08.hex b/pcbasic/basic/font/cgathin_08.hex similarity index 100% rename from basic/font/cgathin_08.hex rename to pcbasic/basic/font/cgathin_08.hex diff --git a/basic/font/freedos_08.hex b/pcbasic/basic/font/freedos_08.hex similarity index 100% rename from basic/font/freedos_08.hex rename to pcbasic/basic/font/freedos_08.hex diff --git a/basic/font/freedos_14.hex b/pcbasic/basic/font/freedos_14.hex similarity index 100% rename from basic/font/freedos_14.hex rename to pcbasic/basic/font/freedos_14.hex diff --git a/basic/font/freedos_16.hex b/pcbasic/basic/font/freedos_16.hex similarity index 100% rename from basic/font/freedos_16.hex rename to pcbasic/basic/font/freedos_16.hex diff --git a/basic/font/mda_14.hex b/pcbasic/basic/font/mda_14.hex similarity index 100% rename from basic/font/mda_14.hex rename to pcbasic/basic/font/mda_14.hex diff --git a/basic/font/olivetti_16.hex b/pcbasic/basic/font/olivetti_16.hex similarity index 100% rename from basic/font/olivetti_16.hex rename to pcbasic/basic/font/olivetti_16.hex diff --git a/basic/font/tandy1_08.hex b/pcbasic/basic/font/tandy1_08.hex similarity index 100% rename from basic/font/tandy1_08.hex rename to pcbasic/basic/font/tandy1_08.hex diff --git a/basic/font/tandy2_08.hex b/pcbasic/basic/font/tandy2_08.hex similarity index 100% rename from basic/font/tandy2_08.hex rename to pcbasic/basic/font/tandy2_08.hex diff --git a/basic/font/unifont_16.hex b/pcbasic/basic/font/unifont_16.hex similarity index 100% rename from basic/font/unifont_16.hex rename to pcbasic/basic/font/unifont_16.hex diff --git a/basic/font/univga_16.hex b/pcbasic/basic/font/univga_16.hex similarity index 100% rename from basic/font/univga_16.hex rename to pcbasic/basic/font/univga_16.hex diff --git a/basic/font/vga_08.hex b/pcbasic/basic/font/vga_08.hex similarity index 100% rename from basic/font/vga_08.hex rename to pcbasic/basic/font/vga_08.hex diff --git a/basic/font/vga_14.hex b/pcbasic/basic/font/vga_14.hex similarity index 100% rename from basic/font/vga_14.hex rename to pcbasic/basic/font/vga_14.hex diff --git a/basic/font/vga_16.hex b/pcbasic/basic/font/vga_16.hex similarity index 100% rename from basic/font/vga_16.hex rename to pcbasic/basic/font/vga_16.hex diff --git a/basic/fp.py b/pcbasic/basic/fp.py similarity index 100% rename from basic/fp.py rename to pcbasic/basic/fp.py diff --git a/basic/functions.py b/pcbasic/basic/functions.py similarity index 100% rename from basic/functions.py rename to pcbasic/basic/functions.py diff --git a/basic/graphics.py b/pcbasic/basic/graphics.py similarity index 100% rename from basic/graphics.py rename to pcbasic/basic/graphics.py diff --git a/basic/inputs.py b/pcbasic/basic/inputs.py similarity index 100% rename from basic/inputs.py rename to pcbasic/basic/inputs.py diff --git a/basic/interpreter.py b/pcbasic/basic/interpreter.py similarity index 100% rename from basic/interpreter.py rename to pcbasic/basic/interpreter.py diff --git a/basic/machine.py b/pcbasic/basic/machine.py similarity index 100% rename from basic/machine.py rename to pcbasic/basic/machine.py diff --git a/basic/memory.py b/pcbasic/basic/memory.py similarity index 100% rename from basic/memory.py rename to pcbasic/basic/memory.py diff --git a/basic/modes.py b/pcbasic/basic/modes.py similarity index 100% rename from basic/modes.py rename to pcbasic/basic/modes.py diff --git a/basic/operators.py b/pcbasic/basic/operators.py similarity index 100% rename from basic/operators.py rename to pcbasic/basic/operators.py diff --git a/basic/parser.py b/pcbasic/basic/parser.py similarity index 100% rename from basic/parser.py rename to pcbasic/basic/parser.py diff --git a/basic/ports.py b/pcbasic/basic/ports.py similarity index 100% rename from basic/ports.py rename to pcbasic/basic/ports.py diff --git a/basic/print_and_input.py b/pcbasic/basic/print_and_input.py similarity index 100% rename from basic/print_and_input.py rename to pcbasic/basic/print_and_input.py diff --git a/basic/printer.py b/pcbasic/basic/printer.py similarity index 100% rename from basic/printer.py rename to pcbasic/basic/printer.py diff --git a/basic/program.py b/pcbasic/basic/program.py similarity index 100% rename from basic/program.py rename to pcbasic/basic/program.py diff --git a/basic/programs/BASCODER.BAS b/pcbasic/basic/programs/BASCODER.BAS similarity index 100% rename from basic/programs/BASCODER.BAS rename to pcbasic/basic/programs/BASCODER.BAS diff --git a/basic/programs/LICENSE.md b/pcbasic/basic/programs/LICENSE.md similarity index 100% rename from basic/programs/LICENSE.md rename to pcbasic/basic/programs/LICENSE.md diff --git a/basic/programs/PCTERM.BAS b/pcbasic/basic/programs/PCTERM.BAS similarity index 100% rename from basic/programs/PCTERM.BAS rename to pcbasic/basic/programs/PCTERM.BAS diff --git a/basic/protect.py b/pcbasic/basic/protect.py similarity index 100% rename from basic/protect.py rename to pcbasic/basic/protect.py diff --git a/basic/redirect.py b/pcbasic/basic/redirect.py similarity index 100% rename from basic/redirect.py rename to pcbasic/basic/redirect.py diff --git a/basic/representation.py b/pcbasic/basic/representation.py similarity index 100% rename from basic/representation.py rename to pcbasic/basic/representation.py diff --git a/basic/rnd.py b/pcbasic/basic/rnd.py similarity index 100% rename from basic/rnd.py rename to pcbasic/basic/rnd.py diff --git a/basic/scancode.py b/pcbasic/basic/scancode.py similarity index 100% rename from basic/scancode.py rename to pcbasic/basic/scancode.py diff --git a/basic/shell.py b/pcbasic/basic/shell.py similarity index 100% rename from basic/shell.py rename to pcbasic/basic/shell.py diff --git a/basic/signals.py b/pcbasic/basic/signals.py similarity index 100% rename from basic/signals.py rename to pcbasic/basic/signals.py diff --git a/basic/sound.py b/pcbasic/basic/sound.py similarity index 100% rename from basic/sound.py rename to pcbasic/basic/sound.py diff --git a/basic/state.py b/pcbasic/basic/state.py similarity index 100% rename from basic/state.py rename to pcbasic/basic/state.py diff --git a/basic/statements.py b/pcbasic/basic/statements.py similarity index 100% rename from basic/statements.py rename to pcbasic/basic/statements.py diff --git a/basic/timedate.py b/pcbasic/basic/timedate.py similarity index 100% rename from basic/timedate.py rename to pcbasic/basic/timedate.py diff --git a/basic/tokenise.py b/pcbasic/basic/tokenise.py similarity index 100% rename from basic/tokenise.py rename to pcbasic/basic/tokenise.py diff --git a/basic/typeface.py b/pcbasic/basic/typeface.py similarity index 100% rename from basic/typeface.py rename to pcbasic/basic/typeface.py diff --git a/basic/unicodepage.py b/pcbasic/basic/unicodepage.py similarity index 100% rename from basic/unicodepage.py rename to pcbasic/basic/unicodepage.py diff --git a/basic/util.py b/pcbasic/basic/util.py similarity index 100% rename from basic/util.py rename to pcbasic/basic/util.py diff --git a/basic/var.py b/pcbasic/basic/var.py similarity index 100% rename from basic/var.py rename to pcbasic/basic/var.py diff --git a/basic/vartypes.py b/pcbasic/basic/vartypes.py similarity index 100% rename from basic/vartypes.py rename to pcbasic/basic/vartypes.py diff --git a/interface/config.py b/pcbasic/config.py similarity index 99% rename from interface/config.py rename to pcbasic/config.py index 010f7fa2b1..f5453a254e 100644 --- a/interface/config.py +++ b/pcbasic/config.py @@ -21,7 +21,7 @@ import ctypes import ctypes.wintypes -from basic import __version__, codepages, fonts +from .basic import __version__, codepages, fonts # get basepath (__file__ is undefined in pyinstaller packages) if hasattr(sys, 'frozen'): @@ -46,7 +46,7 @@ def get_logger(logfile=None): def show_usage(): """Show usage description.""" - usage_file = os.path.join(basepath, '..', 'USAGE.txt') + usage_file = os.path.join(basepath, 'USAGE.txt') with open(usage_file) as f: for line in f: sys.stdout.write(line) diff --git a/interface/__init__.py b/pcbasic/interface/__init__.py similarity index 99% rename from interface/__init__.py rename to pcbasic/interface/__init__.py index 7f91e26ec8..24727b0a43 100644 --- a/interface/__init__.py +++ b/pcbasic/interface/__init__.py @@ -26,7 +26,7 @@ from .audio_sdl2 import AudioSDL2 # create the window icon -from basic import typeface +from ..basic import typeface icon_hex = '00003CE066606666666C6678666C3CE67F007F007F007F007F007F007F000000' icon = typeface.Font(16, {'icon': icon_hex.decode('hex')} ).build_glyph('icon', 16, 16, False, False) diff --git a/interface/ansi.py b/pcbasic/interface/ansi.py similarity index 100% rename from interface/ansi.py rename to pcbasic/interface/ansi.py diff --git a/interface/audio_beep.py b/pcbasic/interface/audio_beep.py similarity index 99% rename from interface/audio_beep.py rename to pcbasic/interface/audio_beep.py index 0a6470c2e8..a4e7c51273 100644 --- a/interface/audio_beep.py +++ b/pcbasic/interface/audio_beep.py @@ -10,7 +10,7 @@ import subprocess import platform -from basic import signals +from ..basic import signals from . import base as audio diff --git a/interface/audio_none.py b/pcbasic/interface/audio_none.py similarity index 98% rename from interface/audio_none.py rename to pcbasic/interface/audio_none.py index 423576669f..bca29ff99d 100644 --- a/interface/audio_none.py +++ b/pcbasic/interface/audio_none.py @@ -9,7 +9,7 @@ import datetime import Queue -from basic import signals +from ..basic import signals from . import base as audio diff --git a/interface/audio_pygame.py b/pcbasic/interface/audio_pygame.py similarity index 99% rename from interface/audio_pygame.py rename to pcbasic/interface/audio_pygame.py index 42f4a30b0f..39d08f6700 100644 --- a/interface/audio_pygame.py +++ b/pcbasic/interface/audio_pygame.py @@ -25,7 +25,7 @@ import logging import Queue -from basic import signals +from ..basic import signals from . import base as audio tick_ms = 24 diff --git a/interface/audio_sdl2.py b/pcbasic/interface/audio_sdl2.py similarity index 99% rename from interface/audio_sdl2.py rename to pcbasic/interface/audio_sdl2.py index 90b654fc79..533b5a4d72 100644 --- a/interface/audio_sdl2.py +++ b/pcbasic/interface/audio_sdl2.py @@ -23,7 +23,7 @@ except ImportError: numpy = None -from basic import signals +from ..basic import signals from . import base as audio tick_ms = 24 diff --git a/interface/base.py b/pcbasic/interface/base.py similarity index 99% rename from interface/base.py rename to pcbasic/interface/base.py index 8b622fc895..8c3af2fdec 100644 --- a/interface/base.py +++ b/pcbasic/interface/base.py @@ -8,7 +8,7 @@ import Queue -from basic import signals +from ..basic import signals class InitFailed(Exception): diff --git a/interface/clipboard.py b/pcbasic/interface/clipboard.py similarity index 100% rename from interface/clipboard.py rename to pcbasic/interface/clipboard.py diff --git a/interface/video_ansi.py b/pcbasic/interface/video_ansi.py similarity index 100% rename from interface/video_ansi.py rename to pcbasic/interface/video_ansi.py diff --git a/interface/video_cli.py b/pcbasic/interface/video_cli.py similarity index 99% rename from interface/video_cli.py rename to pcbasic/interface/video_cli.py index 5ee86ac2e3..e1502a977d 100644 --- a/interface/video_cli.py +++ b/pcbasic/interface/video_cli.py @@ -16,9 +16,9 @@ from . import base as video from . import ansi -from basic import signals -from basic import scancode -from basic.eascii import as_unicode as uea +from ..basic import signals +from ..basic import scancode +from ..basic.eascii import as_unicode as uea encoding = sys.stdin.encoding or 'utf-8' diff --git a/interface/video_curses.py b/pcbasic/interface/video_curses.py similarity index 99% rename from interface/video_curses.py rename to pcbasic/interface/video_curses.py index a938350a42..abd2a88777 100644 --- a/interface/video_curses.py +++ b/pcbasic/interface/video_curses.py @@ -14,9 +14,9 @@ except ImportError: curses = None -from basic import scancode -from basic.eascii import as_unicode as uea -from basic import signals +from ..basic import scancode +from ..basic.eascii import as_unicode as uea +from ..basic import signals from . import base as video # for a few ansi sequences not supported by curses diff --git a/interface/video_graphical.py b/pcbasic/interface/video_graphical.py similarity index 99% rename from interface/video_graphical.py rename to pcbasic/interface/video_graphical.py index dfd7dace14..43cc651084 100644 --- a/interface/video_graphical.py +++ b/pcbasic/interface/video_graphical.py @@ -25,8 +25,8 @@ from . import base as video -from basic import signals -from basic import scancode +from ..basic import signals +from ..basic import scancode # percentage of the screen to leave unused for window decorations etc. display_slack = 15 diff --git a/interface/video_none.py b/pcbasic/interface/video_none.py similarity index 98% rename from interface/video_none.py rename to pcbasic/interface/video_none.py index 0b9c789fc9..22baacccac 100644 --- a/interface/video_none.py +++ b/pcbasic/interface/video_none.py @@ -11,7 +11,7 @@ from . import base as video -from basic import signals +from ..basic import signals if platform.system() == 'Windows': from msvcrt import kbhit diff --git a/interface/video_pygame.py b/pcbasic/interface/video_pygame.py similarity index 99% rename from interface/video_pygame.py rename to pcbasic/interface/video_pygame.py index cda3e9ded0..5a8ea27613 100644 --- a/interface/video_pygame.py +++ b/pcbasic/interface/video_pygame.py @@ -19,9 +19,9 @@ except ImportError: numpy = None -from basic import signals -from basic import scancode -from basic.eascii import as_unicode as uea +from ..basic import signals +from ..basic import scancode +from ..basic.eascii import as_unicode as uea from . import clipboard from . import base as video diff --git a/interface/video_sdl2.py b/pcbasic/interface/video_sdl2.py similarity index 99% rename from interface/video_sdl2.py rename to pcbasic/interface/video_sdl2.py index fc419a3572..160f846fe5 100644 --- a/interface/video_sdl2.py +++ b/pcbasic/interface/video_sdl2.py @@ -24,9 +24,9 @@ except ImportError: numpy = None -from basic import signals -from basic import scancode -from basic.eascii import as_unicode as uea +from ..basic import signals +from ..basic import scancode +from ..basic.eascii import as_unicode as uea from . import clipboard from . import base as video from . import video_graphical diff --git a/run-pcbasic.py b/run-pcbasic.py new file mode 100755 index 0000000000..2b115b8e8b --- /dev/null +++ b/run-pcbasic.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python2 + +from pcbasic.__main__ import main +main() diff --git a/test/lint.sh b/test/lint.sh index 096f6152a9..64cfb95b50 100755 --- a/test/lint.sh +++ b/test/lint.sh @@ -1,2 +1,2 @@ #!/bin/bash -for file in ../basic/*.py ../interface/*.py ../pcbasic.py; do pylint -E --ignored-modules=pygame,numpy,pygame.mixer --enable=cyclic-import,relative-import --disable=too-many-function-args $file; done +for file in ../pcbasic/*.py ../pcbasic/*/*.py; do pylint -E --ignored-modules=pygame,numpy,pygame.mixer --enable=cyclic-import,relative-import --disable=too-many-function-args $file; done diff --git a/test/test.sh b/test/test.sh index 79a925c439..d1eb114d9b 100755 --- a/test/test.sh +++ b/test/test.sh @@ -24,7 +24,7 @@ do mkdir "$name/output" cp "$name"/* "$name/output" 2>/dev/null pushd "$name/output" > /dev/null - ../../../pcbasic.py --interface=none >/dev/null + ../../../run-pcbasic.py --interface=none >/dev/null popd > /dev/null pass=1 known=1