Changed the last embedPC() parameter from sStateFile to sParms, although for backward compatibility, if sParms is not a JSON object definition (ie, beginning with a brace), it continues to be treated as a state filename.

This change allows us to pass any number of additional properties to embedPC(), which in turn can override properties contained in the XML file; the only property overrides currently supported are 'state' (which overrides any 'state' property set in the XML's <computer> element) and 'automount' (which overrides any 'automount' property set in the XML's <fdc> element).  The goal is to make it easier to reuse XML machine definitions, by allowing commonly altered component attributes to be overridden.
This commit is contained in:
Jeff Parsons 2016-01-18 16:11:08 -08:00
commit 12b760f912
28 changed files with 2187 additions and 2059 deletions

View file

@ -61,9 +61,10 @@ that automatically run the software.
* MS OS/2 1.1
* MS OS/2 1.2
### Other OS/2 Disks
### [Other OS/2 Disks](/disks/pc/os2/misc/)
* [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/)
* [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/debugger/)
* [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pc/os2/misc/football/debugger/)
### Microsoft Windows
@ -118,7 +119,7 @@ that automatically run the software.
* Microsoft Windows SDK 2.03
* Microsoft Windows SDK 3.00
We also have links to all the [Microsoft Languages NewsLetters](/disks/pc/tools/microsoft/) that were published
NOTE: We also have links to all the [Microsoft Languages NewsLetters](/disks/pc/tools/microsoft/) that were published
in [PC Tech Journal](/pubs/pc/magazines/pctj/).
### Microsoft Games

View file

@ -14,9 +14,6 @@ The PCjs machine below is running PC-DOS 4.00.
{% include machine.html id="ibm5170-msdos400" %}
Vital Statistics
---
MS-DOS 4.00 was released in October 1988. The contents of the six 360Kb distribution diskettes are shown below.
### Directory of MS-DOS 4.00 (Disk 1)

View file

@ -14,9 +14,6 @@ The PCjs machine below is running PC-DOS 4.01.
{% include machine.html id="ibm5170-msdos401" %}
Vital Statistics
---
MS-DOS 4.01 was released in April 1989. The contents of the six 360Kb distribution diskettes are shown below.
### Directory of MS-DOS 4.01 (Disk 1)

View file

@ -11,6 +11,8 @@ OS/2 1.0 Debugger Boot Disk
---
This disk contains a version of OS/2 1.0 built on October 12, 1988, which includes the built-in kernel debugger used by
Microsoft and IBM for internal development. For more details, see the "OS/2 1.0" [blog post](/blog/2014/12/04/).
Microsoft and IBM for internal development.
{% include machine.html id="ibm5170" %}
Return to [Other OS/2 Disks](/disks/pc/os2/misc/).

View file

@ -9,7 +9,7 @@ Other OS/2 Disks
### OS/2 1.0 Debugger Boot Disk
The [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/debugger/) contains a version of OS/2 1.0 built on
The [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/debugger/) contains a version of OS/2 1.0 built on
October 12, 1988, which includes the built-in kernel debugger used by Microsoft and IBM for internal development.
For more details, see the "OS/2 1.0" [blog post](/blog/2014/12/04/).
@ -25,13 +25,13 @@ of these files, suggesting that this was a private build of IBM OS/2 1.0. When
The 5-digit number indicates the day the files were built. The first 2 digits are the year (88) and the 3 remaining
digits are the day of the year (286 or October 12).
A directory listing of the disk is provided below.
Aside from the fact that this version of IBMDOS.COM is much larger than the 1987 version (thanks to the inclusion of
the kernel debugger), most of the file sizes are identical. But not all. For example, the 1987 version of CLOCK01.SYS
is 2762 bytes, whereas this version is 2812 bytes. So apparently a few changes were slipped into the 1.0 sources used
to build these binaries.
A directory listing of the disk is provided below.
IBMBIO COM 4096 10-12-88 12:32p
IBMDOS COM 299143 10-12-88 10:53a
IBMDOS SYM 62788 10-12-88 10:54a
@ -68,3 +68,48 @@ to build these binaries.
CONFIG SYS 101 12-04-14 7:45p
34 file(s) 765785 bytes
437760 bytes free
### OS/2 FOOTBALL Boot Disk (v7.68.17)
The [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pc/os2/misc/football/debugger/) contains a prototype version of OS/2
from early 1987 that added preliminary support for the Intel 80386 processor, including limited support for 32-bit code
and the ability to run multiple DOS applications in V86-mode. It was forked from pre-OS/2 1.0 sources, and the only
machine it supported was the Compaq DeskPro 386-16.
A directory listing of the disk is provided below.
Volume in drive A has no label
Directory of A:\
IBMBIO COM 50689 2-27-87 3:49p
IBMDOS COM 216962 2-27-87 3:48p
OSO001 MSG 40730 2-27-87 12:24p
ANSICALL EXE 3165 2-27-87 11:34a
BKSCALLS EXE 3611 2-27-87 11:51a
BMSCALLS EXE 2064 2-27-87 11:55a
BVSCALLS EXE 11710 2-27-87 12:02p
DOSCALL1 EXE 7071 2-27-87 12:03p
KBDCALLS EXE 4138 2-27-87 12:04p
MONCALLS EXE 5655 2-27-87 12:09p
MOUCALLS EXE 5177 2-27-87 12:16p
QUECALLS EXE 11508 2-27-87 12:28p
SESMGR EXE 25744 2-27-87 12:41p
SHELL EXE 4096 2-27-87 12:43p
VIOCALLS EXE 9833 2-27-87 12:47p
CMD EXE 47056 11-17-86 1:52p
VT52 SYS 3205 10-27-86 3:57p
IBMDOS SYM 50692 2-27-87 3:48p
COUNTRY SYS 6175 11-03-86 8:32p
MSG EXE 5824 11-03-86 8:36p
NLS EXE 3124 11-03-86 8:37p
SWAPPER EXE 4150 2-25-87 8:04p
EXEHDR EXE 23242 10-17-86 2:24p
COMMAND COM 23724 10-27-86 3:57p
CONFIG SYS 90 2-27-87 4:14p
POINTDD SYS 4240 11-03-86 7:28p
VDISK SYS 4662 11-03-86 7:28p
PGSWP32 EXE 7570 2-02-87 12:20p
LIN EXE 8084 2-12-87 3:00p
MAIN EXE 32482 11-14-86 12:44p
CPGREP EXE 25286 10-21-86 9:08p
31 File(s) 549888 bytes free

View file

@ -0,0 +1,25 @@
---
layout: page
title: "OS/2 FOOTBALL Boot Disk (v7.68.17)"
permalink: /disks/pc/os2/misc/football/debugger/
machines:
- type: pc-dbg
id: deskpro386
config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
uncompiled: true
automount:
A:
name: OS/2 FOOTBALL Boot Disk (v7.68.17)
path: /disks/pc/os2/misc/football/debugger/FOOTBALL-7.68.17.json
---
OS/2 FOOTBALL Boot Disk (v7.68.17)
---
This boot disk contains a prototype version of OS/2 from early 1987 that added preliminary support for the Intel 80386
processor, including limited support for 32-bit code and the ability to run multiple DOS applications in V86-mode.
It was forked from pre-OS/2 1.0 sources, and the only machine it supported was the Compaq DeskPro 386-16.
{% include machine.html id="deskpro386" %}
Return to [Other OS/2 Disks](/disks/pc/os2/misc/).

View file

@ -6,4 +6,7 @@
<disk id="disk01" size="1228800" chs="80:2:15" href="/disks/pc/os2/misc/1.0/debugger/OS210-BOOT.json">
<name>OS/2 1.0 Debugger Boot Disk</name>
</disk>
<disk id="disk02" size="1228800" chs="80:2:15" img="football/debugger/static/FOOTBALL-7.68.17.img" href="/disks/pc/os2/misc/football/debugger/FOOTBALL-7.68.17.json" md5="3825dc8053f904c266b1ce98dbf1e981" md5json="7ea3f05e71ae4f3ccc7432f025426140">
<name>OS/2 FOOTBALL Boot Disk (v7.68.17)</name>
</disk>
</manifest>