From 46b83d6ba485d8f0a9663e9394dcf5f7c2135950 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Thu, 5 Aug 2010 22:50:19 +0000 Subject: [PATCH] Included Breadbox64 into cc65 binary relaease tools. This additional application results in three disks for the Apple2, two disks for the C64 and one disk for the C128. Therefore the download page can't get along anymore without some JavaScript adjusting the number of downloadable disks depending on the selected machine. With JavaScript turned off access to non-existent disks (i.e. disk 3 for the C64) results in a successfull download of a zero byte sized file - not exactly great but at least a defined behaviour. --- tools/6502/Makefile | 70 +++++++++++++++++++++++++---------------- tools/6502/contiki.html | 20 +++++++++--- tools/6502/download.php | 16 +++++++--- 3 files changed, 70 insertions(+), 36 deletions(-) diff --git a/tools/6502/Makefile b/tools/6502/Makefile index 80cf06320..846ab3cb3 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -30,7 +30,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile,v 1.4 2010/03/31 06:05:37 oliverschmidt Exp $ +# $Id: Makefile,v 1.5 2010/08/05 22:50:19 oliverschmidt Exp $ # ifndef CC65_HOME @@ -45,7 +45,7 @@ ifndef C1541 ${error C1541 not defined! You must specify where VICE c1541 resides} endif -disks: apple2enh-1-disk apple2enh-2-disk c64-1-disk c64-2-disk c128-disk +disks: apple2enh-1-disk apple2enh-2-disk apple2enh-3-disk c64-1-disk c64-2-disk c128-1-disk apple2enh-1-disk: cp ../apple2enh/prodos.dsk contiki-1.dsk @@ -69,16 +69,30 @@ apple2enh-2-disk: cp ../apple2enh/prodos.dsk contiki-2.dsk java -jar $(AC) -p contiki-2.dsk contiki.cfg bin 0 < dummy.cfg java -jar $(AC) -p contiki-2.dsk menu.system sys 0 < ../apple2enh/menu.system + java -jar $(AC) -p contiki-2.dsk dhcp.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-2.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh java -jar $(AC) -p contiki-2.dsk wget.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-2.dsk wget bin < ../../examples/wget/wget.apple2enh java -jar $(AC) -p contiki-2.dsk irc.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-2.dsk irc bin < ../../examples/irc/irc-client.apple2enh - java -jar $(AC) -p contiki-2.dsk email.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-2.dsk email bin < ../../examples/email/email-client.apple2enh java -jar $(AC) -p contiki-2.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth java -jar $(AC) -p contiki-2.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth java -jar $(AC) -p contiki-2.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou +apple2enh-3-disk: + cp ../apple2enh/prodos.dsk contiki-3.dsk + java -jar $(AC) -p contiki-3.dsk contiki.cfg bin 0 < dummy.cfg + java -jar $(AC) -p contiki-3.dsk menu.system sys 0 < ../apple2enh/menu.system + java -jar $(AC) -p contiki-3.dsk dhcp.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-3.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh + java -jar $(AC) -p contiki-3.dsk email.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-3.dsk email bin < ../../examples/email/email-client.apple2enh + java -jar $(AC) -p contiki-3.dsk breadbox.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-3.dsk breadbox bin < ../../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh + java -jar $(AC) -p contiki-3.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth + java -jar $(AC) -p contiki-3.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth + java -jar $(AC) -p contiki-3.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + c64-1-disk: $(C1541) -format contiki,00 d64 contiki-1.d64 $(C1541) -attach contiki-1.d64 -write dummy.cfg contiki.cfg,u @@ -96,27 +110,29 @@ c64-1-disk: c64-2-disk: $(C1541) -format contiki,00 d64 contiki-2.d64 - $(C1541) -attach contiki-2.d64 -write dummy.cfg contiki.cfg,u - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/dhcp-client.c64 dhcp,p - $(C1541) -attach contiki-2.d64 -write ../../examples/irc/irc-client.c64 irc,p - $(C1541) -attach contiki-2.d64 -write ../../examples/email/email-client.c64 email,p - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u - $(C1541) -attach contiki-2.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u + $(C1541) -attach contiki-2.d64 -write dummy.cfg contiki.cfg,u + $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/dhcp-client.c64 dhcp,p + $(C1541) -attach contiki-2.d64 -write ../../examples/irc/irc-client.c64 irc,p + $(C1541) -attach contiki-2.d64 -write ../../examples/email/email-client.c64 email,p + $(C1541) -attach contiki-2.d64 -write ../../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p + $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-2.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u -c128-disk: - $(C1541) -format contiki,00 d71 contiki.d71 - $(C1541) -attach contiki.d71 -write dummy.cfg contiki.cfg,u - $(C1541) -attach contiki.d71 -write ../../cpu/6502/dhcp/dhcp-client.c128 dhcp,p - $(C1541) -attach contiki.d71 -write ../../examples/webserver/webserver-example.c128 webserver,p - $(C1541) -attach contiki.d71 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p - $(C1541) -attach contiki.d71 -write ../../examples/wget/wget.c128 wget,p - $(C1541) -attach contiki.d71 -write ../../examples/irc/irc-client.c128 irc,p - $(C1541) -attach contiki.d71 -write ../../examples/email/email-client.c128 email,p - $(C1541) -attach contiki.d71 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki.d71 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u - $(C1541) -attach contiki.d71 -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou,u - $(C1541) -attach contiki.d71 -write ../../examples/webserver/httpd-cfs/index.html index.html,u - $(C1541) -attach contiki.d71 -write ../../examples/webserver/httpd-cfs/background.gif background.gif,u - $(C1541) -attach contiki.d71 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u - $(C1541) -attach contiki.d71 -write ../../examples/webserver/httpd-cfs/notfound.html notfound.html,u +c128-1-disk: + $(C1541) -format contiki,00 d71 contiki-1.d71 + $(C1541) -attach contiki-1.d71 -write dummy.cfg contiki.cfg,u + $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/dhcp-client.c128 dhcp,p + $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/webserver-example.c128 webserver,p + $(C1541) -attach contiki-1.d71 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p + $(C1541) -attach contiki-1.d71 -write ../../examples/wget/wget.c128 wget,p + $(C1541) -attach contiki-1.d71 -write ../../examples/irc/irc-client.c128 irc,p + $(C1541) -attach contiki-1.d71 -write ../../examples/email/email-client.c128 email,p + $(C1541) -attach contiki-1.d71 -write ../../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p + $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-1.d71 -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou,u + $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/index.html index.html,u + $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/background.gif background.gif,u + $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/notfound.html notfound.html,u diff --git a/tools/6502/contiki.html b/tools/6502/contiki.html index 95abf6728..b0d3eeec0 100644 --- a/tools/6502/contiki.html +++ b/tools/6502/contiki.html @@ -8,6 +8,16 @@ tr.pb { padding-bottom: 15px } tr.bg { background-color: black; height: 1px } +
@@ -15,7 +25,7 @@
- + @@ -39,7 +49,7 @@
- + @@ -53,7 +63,7 @@
- + @@ -110,7 +120,9 @@
- +
+ +
diff --git a/tools/6502/download.php b/tools/6502/download.php index c1f2e682b..a62f7dd66 100644 --- a/tools/6502/download.php +++ b/tools/6502/download.php @@ -1,5 +1,7 @@