Merge pull request #60 from davidgiven/brother

Move the PowerNote stuff into a directory named after the exact model it works on.

.github/workflows/ccpp.yml

@@ -30,7 +30,7 @@ jobs:
       with:
         name:  ${{ github.event.repository.name }}.${{ github.sha }}
         path: |
-          bazel-bin/arch/brotherpowernote/diskimage.img
+          bazel-bin/arch/brother/pn8510/diskimage.img
           bazel-bin/arch/brotherop2/diskimage.img
           bazel-bin/arch/brotherwp1/diskimage.img
           bazel-bin/arch/kayproii/diskimage.img

.github/workflows/release.yml

@@ -50,6 +50,7 @@ jobs:
         tag: dev
         assets: | 
           brotherpowernote.img
+          pn8510.img
           brotherop2.img
           brotherwp1.img
           kayproii.img
@@ -62,7 +63,7 @@ jobs:
       with:
         name: Development build ${{ env.RELEASE_DATE }}
         files: |
-          brotherpowernote.img
+          pn8510.img
           brotherop2.img
           brotherwp1.img
           kayproii.img

BUILD

@@ -5,7 +5,7 @@ exports_files([ "diskdefs" ])
 filegroup(
 	name = "diskimages",
 	srcs = [
-		"//arch/brotherpowernote:diskimage",
+		"//arch/brother/pn8510:diskimage",
 		"//arch/brotherop2:diskimage",
 		"//arch/brotherwp1:diskimage",
 		"//arch/kayproii:diskimage",

Makefile

@@ -1,7 +1,8 @@
 all:
 	bazel test -c dbg //...
 	bazel build -c opt //:diskimages
-	for a in $$(dirname bazel-bin/arch/*/diskimage.img); do f=$$(basename $$a); ln -sf bazel-bin/arch/$$f/diskimage.img $$f.img; done
+	for a in $$(dirname bazel-bin/arch/*/diskimage.img bazel-bin/arch/*/*/diskimage.img); do \
+		f=$$(basename $$a); ln -sf $$a $$f.img; done
 
 verbose:
 	bazel test -s -c dbg //...

arch/brotherpowernote/BUILD → arch/brother/pn8510/BUILD

@@ -21,9 +21,9 @@ top_of_memory = 0x10000
 
 genrule(
     name = "keytab_inc",
-	tools = [ "//arch/brotherpowernote/utils:mkkeytab" ],
+	tools = [ "//arch/brother/pn8510/utils:mkkeytab" ],
     outs = [ "keytab.inc" ],
-	cmd = "$(location //arch/brotherpowernote/utils:mkkeytab) > $@"
+	cmd = "$(location //arch/brother/pn8510/utils:mkkeytab) > $@"
 )
 
 # Object files --------------------------------------------------------------
@@ -45,7 +45,7 @@ BIOS_SRCS = [
             "//include:cpmish.lib",
             "//include:z180.lib",
             ":keytab_inc",
-            "//arch/brotherpowernote/include:brotherpowernote.lib",
+            "//arch/brother/pn8510/include:brotherpowernote.lib",
             "//arch/common/utils:tty.lib",
             "//arch/common/utils:print.lib",
             ":addresses",
@@ -80,7 +80,7 @@ zmac(
         "//include:cpm.lib",
         "//include:cpmish.lib",
         "//include:z180.lib",
-        "//arch/brotherpowernote/include:brotherpowernote.lib",
+        "//arch/brother/pn8510/include:brotherpowernote.lib",
         ":addresses",
     ],
 )