Add the +2 ROM images to the SkoolKit distribution

skoolkid · Feb 19, 2024 · 2f07c13 · 2f07c13
1 parent 0444dc9
commit 2f07c13
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/skoolkit/__init__.py b/skoolkit/__init__.py
@@ -42,6 +42,11 @@
     os.path.join(PACKAGE_DIR, 'resources', '128-1.rom')
 )
 
+ROM_PLUS2 = (
+    os.path.join(PACKAGE_DIR, 'resources', 'plus2-0.rom'),
+    os.path.join(PACKAGE_DIR, 'resources', 'plus2-1.rom')
+)
+
 def error(msg):
     sys.stderr.write('ERROR: {0}\n'.format(msg))
     sys.exit(1)

diff --git a/skoolkit/resources/plus2-0.rom b/skoolkit/resources/plus2-0.rom
diff --git a/skoolkit/resources/plus2-1.rom b/skoolkit/resources/plus2-1.rom
diff --git a/sphinx/source/whatis.rst b/sphinx/source/whatis.rst
@@ -98,7 +98,7 @@ licence.
 
 ZX Spectrum ROMs
 ----------------
-Copies of the 48K and 128K ZX Spectrum ROMs are included with SkoolKit (in the
+Copies of the 48K, 128K and +2 ROMs are included with SkoolKit (in the
 `skoolkit/resources` directory). The copyright in these ROMs is held by
 Amstrad, who have kindly `given permission`_ for them to be redistributed.
 

diff --git a/tools/mksktarball b/tools/mksktarball
@@ -58,7 +58,7 @@ rsync -aR \
   {bin2{sna,tap},rzx{info,play},skool2{asm,bin,ctl,html},sna2{ctl,img,skool},snap{info,mod},tap{2sna,info},trace}.py \
   skoolkit/{__init__,audio,basic,bin2{sna,tap},cmiosimulator,components,config,ctlparser,defaults,disassembler,graphics,image,kbtracer,loadsample,loadtracer,opcodes,pagingtracer,pngwriter,refparser,rzx{info,play},simtables,simulator,skool{{,2}{asm,ctl,html},2bin,macro,parser,utils},sna2img,sna{,2}{ctl,skool},snap{info,mod,shot},tap{2sna,info},textutils,trace,traceutils,z80}.py \
   examples/hungry_horace.{ctl,ref,t2s} \
-  skoolkit/resources/{{128-{0,1},48}.rom,skoolkit{,-dark,-green,-plum,-wide}.css} \
+  skoolkit/resources/{{{128,plus2}-{0,1},48}.rom,skoolkit{,-dark,-green,-plum,-wide}.css} \
   tests/{{macro,skoolkit}test,test_{audio,basic,bin2{sna,tap},cmiosimulator,ctlparser,disassembler,graphics,image,kbtracer,refparser,rzx{info,play},simulator,skool{{,2}{asm,ctl,html},2bin,macro,parser},skoolkit,sna2{ctl,img},sna{2,}skool,snap{info,mod,shot},tap{2sna,info},textutils,trace,traceutils,z80}}.py \
   COPYING MANIFEST.in long_description.rst pyproject.toml setup.cfg \
   $ABSDIR

diff --git a/tools/skrelease b/tools/skrelease
@@ -203,7 +203,7 @@ _check_resources() {
   rootdir=$1
   logdir=$2
 
-  _check_files resources $rootdir $logdir skoolkit{,-dark,-green,-plum,-wide}.css {128-{0,1},48}.rom
+  _check_files resources $rootdir $logdir skoolkit{,-dark,-green,-plum,-wide}.css {{128,plus2}-{0,1},48}.rom
 }
 
 _check_examples() {