git-svn-id: http://svn.code.sf.net/p/netboot65/code@39 93682198-c243-4bdb-bd91-e943c89aac3b

This commit is contained in:
jonnosan 2009-02-08 10:50:10 +00:00
parent ba0a71ae6c
commit b599be3f40
5 changed files with 17 additions and 19 deletions

View File

@ -11,7 +11,6 @@
.include "../inc/common.i"
.import print_a
.export parse_dotted_quad

View File

@ -23,26 +23,26 @@ INCFILES=\
%.prg: %.o $(IP65LIB) $(C64NETLIB) $(INCFILES) ../cfg/c64prg.cfg
$(LD) -m $*.map -C ../cfg/c64prg.cfg -o $*.prg $(AFLAGS) $< $(IP65LIB) $(C64NETLIB)
%.bin: %.o $(IP65LIB) $(APPLE2NETLIB) $(INCFILES) ../cfg/a2bin.cfg
$(LD) -m $*.map -C ../cfg/a2bin.cfg -o $*.bin $(AFLAGS) $< $(IP65LIB) $(APPLE2NETLIB)
%.pg2: %.o $(IP65LIB) $(APPLE2NETLIB) $(INCFILES) ../cfg/a2bin.cfg
$(LD) -m $*.map -C ../cfg/a2bin.cfg -o $*.pg2 $(AFLAGS) $< $(IP65LIB) $(APPLE2NETLIB)
ip65test.d64: testdns.prg testdottedquad.prg
ip65test.dsk: testdns.bin testdottedquad.bin
ripxplore.rb --init AppleDos ip65test.dsk -a testdns.bin -t AppleBinary
ripxplore.rb ip65test.dsk -a testdns.bin -t AppleBinary
ip65test.dsk: testdns.pg2 testdottedquad.pg2
ripxplore.rb --init BeautifulBoot ip65test.dsk -a testdns.pg2 -t AppleBinary
ripxplore.rb ip65test.dsk -a testdottedquad.pg2 -t AppleBinary
all: \
ip65test.dsk \
testdns.prg \
testdns.bin \
testdottedquad.bin \
testdns.pg2 \
testdottedquad.pg2 \
testdottedquad.prg \
ip65test.d64 \
clean:
rm -f *.o
rm -f testdns.prg testdns.map testdns.bin testdottedquad.prg testdottedquad.bin
rm -f testdns.prg testdns.map testdns.pg2 testdottedquad.prg testdottedquad.pg2
rm -f ip65test.dsk
distclean: clean

View File

@ -123,7 +123,7 @@ hostname_3:
hostname_4:
.byte "FOO.BAR.BOGUS",0 ;this should fail
hostname_5: ;this currently fails, would be nice if we noticed it was an IP address
hostname_5: ;this should work (without hitting dns)
.byte "111.22.3.4",0
hostname_6: ;make sure doesn't get treated as a number

View File

@ -91,24 +91,23 @@ test_dotted_quad_string:
dotted_quad_1:
.byte "1.1.1.1",0
.byte "1.1.1.1",0 ;should work
dotted_quad_2:
.byte "GOOBER",0
.byte "GOOBER",0 ;should fail
dotted_quad_3:
.byte "255.255.255.0",0
.byte "255.255.255.0",0 ;should work
dotted_quad_4:
.byte "111.222.333.444",0
.byte "111.222.333.444",0 ;should fail
dotted_quad_5:
.byte "111.22.3",0
.byte "111.22.3",0 ; should fail
dotted_quad_6:
.byte "111.22.3.4",0
.byte "111.22.3.4",0 ; should work
dotted_quad_7:
.byte "3.4.5.6X",0
.byte "3.4.5.6X",0 ; should fail

View File

@ -5,7 +5,7 @@ $:.unshift(File.dirname(__FILE__)) unless
$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
require 'tndp'
require 'socket'
require 'RipXplore'
require 'LibRipXplore'
SYSTEM_ARCHITECTURE_TRANSLATIONS={
"Apple2"=>:apple2,