diff --git a/README.md b/README.md index 7ac24006..c7b255f6 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ With SkoolKit you can: snapshot (SNA, SZX or Z80) or raw memory file * enable [sna2ctl.py](https://skoolkid.github.io/skoolkit/commands.html#sna2ctl-py) to generate a much better control file that more reliably distinguishes code - from data by using a code execution map produced by an emulator + from data by using a code execution map produced by an emulator or + [rzxplay.py](https://skoolkid.github.io/skoolkit/commands.html#rzxplay-py) * use [sna2skool.py](https://skoolkid.github.io/skoolkit/commands.html#sna2skool-py) along with this control file to produce a disassembly of a snapshot or raw memory file @@ -58,9 +59,15 @@ With SkoolKit you can: find text, or find sequences of arbitrary byte values * use [trace.py](https://skoolkid.github.io/skoolkit/commands.html#trace-py) to trace the execution of machine code in a snapshot or raw memory file +* use [rzxplay.py](https://skoolkid.github.io/skoolkit/commands.html#rzxplay-py) + to trace the execution of machine code in an RZX file, and produce a code + execution map for + [sna2ctl.py](https://skoolkid.github.io/skoolkit/commands.html#sna2ctl-py) * use [tapinfo.py](https://skoolkid.github.io/skoolkit/commands.html#tapinfo-py) to analyse the blocks in a TAP or TZX file, and list the BASIC program it contains +* use [rzxinfo.py](https://skoolkid.github.io/skoolkit/commands.html#rzxinfo-py) + to analyse the blocks in an RZX file, and extract snapshots from it * use [bin2tap.py](https://skoolkid.github.io/skoolkit/commands.html#bin2tap-py) to convert a snapshot or raw memory file into a TAP file * use [bin2sna.py](https://skoolkid.github.io/skoolkit/commands.html#bin2sna-py) diff --git a/debian/changelog b/debian/changelog index 862e59e6..9ec5c78f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +skoolkit (9.2-1) unstable; urgency=medium + + * Updated to 9.2. + + -- Richard Dymond Sat, 11 May 2024 08:22:49 -0300 + skoolkit (9.1-1) unstable; urgency=medium * Updated to 9.1. diff --git a/long_description.rst b/long_description.rst index 3e17f301..2159c506 100644 --- a/long_description.rst +++ b/long_description.rst @@ -20,7 +20,7 @@ With SkoolKit you can: Z80) or raw memory file * enable sna2ctl.py_ to generate a much better control file that more reliably distinguishes code from data by using a code execution map produced by an - emulator + emulator or rzxplay.py_ * use sna2skool.py_ along with this control file to produce a disassembly of a snapshot or raw memory file * add annotations to this disassembly (or the control file) as you discover the @@ -40,8 +40,12 @@ With SkoolKit you can: graphic data, find text, or find sequences of arbitrary byte values * use trace.py_ to trace the execution of machine code in a snapshot or raw memory file +* use rzxplay.py_ to trace the execution of machine code in an RZX file, and + produce a code execution map for sna2ctl.py_ * use tapinfo.py_ to analyse the blocks in a TAP or TZX file, and list the BASIC program it contains +* use rzxinfo.py_ to analyse the blocks in an RZX file, and extract snapshots + from it * use bin2tap.py_ to convert a snapshot or raw memory file into a TAP file * use bin2sna.py_ to convert a raw memory file into a Z80 or SZX snapshot * use snapmod.py_ to modify the register values or memory contents in a Z80 or @@ -65,6 +69,8 @@ disassemblies of `Skool Daze`_, `Back to Skool`_, `Contact Sam Cruise`_, .. _bin2sna.py: https://skoolkid.github.io/skoolkit/commands.html#bin2sna-py .. _bin2tap.py: https://skoolkid.github.io/skoolkit/commands.html#bin2tap-py +.. _rzxinfo.py: https://skoolkid.github.io/skoolkit/commands.html#rzxinfo-py +.. _rzxplay.py: https://skoolkid.github.io/skoolkit/commands.html#rzxplay-py .. _skool2asm.py: https://skoolkid.github.io/skoolkit/commands.html#skool2asm-py .. _skool2bin.py: https://skoolkid.github.io/skoolkit/commands.html#skool2bin-py .. _skool2ctl.py: https://skoolkid.github.io/skoolkit/commands.html#skool2ctl-py diff --git a/rpm/skoolkit.spec b/rpm/skoolkit.spec index 59870ee2..464a7355 100644 --- a/rpm/skoolkit.spec +++ b/rpm/skoolkit.spec @@ -1,5 +1,5 @@ Name: skoolkit -Version: 9.1 +Version: 9.2 Release: 1 Summary: Tools for creating disassemblies of ZX Spectrum programs @@ -43,6 +43,9 @@ cp -a examples %{buildroot}%{_datadir}/%{name} %{python3_sitearch}/skoolkit-%{version}*.egg-info/ %changelog +* Sat May 11 2024 Richard Dymond 9.2-1 +- Updated to 9.2 + * Sat Feb 03 2024 Richard Dymond 9.1-1 - Updated to 9.1 diff --git a/skoolkit/__init__.py b/skoolkit/__init__.py index 29717bdd..2587f6f8 100644 --- a/skoolkit/__init__.py +++ b/skoolkit/__init__.py @@ -32,7 +32,7 @@ except ImportError: # pragma: no cover CCMIOSimulator = None -VERSION = '9.2rc' +VERSION = '9.2' PACKAGE_DIR = os.path.dirname(__file__) BASE_10 = 10 diff --git a/sphinx/source/changelog.rst b/sphinx/source/changelog.rst index 400656e6..3d2deafd 100644 --- a/sphinx/source/changelog.rst +++ b/sphinx/source/changelog.rst @@ -1,8 +1,8 @@ Changelog ========= -9.2rc ------ +9.2 (2024-05-11) +---------------- * Added a Z80 instruction set simulator implemented in C (as a faster alternative to the pure Python Z80 simulator) * Added the :ref:`rzxplay.py` command (for playing an RZX file) diff --git a/sphinx/source/conf.py b/sphinx/source/conf.py index 59c58473..e9f98d88 100644 --- a/sphinx/source/conf.py +++ b/sphinx/source/conf.py @@ -48,7 +48,7 @@ # The short X.Y version. version = '9.2' # The full version, including alpha/beta/rc tags. -release = '9.2rc' +release = '9.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tools/mkskpkg b/tools/mkskpkg index a4020b61..09873e4c 100755 --- a/tools/mkskpkg +++ b/tools/mkskpkg @@ -43,8 +43,8 @@ if [ "$PKGTYPE" = "deb" ]; then echo "Created $(ls $SKOOLKIT_HOME/dist/skoolkit_$VERSION-*.deb)" elif [ "$PKGTYPE" = "rpm" ]; then cp -p dist/$SKOOLKIT_TAR ~/rpmbuild/SOURCES/skoolkit-$VERSION.tar.xz - rm -f ~/rpmbuild/RPMS/noarch/skoolkit-$VERSION-*.rpm + rm -f ~/rpmbuild/RPMS/x86_64/skoolkit-$VERSION-*.rpm rpmbuild -bb --define='_binary_payload w6.xzdio' rpm/skoolkit.spec - mv ~/rpmbuild/RPMS/noarch/skoolkit-$VERSION-*.rpm dist + mv ~/rpmbuild/RPMS/x86_64/skoolkit-$VERSION-*.rpm dist echo "Created $(ls $SKOOLKIT_HOME/dist/skoolkit-$VERSION-*.rpm)" fi diff --git a/tools/skrelease b/tools/skrelease index 9e83fc69..d70b673e 100755 --- a/tools/skrelease +++ b/tools/skrelease @@ -397,7 +397,7 @@ verify_pip() { build_deb() { _require_skoolkit - debname=skoolkit_$VERSION-1_all.deb + debname=skoolkit_$VERSION-1_amd64.deb deb=$SKOOLKIT_HOME/dist/$debname logdir=$SKOOLKIT_HOME/dist mkdir -p $logdir @@ -419,7 +419,7 @@ build_deb() { build_rpm() { _require_skoolkit - rpmname=skoolkit-$VERSION-1.noarch.rpm + rpmname=skoolkit-$VERSION-1.x86_64.rpm rpm=$SKOOLKIT_HOME/dist/$rpmname logdir=$SKOOLKIT_HOME/dist mkdir -p $logdir