Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support for uncompiled scripts if pcjs_compiled set to false in _config.yml

Browse source
This commit is contained in:
Jeff Parsons 2015-12-09 12:51:24 -08:00
commit 629693ed8f
4 changed files with 106 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

68
_config.yml
View file

@ -20,3 +20,71 @@ kramdown:
# Custom site settings # Custom site settings
pcjs_domain: pcjs.net pcjs_domain: pcjs.net
pcjs_version: 1.20.1 pcjs_version: 1.20.1
pcjs_compiled: false
c1pjs_scripts:
- /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
pcjs_scripts:
- /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/x86.js
- /modules/pcjs/lib/interrupts.js
- /modules/pcjs/lib/messages.js
- /modules/pcjs/lib/panel.js
- /modules/pcjs/lib/bus.js
- /modules/pcjs/lib/memory.js
- /modules/pcjs/lib/cpu.js
- /modules/pcjs/lib/x86seg.js
- /modules/pcjs/lib/x86cpu.js
- /modules/pcjs/lib/x86fpu.js
- /modules/pcjs/lib/x86func.js
- /modules/pcjs/lib/x86ops.js
- /modules/pcjs/lib/x86op0f.js
- /modules/pcjs/lib/x86modb.js
- /modules/pcjs/lib/x86modw.js
- /modules/pcjs/lib/x86modb16.js
- /modules/pcjs/lib/x86modw16.js
- /modules/pcjs/lib/x86modb32.js
- /modules/pcjs/lib/x86modw32.js
- /modules/pcjs/lib/x86modsib.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/serialport.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

30
_includes/machine-engines.html
View file

@ -1,11 +1,27 @@
{% for machine in page.machines %} {% for machine in page.machines %}
{% capture machine_embed %}window.embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %} {% capture machine_embed %}window.embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %}
{% if machine.config %}{% capture machine_config %}{{ machine.config }}{% endcapture %}{% else %}{% assign machine_config = "machine.xml" %}{% endif %} {% unless machine.config %}
{% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.xsl{% endcapture %} {% assign machine_config = "machine.xml" %}
{% capture machine_script %}/{{ machine.type }}.js{% endcapture %} {% else %}
{% unless machine_scripts contains machine_script %} {% capture machine_config %}{{ machine.config }}{% endcapture %}
<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}{{ machine_script }}"></script>
{% endunless %} {% endunless %}
{% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %} {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.xsl{% endcapture %}
<script type="text/javascript">{{ machine_embed }}("{{ machine.id }}","{{ machine_config }}","{{ machine_template }}");</script> {% if site.pcjs_compiled %}
{% capture machine_script %}<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}{{ machine_script }}"></script>{% endcapture %}
{% unless machine_scripts contains machine_script %}
{{ machine_script }}
{% endunless %}
{% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %}
{% else %}
{% if machine.type == "pc" or machine.type == "pc-dbg" %}{% assign array_scripts = site.pcjs_scripts %}{% endif %}
{% if machine.type == "c1p" or machine.type == "c1p-dbg" %}{% assign array_scripts = site.c1pjs_scripts %}{% endif %}
{% for script in array_scripts %}
{% capture machine_script %}<script type="text/javascript" src="{{ site.baseurl }}{{ script }}"></script>{% endcapture %}
{% unless machine_scripts contains machine_script %}
{{ machine_script }}
{% endunless %}
{% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %}
{% endfor %}
{% endif %}
<script type="text/javascript">{{ machine_embed }}("{{ machine.id }}","{{ machine_config }}","{{ machine_template }}");</script>
{% endfor %} {% endfor %}

6
_includes/machine-styles.html
View file

@ -1,5 +1,9 @@
{% for machine in page.machines %} {% for machine in page.machines %}
{% capture machine_style %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.css{% endcapture %} {% unless site.pcjs_compiled %}
{% capture machine_style %}{{ site.baseurl }}/modules/{{ machine.type | remove:'-dbg' }}js/templates/components.css{% endcapture %}
{% else %}
{% capture machine_style %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.css{% endcapture %}
{% endunless %}
{% unless machine_styles contains machine_style %} {% unless machine_styles contains machine_style %}
<link rel="stylesheet" type="text/css" href="{{ machine_style }}"> <link rel="stylesheet" type="text/css" href="{{ machine_style }}">
{% endunless %} {% endunless %}

19
devices/c1p/machine/8kb/array/README.md
View file

@ -1,12 +1,13 @@
---
layout: page
title: OSI Challenger 1P (8Kb) "Server Array"
permalink: /devices/c1p/machine/8kb/array/
machines:
- type: c1p
id: osi1
---
Challenger 1P (8Kb) "Server Array" Challenger 1P (8Kb) "Server Array"
--- ---
[Machine #1](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI1") {% include machine.html id="osi1" %}
[Machine #2](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI2")
[Machine #3](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI3")
[Machine #4](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI4")
[Machine #5](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI5")
[Machine #6](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI6")
[Machine #7](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI7")
[Machine #8](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI8")
[Machine #9](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI9")