Skip to content

Commit d19c649

Browse files
committed
diskimage.js updates
1 parent 69bc3c4 commit d19c649

File tree

5 files changed

+21575
-47
lines changed

5 files changed

+21575
-47
lines changed

build/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ the BASIC-DOS source disk image whenever a BASIC-DOS source file has been change
7777
locally (eg, by the VS Code editor).
7878

7979
Note that this task also requires the PCjs
80-
[DiskImage](https://github.com/jeffpar/pcjs/tree/master/tools#pcjs-diskimage-utility)
80+
[DiskImage](https://github.com/jeffpar/pcjs/tree/master/tools/diskimage)
8181
utility, so you should clone the [PCjs](https://github.com/jeffpar/pcjs)
8282
repository, run the usual `npm install`, and then set the environment variable
8383
`PCJS` to the fully-qualified name of the directory containing the clone. Then
8484
verify that `diskimage` works; eg:
8585

86-
node $PCJS/tools/modules/diskimage.js
86+
node $PCJS/tools/diskimage/diskimage.js
8787

8888
DiskImage v2.04
8989
Copyright © 2012-2020 Jeff Parsons <Jeff@pcjs.org>
@@ -102,7 +102,7 @@ browser you *really* want to download and keep `BDSRC.img`, and then use the
102102
PCjs `diskimage` utility to extract files from the virtual hard disk;
103103
eg:
104104

105-
node $PCJS/tools/modules/diskimage.js BDSRC.img --extract --overwrite
105+
node $PCJS/tools/diskimage/diskimage.js BDSRC.img --extract --overwrite
106106
cp -pR BDSRC/* $BASICDOS/software/pcx86/bdsrc/
107107

108108
Be very careful when using commands like those shown above. It's easy to lose

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ for (let diskName in disks) {
165165
diskFiles += " --boot ./software/pcx86/bdsrc/boot/obj/BOOT.COM";
166166
}
167167
}
168-
let cmd = "node \"${PCJS}/tools/modules/diskimage.js\" " + diskFiles + " --output " + diskImage + archiveImage + " --target=" + kbTarget + " --overwrite";
168+
let cmd = "node \"${PCJS}/tools/diskimage/diskimage.js\" " + diskFiles + " --output " + diskImage + archiveImage + " --target=" + kbTarget + " --overwrite";
169169
cmd = cmd.replace(/\$\{([^}]+)\}/g, (_,n) => process.env[n]);
170170
gulp.task(buildTask, run(cmd));
171171
let watchTask = "WATCH-" + diskName;

machines/pcx86/releases/2.06/pcx86-uncompiled.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80417,7 +80417,7 @@ class Computer extends Component {
8041780417
* and of course, eval() will convert them all, but there's no expectation of any but those I've
8041880418
* listed above, in part because of Jekyll limitations in some of our templates; eg:
8041980419
*
80420-
* https://github.com/jeffpar/pcjs/blob/jekyll/_includes/machine-engines.html
80420+
* https://github.com/jeffpar/pcjs.v1/blob/jekyll/_includes/machine-engines.html
8042180421
*
8042280422
* which could be overcome, but there's really no need to support more, since \xNN can be used to
8042380423
* represent anything else.

software/pcx86/disks/BDS-BOOT.json

Lines changed: 740 additions & 20 deletions
Large diffs are not rendered by default.

software/pcx86/disks/BDSRC.json

Lines changed: 20830 additions & 22 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)