diff --git a/.editorconfig b/.editorconfig index 0c0dd7fa1..54208b256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ indent_style = tab indent_size = 8 trim_trailing_whitespace = true -[my_modules/**.js] +[modules/**.js] indent_style = space indent_size = 4 trim_trailing_whitespace = true diff --git a/Gruntfile.js b/Gruntfile.js index 859fee074..4b9860fbc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -77,7 +77,7 @@ * I added the "prepjs" task to perform the same constant inlining that my old PHP script "inline.php" * used to do as part of the old "jsmachines.net" build process. Unfortunately, Grunt appears to be * a real memory hog, and so "prepjs" had to be disabled until I could resolve that issue (see my notes - * in "my_modules/grunts/prepjs/tasks/prepjs.js" for details). + * in "modules/grunts/prepjs/tasks/prepjs.js" for details). * * With the current version of the Closure Compiler, I don't see any measurable performance benefit * to doing my own inlining, but I still wanted to port the code, partly in case I discover some benefit @@ -312,7 +312,7 @@ module.exports = function(grunt) { "c1pxsl": { files: [ { - cwd: "./my_modules/shared/templates/", + cwd: "./modules/shared/templates/", src: ["common.css", "common.xsl", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"], dest: "versions/c1pjs/<%= pkg.version %>/", expand: true @@ -330,7 +330,7 @@ module.exports = function(grunt) { "pcxsl": { files: [ { - cwd: "./my_modules/shared/templates/", + cwd: "./modules/shared/templates/", src: ["common.css", "common.xsl", "document.css", "document.xsl", "machine.xsl", "manifest.xsl", "outline.xsl"], dest: "versions/pcjs/<%= pkg.version %>/", expand: true @@ -348,7 +348,7 @@ module.exports = function(grunt) { "c1pjs": { files: [ { - cwd: "./my_modules/c1pjs-client/templates/", + cwd: "./modules/c1pjs/templates/", src: ["components.*"], dest: "versions/c1pjs/<%= pkg.version %>/", expand: true @@ -365,7 +365,7 @@ module.exports = function(grunt) { "pcjs": { files: [ { - cwd: "./my_modules/pcjs-client/templates/", + cwd: "./modules/pcjs/templates/", src: ["components.*"], dest: "versions/pcjs/<%= pkg.version %>/", expand: true @@ -398,7 +398,7 @@ module.exports = function(grunt) { run: { "delete-indexes": { options: {cwd: "."}, - cmd: "./my_modules/htmlout/bin/delete_indexes.sh", + cmd: "./modules/htmlout/bin/delete_indexes.sh", args: [] }, "zipify-demos": { @@ -438,8 +438,8 @@ module.exports = function(grunt) { grunt.loadNpmTasks("grunt-run"); grunt.loadNpmTasks("grunt-text-replace"); - grunt.loadTasks("my_modules/grunts/manifester/tasks"); - grunt.loadTasks("my_modules/grunts/prepjs/tasks"); + grunt.loadTasks("modules/grunts/manifester/tasks"); + grunt.loadTasks("modules/grunts/prepjs/tasks"); grunt.registerTask("preCompiler", grunt.option("rebuild")? ["concat:tmp-c1pjs", "concat:tmp-pcjs"] : ["newer:concat:tmp-c1pjs", "newer:concat:tmp-pcjs"]); diff --git a/README.md b/README.md index 3e1f979a8..3dafc5533 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,9 @@ operation. The project includes: - A simple Node-based web server ([server.js](server.js)) -- Custom Node modules used by the web server ([HTMLOut](my_modules/htmlout/), [MarkOut](my_modules/markout/), [DiskDump](my_modules/diskdump/), [FileDump](my_modules/filedump/)) +- Custom Node modules used by the web server ([HTMLOut](modules/htmlout/), [MarkOut](modules/markout/), [DiskDump](modules/diskdump/), [FileDump](modules/filedump/)) - A variety of IBM PC and C1P configuration and resource files (see [/apps](apps/), [/devices](devices/) and [/disks](disks/)) -- The [PCjs](my_modules/pcjs-client/lib/) and [C1Pjs](my_modules/c1pjs-client/lib/) client applications, both "compiled" and uncompiled +- The [PCjs](modules/pcjs/lib/) and [C1Pjs](modules/c1pjs/lib/) client applications, both "compiled" and uncompiled - A smattering of [PCjs](docs/pcjs/) and [C1Pjs](docs/c1pjs/) documentation, along with [blog posts](blog/), related [publications](pubs/) and more The bundled web server is not strictly required. Any web server (Node, Apache, Nginx, etc) that can serve the necessary @@ -77,7 +77,7 @@ included in the project, but unless all the resource files are moved into a sing [Demos](/docs/pcjs/demos/)), your browser will probably be unable to load all of them, due to security restrictions. Using the bundled web server is the preferred solution. -The project includes a large selection of disk images, and a powerful [DiskDump](my_modules/diskdump/) utility that +The project includes a large selection of disk images, and a powerful [DiskDump](modules/diskdump/) utility that runs on both the client and server, featuring a command-line interface (CLI) and web server API. Originally created to dump existing disk images as JSON, **DiskDump** has evolved into a full-featured disk image generator, capable of creating PC-compatible diskette *and* hard disk images from either lists *or* directories of files (including all subdirectories). @@ -189,7 +189,7 @@ Using PCjs The PCjs web server is little more than a file/directory browser for the PCjs project, plus a collection of APIs. If a URL corresponds to a PCjs project folder and no "index.html" exists in that folder, the server loads an HTML -template ([common.html](my_modules/shared/templates/common.html)) and generates an "index.html" for that folder. +template ([common.html](modules/shared/templates/common.html)) and generates an "index.html" for that folder. The contents of the "index.html" will vary depending on the contents of the folder; for example, if the folder contains a README.md, then that file is converted to HTML and embedded in the "index.html". Similarly, if the folder @@ -200,16 +200,16 @@ contains a machine XML file, that is embedded as well. The PCjs client app can also be run from the command-line mode using Node, making it possible to script the application, run a series of automated tests, etc: - cd my_modules/pcjs-client/bin + cd modules/pcjs/bin node pcjs -The [pcjs](my_modules/pcjs-client/bin/pcjs) script in [my_modules/pcjs-client/bin](my_modules/pcjs-client/bin) loads +The [pcjs](modules/pcjs/bin/pcjs) script in [modules/pcjs/bin](modules/pcjs/bin) loads all the PCjs browser scripts listed in the root [package.json](/package.json) and then starts a Node REPL ("read-eval-print loop"). The REPL handles a few special commands (eg, "load", "quit") and passes anything else to the PCjs Debugger component. If no Debugger component has been created yet, or if the Debugger didn't recognize the command, then it's passed on to *eval()*, like a good little REPL. -Use the "load" command to load a JSON machine configuration file. A sample [machine.json](my_modules/pcjs-client/bin/machine.json) +Use the "load" command to load a JSON machine configuration file. A sample [machine.json](modules/pcjs/bin/machine.json) is provided in the *bin* directory, which is a "JSON-ified" version of the [machine.xml](devices/pc/machine/5150/mda/64kb/machine.xml) displayed on the [pcjs.org](/) home page. @@ -242,7 +242,7 @@ Debugging PCjs ### Server Components -To help test/debug changes to PCjs server components (eg, [DiskDump](my_modules/diskdump/), [HTMLOut](my_modules/htmlout/)), +To help test/debug changes to PCjs server components (eg, [DiskDump](modules/diskdump/), [HTMLOut](modules/htmlout/)), you can start the server with some additional options; eg: node server.js --logging --console --debug @@ -320,14 +320,14 @@ closer to being released. In the course of testing PCjs, there may be stale "index.html" files that prevent you from seeing application updates, changes to README.md files, etc. So before running Node, you may want to "touch" the default HTML template: - touch my_modules/shared/templates/common.html + touch modules/shared/templates/common.html -The [HTMLOut](my_modules/htmlout/) module compares the timestamp of that template file to the timestamp of any +The [HTMLOut](modules/htmlout/) module compares the timestamp of that template file to the timestamp of any "index.html" and will regenerate the latter if it's out-of-date. There's a TODO to expand that check to include the timestamp of any local README.md file, but there are many other factors that can contribute to stale "index.html" files, so usually the safest thing to do is "touch" the -[common.html](my_modules/shared/templates/common.html) template, or delete all existing "index.html" files, either +[common.html](modules/shared/templates/common.html) template, or delete all existing "index.html" files, either manually or with the Grunt "clean" task: grunt clean diff --git a/bin/README.md b/bin/README.md index c83093279..fc8080cfb 100644 --- a/bin/README.md +++ b/bin/README.md @@ -1,12 +1,12 @@ Build Tools --- This is where all the server-side PHP code used to reside. I've since deleted that code from the project, -because it's all been ported to JavaScript as a collection of [Node Modules](/my_modules/); e.g.: +because it's all been ported to JavaScript as a collection of [Node Modules](/modules/); e.g.: -- [HTMLOut](/my_modules/htmlout/) -- [MarkOut](/my_modules/markout/) -- [DiskDump](/my_modules/diskdump/) -- [FileDump](/my_modules/filedump/) +- [HTMLOut](/modules/htmlout/) +- [MarkOut](/modules/markout/) +- [DiskDump](/modules/diskdump/) +- [FileDump](/modules/filedump/) All that remains here is the version of Google's Closure Compiler (and its associated [README](README)) used to build the client-side JavaScript files -- not because I have any attachment to this particular version, but because diff --git a/blog/2014/09/30/README.md b/blog/2014/09/30/README.md index 91bb17efe..075864342 100644 --- a/blog/2014/09/30/README.md +++ b/blog/2014/09/30/README.md @@ -83,7 +83,7 @@ define class constants. While we're talking about constants, it's important to be aware of constants that are not scoped to any particular component. -In [/my_modules/shared/lib/defines.js](/my_modules/shared/lib/defines.js), **DEBUG** is set to **TRUE**, +In [/modules/shared/lib/defines.js](/modules/shared/lib/defines.js), **DEBUG** is set to **TRUE**, enabling all debug-only code by default. It is also declared as a *@define* so that the Closure Compiler can override it, setting it to **FALSE** and disabling debug-only code. @@ -101,8 +101,8 @@ However, calls to debug-only instance methods seem to be more problematic, so al if (DEBUG) this.log('load("' + sFileURL + '")'); -There are a number of other important shared constants in [/my_modules/shared/lib/defines.js](/my_modules/shared/lib/defines.js) -and PCjs-specific constants in [/my_modules/pcjs-client/lib/defines.js](/my_modules/pcjs-client/lib/defines.js); refer +There are a number of other important shared constants in [/modules/shared/lib/defines.js](/modules/shared/lib/defines.js) +and PCjs-specific constants in [/modules/pcjs/lib/defines.js](/modules/pcjs/lib/defines.js); refer to those files for more information. ### Braces and Parentheses diff --git a/blog/2014/10/17/README.md b/blog/2014/10/17/README.md index 9c320c604..e085c9456 100644 --- a/blog/2014/10/17/README.md +++ b/blog/2014/10/17/README.md @@ -5,12 +5,12 @@ The [IBM PC AT "Rev 3"](/devices/pc/machine/5170/ega/1152kb/rev3/) machine confi v1.15.5 of PCjs now, which includes the following fixes: + The BIOS expects memory refresh to occur roughly every 16us, which I've resolved by tying the state -of the refresh bit in port 0x61 to bit 6 of the CPU cycle count (see *in8042RWReg()* in [chipset.js](/my_modules/pcjs-client/lib/chipset.js)); +of the refresh bit in port 0x61 to bit 6 of the CPU cycle count (see *in8042RWReg()* in [chipset.js](/modules/pcjs/lib/chipset.js)); the original AT BIOS was satisfied with a refresh bit that merely alternated, whereas the new AT BIOS is much more particular about the rate at which that bit changes, since many hard-coded delay-loops have now been replaced with code that waits for a specific number of refresh cycles. + The 8042 Keyboard Controller emulation needed a few more tweaks, mainly with respect to what happens -when the keyboard's "clock" line is toggled (see *set8042CmdData()* in [chipset.js](/my_modules/pcjs-client/lib/chipset.js)). +when the keyboard's "clock" line is toggled (see *set8042CmdData()* in [chipset.js](/modules/pcjs/lib/chipset.js)). + The Floppy Disk Controller needed to add support for the "READ ID" command, in order for the BIOS "double-stepping" test to work (double-stepping is required on an 80-track drive when attempting to read a 40-track diskette). @@ -23,7 +23,7 @@ with a BIOS that's almost 30 years old. after installing a second hard drive. So, when the CMOS reports only one hard drive installed, the BIOS probes for a second hard drive anyway, and it does so by simply writing the drive number to the ATC's "DRVHD" register and then immediately reading the "STATUS" register, without issuing any intervening command. -It was an easy fix to *outATCDrvHd()* in [hdc.js](/my_modules/pcjs-client/lib/hdc.js), but I was surprised +It was an easy fix to *outATCDrvHd()* in [hdc.js](/modules/pcjs/lib/hdc.js), but I was surprised to discover that the ATC had this behavior, and now I'm wondering how many other I/O operations require immediate "STATUS" register updates. diff --git a/devices/c1p/machine/8kb/large/debugger/local.html b/devices/c1p/machine/8kb/large/debugger/local.html index ac4e45e6c..6a81aabd1 100644 --- a/devices/c1p/machine/8kb/large/debugger/local.html +++ b/devices/c1p/machine/8kb/large/debugger/local.html @@ -6,8 +6,8 @@ - - + + @@ -52,26 +52,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/disks/pc/README.md b/disks/pc/README.md index 5c2fab726..47c3e2838 100644 --- a/disks/pc/README.md +++ b/disks/pc/README.md @@ -62,7 +62,7 @@ Pre-generated disk images are preferred to dynamically-generated images, and you VisiCalc License -The PCjs [DiskDump](/my_modules/diskdump/) module is used to create all our pre-generated JSON-encoded disk images. +The PCjs [DiskDump](/modules/diskdump/) module is used to create all our pre-generated JSON-encoded disk images. In the above example, a pre-generated disk image could be created from the command-line with either the "--dir" option (which will traverse all subdirectories as well): diff --git a/disks/pc/tools/microsoft/c/4.00/README.md b/disks/pc/tools/microsoft/c/4.00/README.md index 896f6f1c6..cfc9b838c 100644 --- a/disks/pc/tools/microsoft/c/4.00/README.md +++ b/disks/pc/tools/microsoft/c/4.00/README.md @@ -3,6 +3,6 @@ Microsoft C Compiler v4.00 [Manifest](manifest.xml) updated using: - find -L private -name "*" -type f -exec node ../../../../../../my_modules/diskdump/bin/diskdump --format=json --output=. --manifest --disk={} \; + find -L private -name "*" -type f -exec node ../../../../../../modules/diskdump/bin/diskdump --format=json --output=. --manifest --disk={} \; -The original diskettes are not part of the repository/website. \ No newline at end of file +The original diskettes are not part of the repository/website. diff --git a/disks/pc/xenix/8086/2.1.3/README.md b/disks/pc/xenix/8086/2.1.3/README.md index 11553ac31..7640bed22 100644 --- a/disks/pc/xenix/8086/2.1.3/README.md +++ b/disks/pc/xenix/8086/2.1.3/README.md @@ -14,4 +14,4 @@ Manifest Details [Manifest](manifest.xml) update using: - find -L private -name "*" -type f -exec node ../../../../../my_modules/diskdump/bin/diskdump --format=json --output=. --manifest --title="SCO Xenix 8086 Operating System v2.1.3" --disk={} \; + find -L private -name "*" -type f -exec node ../../../../../modules/diskdump/bin/diskdump --format=json --output=. --manifest --title="SCO Xenix 8086 Operating System v2.1.3" --disk={} \; diff --git a/my_modules/README.md b/modules/README.md similarity index 100% rename from my_modules/README.md rename to modules/README.md diff --git a/my_modules/c1pjs-client/lib/.jshintrc b/modules/c1pjs/lib/.jshintrc similarity index 100% rename from my_modules/c1pjs-client/lib/.jshintrc rename to modules/c1pjs/lib/.jshintrc diff --git a/my_modules/c1pjs-client/lib/computer.js b/modules/c1pjs/lib/computer.js similarity index 100% rename from my_modules/c1pjs-client/lib/computer.js rename to modules/c1pjs/lib/computer.js diff --git a/my_modules/c1pjs-client/lib/cpu.js b/modules/c1pjs/lib/cpu.js similarity index 100% rename from my_modules/c1pjs-client/lib/cpu.js rename to modules/c1pjs/lib/cpu.js diff --git a/my_modules/c1pjs-client/lib/debugger.js b/modules/c1pjs/lib/debugger.js similarity index 100% rename from my_modules/c1pjs-client/lib/debugger.js rename to modules/c1pjs/lib/debugger.js diff --git a/my_modules/c1pjs-client/lib/defines.js b/modules/c1pjs/lib/defines.js similarity index 100% rename from my_modules/c1pjs-client/lib/defines.js rename to modules/c1pjs/lib/defines.js diff --git a/my_modules/c1pjs-client/lib/disk.js b/modules/c1pjs/lib/disk.js similarity index 100% rename from my_modules/c1pjs-client/lib/disk.js rename to modules/c1pjs/lib/disk.js diff --git a/my_modules/c1pjs-client/lib/keyboard.js b/modules/c1pjs/lib/keyboard.js similarity index 100% rename from my_modules/c1pjs-client/lib/keyboard.js rename to modules/c1pjs/lib/keyboard.js diff --git a/my_modules/c1pjs-client/lib/nodebugger.js b/modules/c1pjs/lib/nodebugger.js similarity index 100% rename from my_modules/c1pjs-client/lib/nodebugger.js rename to modules/c1pjs/lib/nodebugger.js diff --git a/my_modules/c1pjs-client/lib/outline.xml b/modules/c1pjs/lib/outline.xml similarity index 98% rename from my_modules/c1pjs-client/lib/outline.xml rename to modules/c1pjs/lib/outline.xml index d42a8a4b9..d82a539a0 100644 --- a/my_modules/c1pjs-client/lib/outline.xml +++ b/modules/c1pjs/lib/outline.xml @@ -1,5 +1,5 @@ - + C1Pjs The following document describes the C1Pjs source code. @@ -94,4 +94,4 @@ but in general, you'll get much better performance -- both load-time and run-time -- by loading a single "compiled" JavaScript file.

Jeff Parsons
August 28, 2012

- \ No newline at end of file + diff --git a/my_modules/c1pjs-client/lib/panel.js b/modules/c1pjs/lib/panel.js similarity index 100% rename from my_modules/c1pjs-client/lib/panel.js rename to modules/c1pjs/lib/panel.js diff --git a/my_modules/c1pjs-client/lib/ram.js b/modules/c1pjs/lib/ram.js similarity index 100% rename from my_modules/c1pjs-client/lib/ram.js rename to modules/c1pjs/lib/ram.js diff --git a/my_modules/c1pjs-client/lib/rom.js b/modules/c1pjs/lib/rom.js similarity index 100% rename from my_modules/c1pjs-client/lib/rom.js rename to modules/c1pjs/lib/rom.js diff --git a/my_modules/c1pjs-client/lib/serial.js b/modules/c1pjs/lib/serial.js similarity index 100% rename from my_modules/c1pjs-client/lib/serial.js rename to modules/c1pjs/lib/serial.js diff --git a/my_modules/c1pjs-client/lib/video.js b/modules/c1pjs/lib/video.js similarity index 100% rename from my_modules/c1pjs-client/lib/video.js rename to modules/c1pjs/lib/video.js diff --git a/my_modules/c1pjs-client/templates/README.md b/modules/c1pjs/templates/README.md similarity index 100% rename from my_modules/c1pjs-client/templates/README.md rename to modules/c1pjs/templates/README.md diff --git a/my_modules/c1pjs-client/templates/components.css b/modules/c1pjs/templates/components.css similarity index 100% rename from my_modules/c1pjs-client/templates/components.css rename to modules/c1pjs/templates/components.css diff --git a/my_modules/c1pjs-client/templates/components.xsl b/modules/c1pjs/templates/components.xsl similarity index 99% rename from my_modules/c1pjs-client/templates/components.xsl rename to modules/c1pjs/templates/components.xsl index 843abb90c..643605f94 100644 --- a/my_modules/c1pjs-client/templates/components.xsl +++ b/modules/c1pjs/templates/components.xsl @@ -1,7 +1,7 @@ + ]> diff --git a/my_modules/diskdump/README.md b/modules/diskdump/README.md similarity index 84% rename from my_modules/diskdump/README.md rename to modules/diskdump/README.md index ca6e4ba84..a853dbf38 100644 --- a/my_modules/diskdump/README.md +++ b/modules/diskdump/README.md @@ -11,7 +11,7 @@ files/folders. For example, from the root directory of the project, you could run: - node my_modules/diskdump/bin/diskdump --path="apps/pc/1981/visicalc/README.md" --format=img --output=disk.img + node modules/diskdump/bin/diskdump --path="apps/pc/1981/visicalc/README.md" --format=img --output=disk.img to produce a `disk.img` containing one file, "README.md", which you could then mount on your local operating system *or* inside a PCjs machine. @@ -19,7 +19,7 @@ system *or* inside a PCjs machine. To make the disk image more useful, you might want to download a copy of [VisiCalc](http://www.bricklin.com/history/vcexecutable.htm) into that folder as well, so that you could then run: - node my_modules/diskdump/bin/diskdump --path="apps/pc/1981/visicalc/vc.com;README.md" --format=img --output=disk.img + node modules/diskdump/bin/diskdump --path="apps/pc/1981/visicalc/vc.com;README.md" --format=img --output=disk.img to produce a `disk.img` containing both "VC.COM" and "README.md". In fact, this is exactly how the [disk.json](/apps/pc/1981/visicalc/disk.json) stored in the [VisiCalc](/apps/pc/1981/visicalc/) folder was generated. diff --git a/my_modules/diskdump/bin/diskdump b/modules/diskdump/bin/diskdump similarity index 100% rename from my_modules/diskdump/bin/diskdump rename to modules/diskdump/bin/diskdump diff --git a/my_modules/diskdump/lib/diskdump.js b/modules/diskdump/lib/diskdump.js similarity index 99% rename from my_modules/diskdump/lib/diskdump.js rename to modules/diskdump/lib/diskdump.js index 00942479e..050b8305d 100644 --- a/my_modules/diskdump/lib/diskdump.js +++ b/modules/diskdump/lib/diskdump.js @@ -47,7 +47,7 @@ var str = require("../../shared/lib/strlib"); var usr = require("../../shared/lib/usrlib"); var DiskAPI = require("../../shared/lib/diskapi"); var DumpAPI = require("../../shared/lib/dumpapi"); -var X86 = require("../../pcjs-client/lib/x86"); +var X86 = require("../../pcjs/lib/x86"); /** * @class exports @@ -292,9 +292,9 @@ DiskDump.aDefaultBPBs = [ * * Examples * --- - * node my_modules/diskdump/bin/diskdump --disk=../jsmachines/disks/pc/games/infocom/zork1/zork1.dsk - * node my_modules/diskdump/bin/diskdump --dir=./apps/pc/1981/visicalc/ --format=img --output=./apps/pc/1981/visicalc/disk.img - * node my_modules/diskdump/bin/diskdump --path=./apps/pc/1981/visicalc/bin/vc.com;../README.md --format=json --output=./apps/pc/1981/visicalc/disk.json + * node modules/diskdump/bin/diskdump --disk=../jsmachines/disks/pc/games/infocom/zork1/zork1.dsk + * node modules/diskdump/bin/diskdump --dir=./apps/pc/1981/visicalc/ --format=img --output=./apps/pc/1981/visicalc/disk.img + * node modules/diskdump/bin/diskdump --path=./apps/pc/1981/visicalc/bin/vc.com;../README.md --format=json --output=./apps/pc/1981/visicalc/disk.json */ DiskDump.CLI = function() { diff --git a/my_modules/diskdump/package.json b/modules/diskdump/package.json similarity index 100% rename from my_modules/diskdump/package.json rename to modules/diskdump/package.json diff --git a/my_modules/filedump/README.md b/modules/filedump/README.md similarity index 100% rename from my_modules/filedump/README.md rename to modules/filedump/README.md diff --git a/my_modules/filedump/bin/filedump b/modules/filedump/bin/filedump similarity index 100% rename from my_modules/filedump/bin/filedump rename to modules/filedump/bin/filedump diff --git a/my_modules/filedump/lib/filedump.js b/modules/filedump/lib/filedump.js similarity index 100% rename from my_modules/filedump/lib/filedump.js rename to modules/filedump/lib/filedump.js diff --git a/my_modules/filedump/package.json b/modules/filedump/package.json similarity index 100% rename from my_modules/filedump/package.json rename to modules/filedump/package.json diff --git a/my_modules/grunts/README.md b/modules/grunts/README.md similarity index 100% rename from my_modules/grunts/README.md rename to modules/grunts/README.md diff --git a/my_modules/grunts/manifester/.gitignore b/modules/grunts/manifester/.gitignore similarity index 100% rename from my_modules/grunts/manifester/.gitignore rename to modules/grunts/manifester/.gitignore diff --git a/my_modules/grunts/manifester/.jshintrc b/modules/grunts/manifester/.jshintrc similarity index 100% rename from my_modules/grunts/manifester/.jshintrc rename to modules/grunts/manifester/.jshintrc diff --git a/my_modules/grunts/manifester/Gruntfile.js b/modules/grunts/manifester/Gruntfile.js similarity index 100% rename from my_modules/grunts/manifester/Gruntfile.js rename to modules/grunts/manifester/Gruntfile.js diff --git a/my_modules/grunts/manifester/LICENSE-MIT b/modules/grunts/manifester/LICENSE-MIT similarity index 100% rename from my_modules/grunts/manifester/LICENSE-MIT rename to modules/grunts/manifester/LICENSE-MIT diff --git a/my_modules/grunts/manifester/README.md b/modules/grunts/manifester/README.md similarity index 100% rename from my_modules/grunts/manifester/README.md rename to modules/grunts/manifester/README.md diff --git a/my_modules/grunts/manifester/package.json b/modules/grunts/manifester/package.json similarity index 100% rename from my_modules/grunts/manifester/package.json rename to modules/grunts/manifester/package.json diff --git a/my_modules/grunts/manifester/tasks/manifester.js b/modules/grunts/manifester/tasks/manifester.js similarity index 100% rename from my_modules/grunts/manifester/tasks/manifester.js rename to modules/grunts/manifester/tasks/manifester.js diff --git a/my_modules/grunts/manifester/test/expected/custom_options b/modules/grunts/manifester/test/expected/custom_options similarity index 100% rename from my_modules/grunts/manifester/test/expected/custom_options rename to modules/grunts/manifester/test/expected/custom_options diff --git a/my_modules/grunts/manifester/test/expected/default_options b/modules/grunts/manifester/test/expected/default_options similarity index 100% rename from my_modules/grunts/manifester/test/expected/default_options rename to modules/grunts/manifester/test/expected/default_options diff --git a/my_modules/grunts/manifester/test/fixtures/123 b/modules/grunts/manifester/test/fixtures/123 similarity index 100% rename from my_modules/grunts/manifester/test/fixtures/123 rename to modules/grunts/manifester/test/fixtures/123 diff --git a/my_modules/grunts/manifester/test/fixtures/testing b/modules/grunts/manifester/test/fixtures/testing similarity index 100% rename from my_modules/grunts/manifester/test/fixtures/testing rename to modules/grunts/manifester/test/fixtures/testing diff --git a/my_modules/grunts/manifester/test/manifester_test.js b/modules/grunts/manifester/test/manifester_test.js similarity index 100% rename from my_modules/grunts/manifester/test/manifester_test.js rename to modules/grunts/manifester/test/manifester_test.js diff --git a/my_modules/grunts/prepjs/.jshintrc b/modules/grunts/prepjs/.jshintrc similarity index 100% rename from my_modules/grunts/prepjs/.jshintrc rename to modules/grunts/prepjs/.jshintrc diff --git a/my_modules/grunts/prepjs/Gruntfile.js b/modules/grunts/prepjs/Gruntfile.js similarity index 95% rename from my_modules/grunts/prepjs/Gruntfile.js rename to modules/grunts/prepjs/Gruntfile.js index 4fbc96ffe..62d68cded 100644 --- a/my_modules/grunts/prepjs/Gruntfile.js +++ b/modules/grunts/prepjs/Gruntfile.js @@ -4,19 +4,19 @@ * * Copyright (c) 2014 jeffpar * Licensed under the MIT license. - * + * * Genesis: * * sudo npm install -g grunt-init * git clone git://github.com/gruntjs/grunt-init-gruntplugin.git ~/.grunt-init/gruntplugin - * cd ~/Sites/pcjs/my_modules + * cd ~/Sites/pcjs/modules * mkdir -p grunts/prepjs * cd grunts/prepjs * grunt-init gruntplugin * npm install - * + * * This file was generated at the "grunt-init gruntplugin" stage. Here's what that process looked like: - * + * * Running "init:gruntplugin" (init) task * This task will create one or more files in the current directory, based on the * environment and the answers to a few questions. Note that answering "?" to any @@ -31,9 +31,9 @@ * [?] Project name (grunt-prep) grunt-prepjs * [?] Description (The best Grunt plugin ever.) JS Preprocessor * [?] Version (0.1.0) - * [?] Project git repository (git://github.com/jeffpar/jsmachines.git) - * [?] Project homepage (https://github.com/jeffpar/jsmachines) - * [?] Project issues tracker (https://github.com/jeffpar/jsmachines/issues) + * [?] Project git repository (git://github.com/jeffpar/jsmachines.git) + * [?] Project homepage (https://github.com/jeffpar/jsmachines) + * [?] Project issues tracker (https://github.com/jeffpar/jsmachines/issues) * [?] Licenses (MIT) * [?] Author name (jeffpar) * [?] Author email (jeffpar@mac.com) @@ -63,17 +63,17 @@ * http://gruntjs.com/getting-started * * Done, without errors. - * + * * The process was a bit sloppy about trailing commas, though. I've cleaned those up, thanks to PhpStorm. - * + * * Online tutorials further recommended the following in my project's root: - * - * npm install my_modules/grunts/prepjs --save-dev - * + * + * npm install modules/grunts/prepjs --save-dev + * * However, all that does is make another copy of my "grunt-prepjs" module, inside the "node_modules" folders; * I can avoid that by simply including the following in my root Gruntfile.js: - * - * grunt.loadTasks("my_modules/grunts/prepjs/tasks"); + * + * grunt.loadTasks("modules/grunts/prepjs/tasks"); */ 'use strict'; diff --git a/my_modules/grunts/prepjs/LICENSE-MIT b/modules/grunts/prepjs/LICENSE-MIT similarity index 100% rename from my_modules/grunts/prepjs/LICENSE-MIT rename to modules/grunts/prepjs/LICENSE-MIT diff --git a/my_modules/grunts/prepjs/README.md b/modules/grunts/prepjs/README.md similarity index 100% rename from my_modules/grunts/prepjs/README.md rename to modules/grunts/prepjs/README.md diff --git a/my_modules/grunts/prepjs/package.json b/modules/grunts/prepjs/package.json similarity index 100% rename from my_modules/grunts/prepjs/package.json rename to modules/grunts/prepjs/package.json diff --git a/my_modules/grunts/prepjs/tasks/prepjs.js b/modules/grunts/prepjs/tasks/prepjs.js similarity index 100% rename from my_modules/grunts/prepjs/tasks/prepjs.js rename to modules/grunts/prepjs/tasks/prepjs.js diff --git a/my_modules/grunts/prepjs/test/expected/custom_options b/modules/grunts/prepjs/test/expected/custom_options similarity index 100% rename from my_modules/grunts/prepjs/test/expected/custom_options rename to modules/grunts/prepjs/test/expected/custom_options diff --git a/my_modules/grunts/prepjs/test/expected/default_options b/modules/grunts/prepjs/test/expected/default_options similarity index 100% rename from my_modules/grunts/prepjs/test/expected/default_options rename to modules/grunts/prepjs/test/expected/default_options diff --git a/my_modules/grunts/prepjs/test/fixtures/123 b/modules/grunts/prepjs/test/fixtures/123 similarity index 100% rename from my_modules/grunts/prepjs/test/fixtures/123 rename to modules/grunts/prepjs/test/fixtures/123 diff --git a/my_modules/grunts/prepjs/test/fixtures/testing b/modules/grunts/prepjs/test/fixtures/testing similarity index 100% rename from my_modules/grunts/prepjs/test/fixtures/testing rename to modules/grunts/prepjs/test/fixtures/testing diff --git a/my_modules/grunts/prepjs/test/prepjs_test.js b/modules/grunts/prepjs/test/prepjs_test.js similarity index 100% rename from my_modules/grunts/prepjs/test/prepjs_test.js rename to modules/grunts/prepjs/test/prepjs_test.js diff --git a/my_modules/htmlout/README.md b/modules/htmlout/README.md similarity index 100% rename from my_modules/htmlout/README.md rename to modules/htmlout/README.md diff --git a/my_modules/htmlout/bin/delete_indexes.sh b/modules/htmlout/bin/delete_indexes.sh similarity index 100% rename from my_modules/htmlout/bin/delete_indexes.sh rename to modules/htmlout/bin/delete_indexes.sh diff --git a/my_modules/htmlout/bin/htmlout b/modules/htmlout/bin/htmlout similarity index 100% rename from my_modules/htmlout/bin/htmlout rename to modules/htmlout/bin/htmlout diff --git a/my_modules/htmlout/lib/htmlout.js b/modules/htmlout/lib/htmlout.js similarity index 99% rename from my_modules/htmlout/lib/htmlout.js rename to modules/htmlout/lib/htmlout.js index b845d08ab..8218ea877 100644 --- a/my_modules/htmlout/lib/htmlout.js +++ b/modules/htmlout/lib/htmlout.js @@ -132,7 +132,7 @@ var sServerRoot = "/Users/Jeff/Sites/pcjs"; * template to use. */ var sDefaultFile = "index.html"; -var sTemplateFile = "./my_modules/shared/templates/common.html"; +var sTemplateFile = "./modules/shared/templates/common.html"; /* * sReadMeFile is the default markdown file to load and convert to HTML when a "readme" token is detected in an @@ -203,8 +203,7 @@ var asFilesNonListed = [ "robots.txt", "machine.xml", "manifest.xml", - "cache.manifest", - "my_modules" + "cache.manifest" ]; var asExtsNonListed = [ @@ -219,7 +218,6 @@ var asFilesNonServed = [ "bin", "debug", "grunts", - "lib", "logs", "node.log", "node_modules", @@ -375,7 +373,7 @@ function HTMLOut(sDir, sFile, fRebuild, req, done) * * Examples: * - * node my_modules/htmlout/bin/htmlout --dir=/ --console --rebuild + * node modules/htmlout/bin/htmlout --dir=/ --console --rebuild */ HTMLOut.CLI = function() { @@ -916,12 +914,12 @@ HTMLOut.prototype.getVersion = function(sToken, sIndent, aParms) * then we should be using "current" CSS and template files (as opposed to version-specific template files). * * NOTE: I used to create a symlink in each app's "versions" directory (eg, /versions/pcjs/current -> - * ../../my_modules/shared/templates), so that when fDebug was true, I could simply insert "current" in + * ../../modules/shared/templates), so that when fDebug was true, I could simply insert "current" in * place of a version number. However, that symlink didn't get added to the repository, and I'm not sure * all operating systems would deal with it properly even if was added, so now I'm treating the "version" * token as the equivalent of a symlink here. */ - this.aTokens[sToken] = this.fDebug? "../../my_modules/shared/templates" : pkg.version; + this.aTokens[sToken] = this.fDebug? "../../modules/shared/templates" : pkg.version; }; /** @@ -1341,7 +1339,7 @@ HTMLOut.prototype.getMachineXML = function(sToken, sIndent, aParms, sXMLFile, sS var sStyleSheet = aMatch[1]; /* * Recognized machine stylesheets are either "production" stylesheets in ("/versions/pcjs"|"/versions/c1pjs") - * or "development" stylesheets in ("/my_modules/pcjs-client/templates"|"/my_modules/c1pjs-client/templates"). + * or "development" stylesheets in ("/modules/pcjs/templates"|"/modules/c1pjs/templates"). * * The common denominator in both sets is either "/pc" or "/c1p", which in turn indicates the class of machine * (ie, "PC" or "C1P"). @@ -1687,7 +1685,7 @@ HTMLOut.prototype.getReadMe = function(sToken, sIndent, aParms, sPrevious) */ HTMLOut.prototype.getSocketScripts = function(sToken, sIndent, aParms) { - this.aTokens[sToken] = (fSockets? '\n' + sIndent + '' : ""); + this.aTokens[sToken] = (fSockets? '\n' + sIndent + '' : ""); }; /** @@ -1805,7 +1803,7 @@ HTMLOut.prototype.processMachines = function(aMachines, done) * Step 1: We need to find the client's "defines.js" source file, and follow it with "nodebugger.js". */ for (i = 0; i < asFiles.length; i++) { - if (asFiles[i].indexOf("-client/lib/defines.js") >= 0) { + if (asFiles[i].indexOf("js/lib/defines.js") >= 0) { asFiles.splice(i + 1, 0, asFiles[i].replace("defines.js", "nodebugger.js")); break; } diff --git a/my_modules/htmlout/lib/httpapi.js b/modules/htmlout/lib/httpapi.js similarity index 100% rename from my_modules/htmlout/lib/httpapi.js rename to modules/htmlout/lib/httpapi.js diff --git a/my_modules/htmlout/package.json b/modules/htmlout/package.json similarity index 100% rename from my_modules/htmlout/package.json rename to modules/htmlout/package.json diff --git a/my_modules/markout/README.md b/modules/markout/README.md similarity index 100% rename from my_modules/markout/README.md rename to modules/markout/README.md diff --git a/my_modules/markout/bin/markout b/modules/markout/bin/markout similarity index 100% rename from my_modules/markout/bin/markout rename to modules/markout/bin/markout diff --git a/my_modules/markout/lib/markout.js b/modules/markout/lib/markout.js similarity index 99% rename from my_modules/markout/lib/markout.js rename to modules/markout/lib/markout.js index 0b63cafbc..33bbb1f2a 100644 --- a/my_modules/markout/lib/markout.js +++ b/modules/markout/lib/markout.js @@ -141,7 +141,7 @@ function MarkOut(sMD, sIndent, req, aParms, fDebug) * * Examples: * - * node my_modules/markout/bin/markout --file=/my_modules/grunts/prepjs/README.md --debug + * node modules/markout/bin/markout --file=/modules/grunts/prepjs/README.md --debug */ MarkOut.CLI = function() { @@ -951,7 +951,7 @@ MarkOut.prototype.convertMDMachineLinks = function(sBlock) */ if (!sMachineXSLFile || sMachineXSLFile.indexOf("components.xsl") >= 0) { if (this.fDebug) { - sMachineXSLFile = "/my_modules/" + sMachineClass + "js-client/templates/components.xsl"; + sMachineXSLFile = "/modules/" + sMachineClass + "js/templates/components.xsl"; } } @@ -1014,7 +1014,7 @@ MarkOut.prototype.convertMDEmphasis = function(sBlock) * * but we do not. That's because a Markdown link like: * - * [my_modules](/my_modules/) + * [modules](/modules/) * * would otherwise be misconstrued as containing emphasis (and it doesn't * matter whether we process emphasis BEFORE or AFTER links -- an HTML link @@ -1025,11 +1025,11 @@ MarkOut.prototype.convertMDEmphasis = function(sBlock) * be whitespace, but we make it a bit more flexible, so that you can do things * like place emphasis INSIDE links: * - * [*my_modules*](/my_modules/) + * [*modules*](/modules/) * * or OUTSIDE links: * - * *[my_modules](/my_modules/)* + * *[modules](/modules/)* */ if (sBlock.indexOf('*') >= 0 || sBlock.indexOf('_') >= 0) { sBlock = sBlock.replace(/(^|[^a-z0-9])([\*_])\2([\s\S]*?)\2\2([^a-z0-9]|$)/gi, "$1$3$4"); diff --git a/my_modules/markout/package.json b/modules/markout/package.json similarity index 100% rename from my_modules/markout/package.json rename to modules/markout/package.json diff --git a/my_modules/pcjs-client/bin/.jshintrc b/modules/pcjs/bin/.jshintrc similarity index 100% rename from my_modules/pcjs-client/bin/.jshintrc rename to modules/pcjs/bin/.jshintrc diff --git a/my_modules/pcjs-client/bin/fptest.js b/modules/pcjs/bin/fptest.js similarity index 100% rename from my_modules/pcjs-client/bin/fptest.js rename to modules/pcjs/bin/fptest.js diff --git a/my_modules/pcjs-client/bin/machine.json b/modules/pcjs/bin/machine.json similarity index 100% rename from my_modules/pcjs-client/bin/machine.json rename to modules/pcjs/bin/machine.json diff --git a/my_modules/pcjs-client/bin/pcjs b/modules/pcjs/bin/pcjs similarity index 100% rename from my_modules/pcjs-client/bin/pcjs rename to modules/pcjs/bin/pcjs diff --git a/my_modules/pcjs-client/bin/x86gen.js b/modules/pcjs/bin/x86gen.js similarity index 100% rename from my_modules/pcjs-client/bin/x86gen.js rename to modules/pcjs/bin/x86gen.js diff --git a/my_modules/pcjs-client/lib/.jshintrc b/modules/pcjs/lib/.jshintrc similarity index 100% rename from my_modules/pcjs-client/lib/.jshintrc rename to modules/pcjs/lib/.jshintrc diff --git a/my_modules/pcjs-client/lib/README.md b/modules/pcjs/lib/README.md similarity index 73% rename from my_modules/pcjs-client/lib/README.md rename to modules/pcjs/lib/README.md index 52812990f..3f95e5219 100644 --- a/my_modules/pcjs-client/lib/README.md +++ b/modules/pcjs/lib/README.md @@ -27,32 +27,32 @@ At the time of this writing, the order is: * [shared/usrlib.js](../../shared/lib/usrlib.js) * [shared/weblib.js](../../shared/lib/weblib.js) * [shared/component.js](../../shared/lib/component.js) -* [pcjs-client/defines.js](defines.js) -* [pcjs-client/panel.js](panel.js) -* [pcjs-client/bus.js](bus.js) -* [pcjs-client/mem.js](mem.js) -* [pcjs-client/cpu.js](cpu.js) -* [pcjs-client/x86.js](x86.js) -* [pcjs-client/x86seg.js](x86seg.js) -* [pcjs-client/x86cpu.js](x86cpu.js) -* [pcjs-client/x86grps.js](x86grps.js) -* [pcjs-client/x86help.js](x86help.js) -* [pcjs-client/x86mods.js](x86mods.js) -* [pcjs-client/x86op0f.js](x86op0f.js) -* [pcjs-client/x86opxx.js](x86opxx.js) -* [pcjs-client/chipset.js](chipset.js) -* [pcjs-client/rom.js](rom.js) -* [pcjs-client/ram.js](ram.js) -* [pcjs-client/keyboard.js](keyboard.js) -* [pcjs-client/video.js](video.js) -* [pcjs-client/serial.js](serial.js) -* [pcjs-client/mouse.js](mouse.js) -* [pcjs-client/disk.js](disk.js) -* [pcjs-client/fdc.js](fdc.js) -* [pcjs-client/hdc.js](hdc.js) -* [pcjs-client/debugger.js](debugger.js) -* [pcjs-client/state.js](state.js) -* [pcjs-client/computer.js](computer.js) +* [pcjs/defines.js](defines.js) +* [pcjs/panel.js](panel.js) +* [pcjs/bus.js](bus.js) +* [pcjs/mem.js](mem.js) +* [pcjs/cpu.js](cpu.js) +* [pcjs/x86.js](x86.js) +* [pcjs/x86seg.js](x86seg.js) +* [pcjs/x86cpu.js](x86cpu.js) +* [pcjs/x86grps.js](x86grps.js) +* [pcjs/x86help.js](x86help.js) +* [pcjs/x86mods.js](x86mods.js) +* [pcjs/x86op0f.js](x86op0f.js) +* [pcjs/x86opxx.js](x86opxx.js) +* [pcjs/chipset.js](chipset.js) +* [pcjs/rom.js](rom.js) +* [pcjs/ram.js](ram.js) +* [pcjs/keyboard.js](keyboard.js) +* [pcjs/video.js](video.js) +* [pcjs/serial.js](serial.js) +* [pcjs/mouse.js](mouse.js) +* [pcjs/disk.js](disk.js) +* [pcjs/fdc.js](fdc.js) +* [pcjs/hdc.js](hdc.js) +* [pcjs/debugger.js](debugger.js) +* [pcjs/state.js](state.js) +* [pcjs/computer.js](computer.js) * [shared/embed.js](../../shared/lib/embed.js) Some of the modules *can* be reordered or even omitted (eg, [debugger.js](debugger.js) or diff --git a/my_modules/pcjs-client/lib/bus.js b/modules/pcjs/lib/bus.js similarity index 100% rename from my_modules/pcjs-client/lib/bus.js rename to modules/pcjs/lib/bus.js diff --git a/my_modules/pcjs-client/lib/chipset.js b/modules/pcjs/lib/chipset.js similarity index 100% rename from my_modules/pcjs-client/lib/chipset.js rename to modules/pcjs/lib/chipset.js diff --git a/my_modules/pcjs-client/lib/computer.js b/modules/pcjs/lib/computer.js similarity index 100% rename from my_modules/pcjs-client/lib/computer.js rename to modules/pcjs/lib/computer.js diff --git a/my_modules/pcjs-client/lib/cpu.js b/modules/pcjs/lib/cpu.js similarity index 100% rename from my_modules/pcjs-client/lib/cpu.js rename to modules/pcjs/lib/cpu.js diff --git a/my_modules/pcjs-client/lib/debugger.js b/modules/pcjs/lib/debugger.js similarity index 100% rename from my_modules/pcjs-client/lib/debugger.js rename to modules/pcjs/lib/debugger.js diff --git a/my_modules/pcjs-client/lib/defines.js b/modules/pcjs/lib/defines.js similarity index 100% rename from my_modules/pcjs-client/lib/defines.js rename to modules/pcjs/lib/defines.js diff --git a/my_modules/pcjs-client/lib/disk.js b/modules/pcjs/lib/disk.js similarity index 100% rename from my_modules/pcjs-client/lib/disk.js rename to modules/pcjs/lib/disk.js diff --git a/my_modules/pcjs-client/lib/fdc.js b/modules/pcjs/lib/fdc.js similarity index 100% rename from my_modules/pcjs-client/lib/fdc.js rename to modules/pcjs/lib/fdc.js diff --git a/my_modules/pcjs-client/lib/hdc.js b/modules/pcjs/lib/hdc.js similarity index 100% rename from my_modules/pcjs-client/lib/hdc.js rename to modules/pcjs/lib/hdc.js diff --git a/my_modules/pcjs-client/lib/keyboard.js b/modules/pcjs/lib/keyboard.js similarity index 100% rename from my_modules/pcjs-client/lib/keyboard.js rename to modules/pcjs/lib/keyboard.js diff --git a/my_modules/pcjs-client/lib/mem.js b/modules/pcjs/lib/mem.js similarity index 100% rename from my_modules/pcjs-client/lib/mem.js rename to modules/pcjs/lib/mem.js diff --git a/my_modules/pcjs-client/lib/mouse.js b/modules/pcjs/lib/mouse.js similarity index 100% rename from my_modules/pcjs-client/lib/mouse.js rename to modules/pcjs/lib/mouse.js diff --git a/my_modules/pcjs-client/lib/nodebugger.js b/modules/pcjs/lib/nodebugger.js similarity index 100% rename from my_modules/pcjs-client/lib/nodebugger.js rename to modules/pcjs/lib/nodebugger.js diff --git a/my_modules/pcjs-client/lib/panel.js b/modules/pcjs/lib/panel.js similarity index 100% rename from my_modules/pcjs-client/lib/panel.js rename to modules/pcjs/lib/panel.js diff --git a/my_modules/pcjs-client/lib/ram.js b/modules/pcjs/lib/ram.js similarity index 100% rename from my_modules/pcjs-client/lib/ram.js rename to modules/pcjs/lib/ram.js diff --git a/my_modules/pcjs-client/lib/rom.js b/modules/pcjs/lib/rom.js similarity index 100% rename from my_modules/pcjs-client/lib/rom.js rename to modules/pcjs/lib/rom.js diff --git a/my_modules/pcjs-client/lib/serial.js b/modules/pcjs/lib/serial.js similarity index 100% rename from my_modules/pcjs-client/lib/serial.js rename to modules/pcjs/lib/serial.js diff --git a/my_modules/pcjs-client/lib/state.js b/modules/pcjs/lib/state.js similarity index 100% rename from my_modules/pcjs-client/lib/state.js rename to modules/pcjs/lib/state.js diff --git a/my_modules/pcjs-client/lib/video.js b/modules/pcjs/lib/video.js similarity index 100% rename from my_modules/pcjs-client/lib/video.js rename to modules/pcjs/lib/video.js diff --git a/my_modules/pcjs-client/lib/x86.js b/modules/pcjs/lib/x86.js similarity index 100% rename from my_modules/pcjs-client/lib/x86.js rename to modules/pcjs/lib/x86.js diff --git a/my_modules/pcjs-client/lib/x86cpu.js b/modules/pcjs/lib/x86cpu.js similarity index 100% rename from my_modules/pcjs-client/lib/x86cpu.js rename to modules/pcjs/lib/x86cpu.js diff --git a/my_modules/pcjs-client/lib/x86grps.js b/modules/pcjs/lib/x86grps.js similarity index 100% rename from my_modules/pcjs-client/lib/x86grps.js rename to modules/pcjs/lib/x86grps.js diff --git a/my_modules/pcjs-client/lib/x86help.js b/modules/pcjs/lib/x86help.js similarity index 100% rename from my_modules/pcjs-client/lib/x86help.js rename to modules/pcjs/lib/x86help.js diff --git a/my_modules/pcjs-client/lib/x86mods.js b/modules/pcjs/lib/x86mods.js similarity index 100% rename from my_modules/pcjs-client/lib/x86mods.js rename to modules/pcjs/lib/x86mods.js diff --git a/my_modules/pcjs-client/lib/x86op0f.js b/modules/pcjs/lib/x86op0f.js similarity index 100% rename from my_modules/pcjs-client/lib/x86op0f.js rename to modules/pcjs/lib/x86op0f.js diff --git a/my_modules/pcjs-client/lib/x86opxx.js b/modules/pcjs/lib/x86opxx.js similarity index 100% rename from my_modules/pcjs-client/lib/x86opxx.js rename to modules/pcjs/lib/x86opxx.js diff --git a/my_modules/pcjs-client/lib/x86seg.js b/modules/pcjs/lib/x86seg.js similarity index 100% rename from my_modules/pcjs-client/lib/x86seg.js rename to modules/pcjs/lib/x86seg.js diff --git a/my_modules/pcjs-client/package.json b/modules/pcjs/package.json similarity index 100% rename from my_modules/pcjs-client/package.json rename to modules/pcjs/package.json diff --git a/my_modules/pcjs-client/templates/README.md b/modules/pcjs/templates/README.md similarity index 100% rename from my_modules/pcjs-client/templates/README.md rename to modules/pcjs/templates/README.md diff --git a/my_modules/pcjs-client/templates/components.css b/modules/pcjs/templates/components.css similarity index 100% rename from my_modules/pcjs-client/templates/components.css rename to modules/pcjs/templates/components.css diff --git a/my_modules/pcjs-client/templates/components.xsl b/modules/pcjs/templates/components.xsl similarity index 99% rename from my_modules/pcjs-client/templates/components.xsl rename to modules/pcjs/templates/components.xsl index d0f5f0fdd..846f71648 100644 --- a/my_modules/pcjs-client/templates/components.xsl +++ b/modules/pcjs/templates/components.xsl @@ -1,7 +1,7 @@ + ]> diff --git a/my_modules/shared/lib/README.md b/modules/shared/lib/README.md similarity index 100% rename from my_modules/shared/lib/README.md rename to modules/shared/lib/README.md diff --git a/my_modules/shared/lib/component.js b/modules/shared/lib/component.js similarity index 100% rename from my_modules/shared/lib/component.js rename to modules/shared/lib/component.js diff --git a/my_modules/shared/lib/defines.js b/modules/shared/lib/defines.js similarity index 100% rename from my_modules/shared/lib/defines.js rename to modules/shared/lib/defines.js diff --git a/my_modules/shared/lib/diskapi.js b/modules/shared/lib/diskapi.js similarity index 100% rename from my_modules/shared/lib/diskapi.js rename to modules/shared/lib/diskapi.js diff --git a/my_modules/shared/lib/dumpapi.js b/modules/shared/lib/dumpapi.js similarity index 100% rename from my_modules/shared/lib/dumpapi.js rename to modules/shared/lib/dumpapi.js diff --git a/my_modules/shared/lib/embed.js b/modules/shared/lib/embed.js similarity index 99% rename from my_modules/shared/lib/embed.js rename to modules/shared/lib/embed.js index 842873863..5eaf93a62 100644 --- a/my_modules/shared/lib/embed.js +++ b/modules/shared/lib/embed.js @@ -322,7 +322,7 @@ function embedMachine(sName, sVersion, idElement, sXMLFile, sXSLFile, sStateFile var sAppClass = sName.toLowerCase(); // eg, "pcjs" or "c1pjs" if (!sXSLFile) { if (DEBUG && sVersion == "1.x.x") { - sXSLFile = "/my_modules/" + sAppClass + "-client/templates/components.xsl"; + sXSLFile = "/modules/" + sAppClass + "/templates/components.xsl"; } else { sXSLFile = "/versions/" + sAppClass + "/" + sVersion + "/components.xsl"; } diff --git a/my_modules/shared/lib/externs.js b/modules/shared/lib/externs.js similarity index 100% rename from my_modules/shared/lib/externs.js rename to modules/shared/lib/externs.js diff --git a/my_modules/shared/lib/netlib.js b/modules/shared/lib/netlib.js similarity index 100% rename from my_modules/shared/lib/netlib.js rename to modules/shared/lib/netlib.js diff --git a/my_modules/shared/lib/nodebug.js b/modules/shared/lib/nodebug.js similarity index 100% rename from my_modules/shared/lib/nodebug.js rename to modules/shared/lib/nodebug.js diff --git a/my_modules/shared/lib/proclib.js b/modules/shared/lib/proclib.js similarity index 100% rename from my_modules/shared/lib/proclib.js rename to modules/shared/lib/proclib.js diff --git a/my_modules/shared/lib/reportapi.js b/modules/shared/lib/reportapi.js similarity index 100% rename from my_modules/shared/lib/reportapi.js rename to modules/shared/lib/reportapi.js diff --git a/my_modules/shared/lib/sockets.js b/modules/shared/lib/sockets.js similarity index 100% rename from my_modules/shared/lib/sockets.js rename to modules/shared/lib/sockets.js diff --git a/my_modules/shared/lib/strlib.js b/modules/shared/lib/strlib.js similarity index 100% rename from my_modules/shared/lib/strlib.js rename to modules/shared/lib/strlib.js diff --git a/my_modules/shared/lib/userapi.js b/modules/shared/lib/userapi.js similarity index 100% rename from my_modules/shared/lib/userapi.js rename to modules/shared/lib/userapi.js diff --git a/my_modules/shared/lib/usrlib.js b/modules/shared/lib/usrlib.js similarity index 100% rename from my_modules/shared/lib/usrlib.js rename to modules/shared/lib/usrlib.js diff --git a/my_modules/shared/lib/weblib.js b/modules/shared/lib/weblib.js similarity index 100% rename from my_modules/shared/lib/weblib.js rename to modules/shared/lib/weblib.js diff --git a/my_modules/shared/templates/.gitignore b/modules/shared/templates/.gitignore similarity index 100% rename from my_modules/shared/templates/.gitignore rename to modules/shared/templates/.gitignore diff --git a/my_modules/shared/templates/README.md b/modules/shared/templates/README.md similarity index 92% rename from my_modules/shared/templates/README.md rename to modules/shared/templates/README.md index e4cb160da..85add3174 100644 --- a/my_modules/shared/templates/README.md +++ b/modules/shared/templates/README.md @@ -8,7 +8,7 @@ Template folders contain a variety of XML and HTML templates and supporting file - CSS files (stylesheets that the XSL files rely upon) - HTML files (HTML fragments used to generate part or all of a web page) -[*common.html*](common.html) is the HTML template file used by the [HTMLOut](/my_modules/htmlout/) module +[*common.html*](common.html) is the HTML template file used by the [HTMLOut](/modules/htmlout/) module to generate a default HTML file ("index.html") for any folder that only has a "README.md", or a "machine.xml", or none of the above. @@ -27,7 +27,7 @@ document; it may even contain a reference to a machine XML file. which is a more grandiose version of [*machine.xsl*](machine.xsl), designed to support XML-based documentation that could also contain embedded machine XML files. However, I've since moved away from that approach, in favor of simple README.md files that are more flexible and work nicely with GitHub. Also, by rendering them with our own -minimalistic Markdown converter, [MarkOut](/my_modules/markout/), it's also very easy to embed virtual machines +minimalistic Markdown converter, [MarkOut](/modules/markout/), it's also very easy to embed virtual machines in a README.md document. Since the XML document syntax that [*outline.xsl*](outline.xsl) supports was never very well documented, I'm tempted diff --git a/my_modules/shared/templates/common.css b/modules/shared/templates/common.css similarity index 100% rename from my_modules/shared/templates/common.css rename to modules/shared/templates/common.css diff --git a/my_modules/shared/templates/common.html b/modules/shared/templates/common.html similarity index 100% rename from my_modules/shared/templates/common.html rename to modules/shared/templates/common.html diff --git a/my_modules/shared/templates/common.xsl b/modules/shared/templates/common.xsl similarity index 96% rename from my_modules/shared/templates/common.xsl rename to modules/shared/templates/common.xsl index 0520dd71f..b419319a4 100644 --- a/my_modules/shared/templates/common.xsl +++ b/modules/shared/templates/common.xsl @@ -11,7 +11,7 @@ - + diff --git a/my_modules/shared/templates/dictionary.txt b/modules/shared/templates/dictionary.txt similarity index 100% rename from my_modules/shared/templates/dictionary.txt rename to modules/shared/templates/dictionary.txt diff --git a/my_modules/shared/templates/document.css b/modules/shared/templates/document.css similarity index 100% rename from my_modules/shared/templates/document.css rename to modules/shared/templates/document.css diff --git a/my_modules/shared/templates/document.xsl b/modules/shared/templates/document.xsl similarity index 100% rename from my_modules/shared/templates/document.xsl rename to modules/shared/templates/document.xsl diff --git a/my_modules/shared/templates/entities.dtd b/modules/shared/templates/entities.dtd similarity index 100% rename from my_modules/shared/templates/entities.dtd rename to modules/shared/templates/entities.dtd diff --git a/my_modules/shared/templates/machine.xsl b/modules/shared/templates/machine.xsl similarity index 97% rename from my_modules/shared/templates/machine.xsl rename to modules/shared/templates/machine.xsl index d51978e93..1c1875db3 100644 --- a/my_modules/shared/templates/machine.xsl +++ b/modules/shared/templates/machine.xsl @@ -11,7 +11,7 @@ - + diff --git a/my_modules/shared/templates/manifest.xsl b/modules/shared/templates/manifest.xsl similarity index 99% rename from my_modules/shared/templates/manifest.xsl rename to modules/shared/templates/manifest.xsl index 7b551eaea..1a500355b 100644 --- a/my_modules/shared/templates/manifest.xsl +++ b/modules/shared/templates/manifest.xsl @@ -11,7 +11,7 @@ - + diff --git a/my_modules/shared/templates/outline.xsl b/modules/shared/templates/outline.xsl similarity index 96% rename from my_modules/shared/templates/outline.xsl rename to modules/shared/templates/outline.xsl index 5e7fac704..f0bea6aa1 100644 --- a/my_modules/shared/templates/outline.xsl +++ b/modules/shared/templates/outline.xsl @@ -12,7 +12,7 @@ - + diff --git a/my_modules/shared/templates/analytics.html b/my_modules/shared/templates/analytics.html deleted file mode 100644 index dee7d4d9b..000000000 --- a/my_modules/shared/templates/analytics.html +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/package.json b/package.json index cc1fb6bf8..2a2f69069 100644 --- a/package.json +++ b/package.json @@ -59,71 +59,71 @@ "replace": "^0.2.9" }, "closureCompilerExterns": [ - "./my_modules/shared/lib/externs.js" + "./modules/shared/lib/externs.js" ], "c1pCSSFiles": [ - "./my_modules/c1pjs-client/templates/components.css" + "./modules/c1pjs/templates/components.css" ], "c1pJSFiles": [ - "./my_modules/shared/lib/defines.js", - "./my_modules/shared/lib/dumpapi.js", - "./my_modules/shared/lib/reportapi.js", - "./my_modules/shared/lib/strlib.js", - "./my_modules/shared/lib/usrlib.js", - "./my_modules/shared/lib/weblib.js", - "./my_modules/shared/lib/component.js", - "./my_modules/c1pjs-client/lib/defines.js", - "./my_modules/c1pjs-client/lib/panel.js", - "./my_modules/c1pjs-client/lib/cpu.js", - "./my_modules/c1pjs-client/lib/rom.js", - "./my_modules/c1pjs-client/lib/ram.js", - "./my_modules/c1pjs-client/lib/keyboard.js", - "./my_modules/c1pjs-client/lib/video.js", - "./my_modules/c1pjs-client/lib/serial.js", - "./my_modules/c1pjs-client/lib/disk.js", - "./my_modules/c1pjs-client/lib/debugger.js", - "./my_modules/c1pjs-client/lib/computer.js", - "./my_modules/shared/lib/embed.js" + "./modules/shared/lib/defines.js", + "./modules/shared/lib/dumpapi.js", + "./modules/shared/lib/reportapi.js", + "./modules/shared/lib/strlib.js", + "./modules/shared/lib/usrlib.js", + "./modules/shared/lib/weblib.js", + "./modules/shared/lib/component.js", + "./modules/c1pjs/lib/defines.js", + "./modules/c1pjs/lib/panel.js", + "./modules/c1pjs/lib/cpu.js", + "./modules/c1pjs/lib/rom.js", + "./modules/c1pjs/lib/ram.js", + "./modules/c1pjs/lib/keyboard.js", + "./modules/c1pjs/lib/video.js", + "./modules/c1pjs/lib/serial.js", + "./modules/c1pjs/lib/disk.js", + "./modules/c1pjs/lib/debugger.js", + "./modules/c1pjs/lib/computer.js", + "./modules/shared/lib/embed.js" ], "pcCSSFiles": [ - "./my_modules/pcjs-client/templates/components.css" + "./modules/pcjs/templates/components.css" ], "pcJSFiles": [ - "./my_modules/shared/lib/defines.js", - "./my_modules/shared/lib/diskapi.js", - "./my_modules/shared/lib/dumpapi.js", - "./my_modules/shared/lib/reportapi.js", - "./my_modules/shared/lib/userapi.js", - "./my_modules/shared/lib/strlib.js", - "./my_modules/shared/lib/usrlib.js", - "./my_modules/shared/lib/weblib.js", - "./my_modules/shared/lib/component.js", - "./my_modules/pcjs-client/lib/defines.js", - "./my_modules/pcjs-client/lib/panel.js", - "./my_modules/pcjs-client/lib/bus.js", - "./my_modules/pcjs-client/lib/mem.js", - "./my_modules/pcjs-client/lib/cpu.js", - "./my_modules/pcjs-client/lib/x86.js", - "./my_modules/pcjs-client/lib/x86seg.js", - "./my_modules/pcjs-client/lib/x86cpu.js", - "./my_modules/pcjs-client/lib/x86grps.js", - "./my_modules/pcjs-client/lib/x86help.js", - "./my_modules/pcjs-client/lib/x86mods.js", - "./my_modules/pcjs-client/lib/x86op0f.js", - "./my_modules/pcjs-client/lib/x86opxx.js", - "./my_modules/pcjs-client/lib/chipset.js", - "./my_modules/pcjs-client/lib/rom.js", - "./my_modules/pcjs-client/lib/ram.js", - "./my_modules/pcjs-client/lib/keyboard.js", - "./my_modules/pcjs-client/lib/video.js", - "./my_modules/pcjs-client/lib/serial.js", - "./my_modules/pcjs-client/lib/mouse.js", - "./my_modules/pcjs-client/lib/disk.js", - "./my_modules/pcjs-client/lib/fdc.js", - "./my_modules/pcjs-client/lib/hdc.js", - "./my_modules/pcjs-client/lib/debugger.js", - "./my_modules/pcjs-client/lib/state.js", - "./my_modules/pcjs-client/lib/computer.js", - "./my_modules/shared/lib/embed.js" + "./modules/shared/lib/defines.js", + "./modules/shared/lib/diskapi.js", + "./modules/shared/lib/dumpapi.js", + "./modules/shared/lib/reportapi.js", + "./modules/shared/lib/userapi.js", + "./modules/shared/lib/strlib.js", + "./modules/shared/lib/usrlib.js", + "./modules/shared/lib/weblib.js", + "./modules/shared/lib/component.js", + "./modules/pcjs/lib/defines.js", + "./modules/pcjs/lib/panel.js", + "./modules/pcjs/lib/bus.js", + "./modules/pcjs/lib/mem.js", + "./modules/pcjs/lib/cpu.js", + "./modules/pcjs/lib/x86.js", + "./modules/pcjs/lib/x86seg.js", + "./modules/pcjs/lib/x86cpu.js", + "./modules/pcjs/lib/x86grps.js", + "./modules/pcjs/lib/x86help.js", + "./modules/pcjs/lib/x86mods.js", + "./modules/pcjs/lib/x86op0f.js", + "./modules/pcjs/lib/x86opxx.js", + "./modules/pcjs/lib/chipset.js", + "./modules/pcjs/lib/rom.js", + "./modules/pcjs/lib/ram.js", + "./modules/pcjs/lib/keyboard.js", + "./modules/pcjs/lib/video.js", + "./modules/pcjs/lib/serial.js", + "./modules/pcjs/lib/mouse.js", + "./modules/pcjs/lib/disk.js", + "./modules/pcjs/lib/fdc.js", + "./modules/pcjs/lib/hdc.js", + "./modules/pcjs/lib/debugger.js", + "./modules/pcjs/lib/state.js", + "./modules/pcjs/lib/computer.js", + "./modules/shared/lib/embed.js" ] } diff --git a/server.js b/server.js index eeabd312c..1d583bca5 100644 --- a/server.js +++ b/server.js @@ -51,7 +51,7 @@ var http = require("http"); var express = require("express"); var slash = require("express-slash"); -var proclib = require("./my_modules/shared/lib/proclib"); +var proclib = require("./modules/shared/lib/proclib"); var args = proclib.getArgs(); var fCache = (args.argv['cache'] === undefined? true : args.argv['cache']); @@ -61,7 +61,7 @@ var fLogging = (args.argv['logging'] === undefined? false : args.argv['logging'] var fRebuild = (args.argv['rebuild'] === undefined? false : args.argv['rebuild']); var fSockets = (args.argv['sockets'] === undefined? false : args.argv['sockets']); -var HTMLOut = require("./my_modules/htmlout"); +var HTMLOut = require("./modules/htmlout"); var sServerRoot = __dirname; HTMLOut.setRoot(sServerRoot);