Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ packages = [
]

[tool.poetry.scripts]
zxb = 'src.libzxbc.zxb:main'
zxbc = 'src.libzxbc.zxb:main'
zxbasm = 'src.libzxbasm.zxbasm:main'
zxbpp = 'src.libzxbpp.zxbpp:entry_point'
zxbc = 'src.zxbc:main'
zxbasm = 'src.zxbasm.zxbasm:main'
zxbpp = 'src.zxbpp.zxbpp:entry_point'

[tool.poetry.dependencies]
python = "^3.12"
Expand Down
3 changes: 2 additions & 1 deletion src/api/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from collections.abc import Callable
from enum import Enum

from src.api import errmsg, global_, options
from src.api import errmsg, global_, options, python_version_check
from src.api.options import ANYTYPE, Action

# The options container
Expand Down Expand Up @@ -181,6 +181,7 @@ def save_config_into_file(

def init() -> None:
"""Default Options and Compilation Flags"""
python_version_check.init()
OPTIONS(Action.CLEAR)

OPTIONS(Action.ADD, name=OPTION.OUTPUT_FILENAME, type=str)
Expand Down
12 changes: 12 additions & 0 deletions src/api/python_version_check.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import sys
from typing import Final

MINIMUM_REQUIRED_PYTHON_VERSION: Final[tuple[int, int]] = (3, 12)


def init():
if sys.version_info < MINIMUM_REQUIRED_PYTHON_VERSION:
sys.exit("Python 3.12 or later is required.")


init()
3 changes: 1 addition & 2 deletions src/zxbpp/zxbpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -971,8 +971,7 @@ def entry_point(args=None):
config.OPTIONS.expected_warnings = options.expect_warnings

if options.arch not in arch.AVAILABLE_ARCHITECTURES:
parser.error(f"Invalid architecture '{options.arch}'")
return 2
parser.error(f"Invalid architecture '{options.arch}'") # Exits with error

config.OPTIONS.architecture = options.arch

Expand Down
13 changes: 0 additions & 13 deletions zxb.py

This file was deleted.