Merge pull request #372 from oliverschmidt/master

Adjustments for the switch from 'atari' to 'atarixl'.
This commit is contained in:
Oliver Schmidt 2013-10-03 14:56:25 -07:00
commit 0aa5965088
2 changed files with 30 additions and 25 deletions

2
.gitignore vendored
View File

@ -20,7 +20,7 @@
*.mbxxx
*.win32
*.apple2enh
*.atari
*.atarixl
*.c128
*.c64
*.cc2538dk

View File

@ -72,7 +72,6 @@ apple2: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-a
contiki-apple2-1.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ menu.system sys 0 < ../apple2enh/menu.system
java -jar $(AC) -p $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
@ -80,13 +79,13 @@ contiki-apple2-1.dsk: apple2enh-makes
java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser/webbrowser.apple2enh
java -jar $(AC) -p $@ wget.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
contiki-apple2-2.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ menu.system sys 0 < ../apple2enh/menu.system
java -jar $(AC) -p $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
@ -94,13 +93,13 @@ contiki-apple2-2.dsk: apple2enh-makes
java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc/irc-client.apple2enh
java -jar $(AC) -p $@ breadbox.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ breadbox bin < ../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
contiki-apple2-3.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ menu.system sys 0 < ../apple2enh/menu.system
java -jar $(AC) -p $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
@ -108,13 +107,13 @@ contiki-apple2-3.dsk: apple2enh-makes
java -jar $(AC) -cc65 $@ email bin < ../../examples/email/email-client.apple2enh
java -jar $(AC) -p $@ ftp.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ftp bin < ../../examples/ftp/ftp-client.apple2enh
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
contiki-apple2-4.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ menu.system sys 0 < ../apple2enh/menu.system
java -jar $(AC) -p $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
@ -122,6 +121,7 @@ contiki-apple2-4.dsk: apple2enh-makes
java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ telnetd bin < ../../examples/telnet-server/telnet-server.apple2enh
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
@ -132,7 +132,6 @@ contiki-apple2-4.dsk: apple2enh-makes
contiki-apple2.2mg: apple2enh-makes
cp ../apple2enh/prodos.2mg $@
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ menu.system sys 0 < ../apple2enh/menu.system
java -jar $(AC) -p $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
@ -152,6 +151,7 @@ contiki-apple2.2mg: apple2enh-makes
java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys 0 < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -cc65 $@ telnetd bin < ../../examples/telnet-server/telnet-server.apple2enh
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
java -jar $(AC) -p $@ a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
@ -160,51 +160,55 @@ contiki-apple2.2mg: apple2enh-makes
java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
$(eval $(call makes,atari))
$(eval $(call makes,atarixl))
atari: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari-4.atr contiki-atari.atr
contiki-atari-1.atr: atari-makes
contiki-atari-1.atr: atarixl-makes
mkdir atr
cp ../atari/dos25/dos.sys atr/dos.sys
cp ../atari/dos25/dup.sys atr/dup.sys
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com
cp ../../examples/webbrowser/webbrowser.atari atr/webbrows.com
cp ../../examples/wget/wget.atari atr/wget.com
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth
$(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr
contiki-atari-2.atr: atari-makes
contiki-atari-2.atr: atarixl-makes
mkdir atr
cp ../atari/dos25/dos.sys atr/dos.sys
cp ../atari/dos25/dup.sys atr/dup.sys
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com
cp ../../examples/irc/irc-client.atari atr/irc.com
cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth
$(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr
contiki-atari-3.atr: atari-makes
contiki-atari-3.atr: atarixl-makes
mkdir atr
cp ../atari/dos25/dos.sys atr/dos.sys
cp ../atari/dos25/dup.sys atr/dup.sys
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com
cp ../../examples/email/email-client.atari atr/email.com
cp ../../examples/ftp/ftp-client.atari atr/ftp.com
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth
$(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr
contiki-atari-4.atr: atari-makes
contiki-atari-4.atr: atarixl-makes
mkdir atr
cp ../atari/dos25/dos.sys atr/dos.sys
cp ../atari/dos25/dup.sys atr/dup.sys
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com
cp ../../examples/webserver/webserver-example.atari atr/webserv.com
cp ../../examples/telnet-server/telnet-server.atari atr/telnetd.com
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth
cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm
cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif
cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif
@ -212,11 +216,10 @@ contiki-atari-4.atr: atari-makes
$(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr
contiki-atari.atr: atari-makes
contiki-atari.atr: atarixl-makes
mkdir atr
cp ../atari/mydos4534/dos.sys atr/dos.sys
cp ../atari/mydos4534/dup.sys atr/dup.sys
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com
cp ../../examples/webbrowser/webbrowser.atari atr/webbrows.com
cp ../../examples/wget/wget.atari atr/wget.com
@ -226,6 +229,8 @@ contiki-atari.atr: atari-makes
cp ../../examples/ftp/ftp-client.atari atr/ftp.com
cp ../../examples/webserver/webserver-example.atari atr/webserv.com
cp ../../examples/telnet-server/telnet-server.atari atr/telnetd.com
cp ../atari/default.cfg atr/contiki.cfg
cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth
cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm
cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif
cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif
@ -239,24 +244,24 @@ c64: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64.d71 contiki-c64.d81
contiki-c64-1.d64: c64-makes
$(C1541) -format contiki-1,00 d64 $@
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p
$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach $@ -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u
contiki-c64-2.d64: c64-makes
$(C1541) -format contiki-2,00 d64 $@
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/email/email-client.c64 email,p
$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c64 ftp,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u
@ -267,7 +272,6 @@ contiki-c64-2.d64: c64-makes
contiki-c64.d71: c64-makes
$(C1541) -format contiki,00 d71 $@
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p
@ -277,6 +281,7 @@ contiki-c64.d71: c64-makes
$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c64 ftp,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u
@ -287,7 +292,6 @@ contiki-c64.d71: c64-makes
contiki-c64.d81: c64-makes
$(C1541) -format contiki,00 d81 $@
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p
@ -297,6 +301,7 @@ contiki-c64.d81: c64-makes
$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c64 ftp,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p
$(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u
@ -311,23 +316,23 @@ c128: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81
contiki-c128-1.d64: c128-makes
$(C1541) -format contiki-1,00 d64 $@
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p
$(C1541) -attach $@ -write ../../examples/irc/irc-client.c128 irc,p
$(C1541) -attach $@ -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
contiki-c128-2.d64: c128-makes
$(C1541) -format contiki-2,00 d64 $@
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p
$(C1541) -attach $@ -write ../../examples/email/email-client.c128 email,p
$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c128 ftp,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u
@ -337,7 +342,6 @@ contiki-c128-2.d64: c128-makes
contiki-c128.d71: c128-makes
$(C1541) -format contiki,00 d71 $@
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p
@ -347,6 +351,7 @@ contiki-c128.d71: c128-makes
$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c128 ftp,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u
@ -356,7 +361,6 @@ contiki-c128.d71: c128-makes
contiki-c128.d81: c128-makes
$(C1541) -format contiki,00 d81 $@
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p
$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p
$(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p
@ -366,6 +370,7 @@ contiki-c128.d81: c128-makes
$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c128 ftp,p
$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
$(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u
$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u
$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u