Standardized on autoMount (vs. automount) and created compiled version of the PCSIG08 disk manifest (because it's huge)

This commit is contained in:
Jeff Parsons 2017-07-11 19:10:05 -07:00 • committed by Jeff Parsons
commit 4577092917
54 changed files with 93 additions and 93 deletions

View file

@ -671,8 +671,8 @@ module.exports = function(grunt) {
var sFile = matchManifest[2];
var sManifest = grunt.file.read(path.join('.', sFile));
if (!sManifest) continue;
var sPrefix = "", sDefaultName = "", match;
match = sManifest.match(/<title(?: prefix="(.*?)"|(;?))[^>]*>(.*?)<\/title>/);
var sPrefix = "", sDefaultName = "Unknown", match;
match = sManifest.match(/<title(?: prefix="(.*?)"|)[^>]*>(.*?)<\/title>/);
if (match) {
sPrefix = match[1];
sDefaultName = match[2];

View file

@ -10,7 +10,7 @@ machines:
debugger: true
config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]'
automount:
autoMount:
A:
name: None
B:

View file

@ -10,7 +10,7 @@ machines:
state: /apps/pcx86/1984/modula2/state.json
config: /devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]'
automount:
autoMount:
A:
name: None
B:

View file

@ -9,7 +9,7 @@ machines:
state: /apps/pcx86/1984/modula2/state.json
config: /devices/pcx86/machine/5160/ega/640kb/machine.xml
drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]'
automount:
autoMount:
A:
name: None
B:

View file

@ -9,7 +9,7 @@
<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
<keyboard ref="/devices/pcx86/keyboard/us83-buttons-functions.xml"/>
<debugger id="debugger"/>
<panel ref="/devices/pcx86/panel/wide.xml"/>

View file

@ -8,7 +8,7 @@
<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
<cpu id="cpu8088" model="8088" autostart="true" pos="right" padRight="8px">
<control type="button" binding="run">Run</control>
<control type="button" binding="reset">Reset</control>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<disk path="/disks/pcx86/empty/EMPTY-360K.json">Empty Diskette (360K)</disk>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<disk path="/disks/pcx86/dos/ibm/1.00/PCDOS100.json">PC-DOS 1.00</disk>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<disk path="/disks/pcx86/dos/ibm/1.00/PCDOS100.json"> 1.00</disk>
<disk path="/disks/pcx86/dos/ibm/1.10/PCDOS110.json"> 1.10</disk>
<disk path="/disks/pcx86/dos/ibm/1.00/PCDOS100.json">PC-DOS 1.00</disk>
<disk path="/disks/pcx86/dos/ibm/1.10/PCDOS110.json">PC-DOS 1.10</disk>
<disk path="/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json">PC-DOS 2.00 (Disk 1)</disk>
<disk path="/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json">PC-DOS 2.00 (Disk 2)</disk>
<disk path="/disks/pcx86/dos/ibm/2.10/PCDOS210-DISK1.json">PC-DOS 2.10 (Disk 1)</disk>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" automount='{A: {name: "Zork I", path: "/disks/pcx86/games/infocom/zork1/ZORK1-READONLY.json"}}' padLeft="8px" padBottom="8px" pos="left">
<fdc id="fdcNEC" autoMount='{A: {name: "Zork I", path: "/disks/pcx86/games/infocom/zork1/ZORK1-READONLY.json"}}' padLeft="8px" padBottom="8px" pos="left">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<manifest ref="/disks/pcx86/games/infocom/hhiker/manifest.xml"/>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<manifest ref="/disks/pcx86/empty/manifest.xml"/>

View file

@ -8,7 +8,7 @@ machines:
debugger: true
config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]'
automount:
autoMount:
A:
name: None
B:

View file

@ -9,7 +9,7 @@ machines:
messages: fault
config: /devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/IBMOS211-VGA.json"}]'
automount:
autoMount:
A:
name: None
B:

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml"/>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/manifest.xsl"?>
<manifest type="software">
<title prefix="PCMAG">PC Magazine Diskettes</title>
<title>PC Magazine Diskettes</title>
<disk id="disk01" size="163840" chs="40:1:8" dir="archive/VOL06N08" href="/disks/pcx86/shareware/pcmag/VOL06N08.json" md5="d75cf2d16d104ebd61843cc67dd6ac88" md5json="46bc9c75178d3119f0f85b8611bd52c8">
<name>PC Magazine (Vol. 06 No. 08)</name>
<file size="21860" time="1987-01-30 12:08:26" attr="0x20" md5="553b1524370b985201768fd8980b94f0">PLAY.ASM</file>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.20 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B:{name:"PC-DOS 3.20 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml"/>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/manifest.xsl"?>
<manifest type="software">
<title prefix="PCTJ">PC Tech Journal Diskettes</title>
<title>PC Tech Journal Diskettes</title>
<disk id="disk01" size="163840" chs="40:1:8" dir="archive/PCTJ8512" href="/disks/pcx86/shareware/pctj/PCTJ8512.json" md5="cf9e657a00ff80c049103c2b916c6039" md5json="c127f27e1f71822032e75016948b1f97">
<name>PC Tech Journal (1985-12)</name>
<file size="1034" time="1985-09-23 14:22:48" attr="0x20" md5="a5e81153184a3f401ebe2a6797ea5005">AUTH.PER</file>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/manifest.xsl"?>
<manifest type="software">
<title prefix="System V">Microport's AT&amp;T UNIX System V-AT 2.3 (5¨)</title>
<title>Microport's AT&amp;T UNIX System V-AT 2.3 (5¨)</title>
<disk id="disk01" size="1228800" chs="80:2:15" img="archive/SYSTEMV23-DISK01.img" href="/disks/pcx86/unix/microport/system-v/2.3/SYSTEMV23-DISK01.json" md5="08b5f4199ca06be2595ee9cf46f94857" md5json="87e19cb658085bd6d6173526ec0d3261">
<name>UNIX System V Boot Disk</name>
</disk>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" width="320px" pos="left" padTop="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}'>
<fdc id="fdcNEC" width="320px" pos="left" padTop="8px" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}'>
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<manifest ref="/disks/pcx86/dos/ibm/2.00/manifest.xml" disk="*"/>

View file

@ -764,7 +764,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/device">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>
@ -937,7 +937,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/fdc">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -282,16 +282,16 @@ function resolveXML(sXML, display, done)
* Iterate over all the attributes in the "referring" XML tag (sRefAttrs)
*/
var matchAttr;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/g;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/gi;
while ((matchAttr = reAttr.exec(sRefAttrs))) {
if (sXMLNewTag.indexOf(matchAttr[1]) < 0) {
if (sXMLNewTag.toLowerCase().indexOf(matchAttr[1].toLowerCase()) < 0) {
/*
* This is the append case
* This is the append case....
*/
sXMLNewTag = sXMLNewTag.replace(">", matchAttr[0] + ">");
} else {
/*
* This is the overwrite case
* This is the overwrite case....
*/
sXMLNewTag = sXMLNewTag.replace(new RegExp(matchAttr[1] + "(['\"])(.*?)\\1"), matchAttr[0]);
}

View file

@ -766,7 +766,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/device">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>
@ -939,7 +939,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/fdc">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"BASIC Programs",path:"/pubs/pc/programming/Graphics_for_the_IBM_PC/programs/disk.json"}}' pos="left" padLeft="8px" padBottom="8px">
<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"BASIC Programs",path:"/pubs/pc/programming/Graphics_for_the_IBM_PC/programs/disk.json"}}' pos="left" padLeft="8px" padBottom="8px">
<control type="list" binding="listDrives"/>
<control type="list" binding="listDisks">
<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml" disk="*"/>

View file

@ -38,12 +38,12 @@ Operation
---
To load TRACE.COM and TRACE.TXT onto a virtual disk image that PCjs can access, you can add an
"automount" setting to your PCjs <fdc> configuration that will dynamically generate a fresh disk image
"autoMount" setting to your PCjs <fdc> configuration that will dynamically generate a fresh disk image
every time the machine is loaded, via the DiskDump API. This is useful when you're constantly
generating new test results:
```xml
<fdc id="fdcNEC" automount='{B:{name:"Trace Tests",path:"/tests/pcx86/trace/trace.com;trace.txt"}}'/>
<fdc id="fdcNEC" autoMount='{B:{name:"Trace Tests",path:"/tests/pcx86/trace/trace.com;trace.txt"}}'/>
```
Alternatively, if you want to run the tests in another virtual PC environment (eg, VMware Fusion),

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -14066,16 +14066,16 @@ function resolveXML(sXML, display, done)
* Iterate over all the attributes in the "referring" XML tag (sRefAttrs)
*/
var matchAttr;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/g;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/gi;
while ((matchAttr = reAttr.exec(sRefAttrs))) {
if (sXMLNewTag.indexOf(matchAttr[1]) < 0) {
if (sXMLNewTag.toLowerCase().indexOf(matchAttr[1].toLowerCase()) < 0) {
/*
* This is the append case
* This is the append case....
*/
sXMLNewTag = sXMLNewTag.replace(">", matchAttr[0] + ">");
} else {
/*
* This is the overwrite case
* This is the overwrite case....
*/
sXMLNewTag = sXMLNewTag.replace(new RegExp(matchAttr[1] + "(['\"])(.*?)\\1"), matchAttr[0]);
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -764,7 +764,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/device">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>
@ -937,7 +937,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/fdc">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -25112,16 +25112,16 @@ function resolveXML(sXML, display, done)
* Iterate over all the attributes in the "referring" XML tag (sRefAttrs)
*/
var matchAttr;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/g;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/gi;
while ((matchAttr = reAttr.exec(sRefAttrs))) {
if (sXMLNewTag.indexOf(matchAttr[1]) < 0) {
if (sXMLNewTag.toLowerCase().indexOf(matchAttr[1].toLowerCase()) < 0) {
/*
* This is the append case
* This is the append case....
*/
sXMLNewTag = sXMLNewTag.replace(">", matchAttr[0] + ">");
} else {
/*
* This is the overwrite case
* This is the overwrite case....
*/
sXMLNewTag = sXMLNewTag.replace(new RegExp(matchAttr[1] + "(['\"])(.*?)\\1"), matchAttr[0]);
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -764,7 +764,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/device">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>
@ -937,7 +937,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/fdc">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -76456,16 +76456,16 @@ function resolveXML(sXML, display, done)
* Iterate over all the attributes in the "referring" XML tag (sRefAttrs)
*/
var matchAttr;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/g;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/gi;
while ((matchAttr = reAttr.exec(sRefAttrs))) {
if (sXMLNewTag.indexOf(matchAttr[1]) < 0) {
if (sXMLNewTag.toLowerCase().indexOf(matchAttr[1].toLowerCase()) < 0) {
/*
* This is the append case
* This is the append case....
*/
sXMLNewTag = sXMLNewTag.replace(">", matchAttr[0] + ">");
} else {
/*
* This is the overwrite case
* This is the overwrite case....
*/
sXMLNewTag = sXMLNewTag.replace(new RegExp(matchAttr[1] + "(['\"])(.*?)\\1"), matchAttr[0]);
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -764,7 +764,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/device">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>
@ -937,7 +937,7 @@
<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
<xsl:apply-templates select="document($componentFile)/fdc">
<xsl:with-param name="machine" select="$machine"/>
<xsl:with-param name="mount" select="@automount"/>
<xsl:with-param name="mount"><xsl:if test="@autoMount"><xsl:value-of select="@autoMount"/></xsl:if><xsl:if test="@automount"><xsl:value-of select="@automount"/></xsl:if></xsl:with-param>
</xsl:apply-templates>
</xsl:template>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -27823,16 +27823,16 @@ function resolveXML(sXML, display, done)
* Iterate over all the attributes in the "referring" XML tag (sRefAttrs)
*/
var matchAttr;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/g;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/gi;
while ((matchAttr = reAttr.exec(sRefAttrs))) {
if (sXMLNewTag.indexOf(matchAttr[1]) < 0) {
if (sXMLNewTag.toLowerCase().indexOf(matchAttr[1].toLowerCase()) < 0) {
/*
* This is the append case
* This is the append case....
*/
sXMLNewTag = sXMLNewTag.replace(">", matchAttr[0] + ">");
} else {
/*
* This is the overwrite case
* This is the overwrite case....
*/
sXMLNewTag = sXMLNewTag.replace(new RegExp(matchAttr[1] + "(['\"])(.*?)\\1"), matchAttr[0]);
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -31702,16 +31702,16 @@ function resolveXML(sXML, display, done)
* Iterate over all the attributes in the "referring" XML tag (sRefAttrs)
*/
var matchAttr;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/g;
var reAttr = /( [a-z]+=)(['"])(.*?)\2/gi;
while ((matchAttr = reAttr.exec(sRefAttrs))) {
if (sXMLNewTag.indexOf(matchAttr[1]) < 0) {
if (sXMLNewTag.toLowerCase().indexOf(matchAttr[1].toLowerCase()) < 0) {
/*
* This is the append case
* This is the append case....
*/
sXMLNewTag = sXMLNewTag.replace(">", matchAttr[0] + ">");
} else {
/*
* This is the overwrite case
* This is the overwrite case....
*/
sXMLNewTag = sXMLNewTag.replace(new RegExp(matchAttr[1] + "(['\"])(.*?)\\1"), matchAttr[0]);
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long