Apple-1-Tools
/
c2t
mirror of https://github.com/Michaelangel007/c2t.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more clean up

This commit is contained in:
Egan Ford 2016-01-08 16:19:30 -07:00
parent a77b3f7a54
commit eb29f562ff
9 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -1,9 +1,9 @@
WIN32GCC = /usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-gcc
all: c2t c2t-96h
all: bin/c2t bin/c2t-96h
windows: c2t.exe c2t-96h.exe
windows: bin/c2t.exe bin/c2t-96h.exe
dist: all windows
@ -11,23 +11,26 @@ clean: testclean
rm -f c2t.h c2t c2t-96h c2t.exe c2t-96h.exe
cd asm; make clean
c2t: c2t.c c2t.h
gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o c2t c2t.c
bin/c2t: c2t.c c2t.h
gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t c2t.c
c2t-96h: c2t-96h.c c2t.h
gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o c2t-96h c2t-96h.c
bin/c2t-96h: c2t-96h.c c2t.h
gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t-96h c2t-96h.c
c2t.exe: c2t.c c2t.h
$(WIN32GCC) -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o c2t.exe c2t.c
bin/c2t.exe: c2t.c c2t.h
$(WIN32GCC) -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t.exe c2t.c
c2t-96h.exe: c2t-96h.c c2t.h
$(WIN32GCC) -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o c2t-96h.exe c2t-96h.c
bin/c2t-96h.exe: c2t-96h.c c2t.h
$(WIN32GCC) -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t-96h.exe c2t-96h.c
c2t.h: mon/dos33.boot1.mon mon/dos33.boot2.mon asm/autoload.s asm/diskload2.s asm/diskload3.s asm/diskload8000.s asm/diskload9600.s asm/fastload8000.s asm/fastload9600.s asm/fastloadcd.s asm/inflate.s
./makeheader
test: c2t-96h c2t-96h.exe
cd tests; ./test.sh
test: bin/c2t-96h bin/c2t-96h.exe tests/test.md
cd tests; ./test.sh test.md
quicktest: testclean bin/c2t-96h tests/quicktest.md
cd tests; ./test.sh quicktest.md
testclean:
cd tests; rm -f passed test.log

5
README.md
View File

@ -46,9 +46,10 @@ git clone https://github.com/datajerk/c2t.git
Download <https://github.com/datajerk/c2t/archive/master.zip> and extract.
Both the archive and the repo contain an OS/X 64-bit binary (`c2t`) as well as a Windows binary (`c2t.exe`). Just copy to the to any directory in your path. OS/X users may need to adjust the permissions, e.g.:
Both the archive and the repo contain an OS/X 64-bit binary (`c2t`) as well as a Windows 32-bit binary (`c2t.exe`). Just copy to any directory in your path.
> OS/X users may need to adjust the permissions, e.g.:
```
cp c2t /usr/local/bin
cp bin/c2t /usr/local/bin
chmod 755 /usr/local/bin/c2t
```

BIN
c2t
View File

Binary file not shown.

BIN
c2t-96h
View File

Binary file not shown.

BIN
c2t-96h.exe
View File

Binary file not shown.

BIN
c2t.exe
View File

Binary file not shown.

7
tests/quicktest.md Normal file
View File

@ -0,0 +1,7 @@
## Quick Test
| Test | Command | Input | Machine | Load | Compare | Offset | Timeout |
|:----:|------------------------------|-----------------|---------|---------------|-------------|:------:|:-------:|
| 1 | ../bin/c2t-96h | zork.dsk | iie | LOAD | dskiie.tiff | 0 | 25 |
### Future Edit Instructions Here

30
tests/test.md
View File

@ -1,19 +1,19 @@
## Automated Tests
| Test | Command | Input | Machine | Load | Compare | Offset | Timeout |
|:----:|--------------------------|-----------------|---------|---------------|-------------|:------:|:-------:|
| 1 | ../c2t-96h | zork.dsk | iie | LOAD | dskiie.tiff | 0 | 25 |
| 2 | ../c2t-96h | dd.po | iie | LOAD | dskiie.tiff | 0 | 25 |
| 3 | ../c2t-96h | zork.dsk | iip | LOAD | dskiip.tiff | 0 | 25 |
| 4 | ../c2t-96h | dd.po | iip | LOAD | dskiip.tiff | 0 | 25 |
| 5 | ../c2t-96h -2bf | moon.patrol,801 | iie | LOAD | mpiie.tiff | 0 | 25 |
| 6 | ../c2t-96h -2bf | moon.patrol,801 | iip | LOAD | mpiie.tiff | 0 | 25 |
| 7 | ../c2t-96h -2af | moon.patrol,801 | ii | 800.A00R 800G | mpii.tiff | 0 | 25 |
| 8 | wine ../c2t-96h.exe | zork.dsk | iie | LOAD | dskiie.tiff | 0 | 25 |
| 9 | wine ../c2t-96h.exe | dd.po | iie | LOAD | dskiie.tiff | 0 | 25 |
| 10 | wine ../c2t-96h.exe | zork.dsk | iip | LOAD | dskiip.tiff | 0 | 25 |
| 11 | wine ../c2t-96h.exe | dd.po | iip | LOAD | dskiip.tiff | 0 | 25 |
| 12 | wine ../c2t-96h.exe -2bf | moon.patrol,801 | iie | LOAD | mpiie.tiff | 0 | 25 |
| 13 | wine ../c2t-96h.exe -2af | moon.patrol,801 | ii | 800.A00R 800G | mpii.tiff | 0 | 25 |
| Test | Command | Input | Machine | Load | Compare | Offset | Timeout |
|:----:|------------------------------|-----------------|---------|---------------|-------------|:------:|:-------:|
| 1 | ../bin/c2t-96h | zork.dsk | iie | LOAD | dskiie.tiff | 0 | 25 |
| 2 | ../bin/c2t-96h | dd.po | iie | LOAD | dskiie.tiff | 0 | 25 |
| 3 | ../bin/c2t-96h | zork.dsk | iip | LOAD | dskiip.tiff | 0 | 25 |
| 4 | ../bin/c2t-96h | dd.po | iip | LOAD | dskiip.tiff | 0 | 25 |
| 5 | ../bin/c2t-96h -2bf | moon.patrol,801 | iie | LOAD | mpiie.tiff | 0 | 25 |
| 6 | ../bin/c2t-96h -2bf | moon.patrol,801 | iip | LOAD | mpiie.tiff | 0 | 25 |
| 7 | ../bin/c2t-96h -2af | moon.patrol,801 | ii | 800.A00R 800G | mpii.tiff | 0 | 25 |
| 8 | wine ../bin/c2t-96h.exe | zork.dsk | iie | LOAD | dskiie.tiff | 0 | 25 |
| 9 | wine ../bin/c2t-96h.exe | dd.po | iie | LOAD | dskiie.tiff | 0 | 25 |
| 10 | wine ../bin/c2t-96h.exe | zork.dsk | iip | LOAD | dskiip.tiff | 0 | 25 |
| 11 | wine ../bin/c2t-96h.exe | dd.po | iip | LOAD | dskiip.tiff | 0 | 25 |
| 12 | wine ../bin/c2t-96h.exe -2bf | moon.patrol,801 | iie | LOAD | mpiie.tiff | 0 | 25 |
| 13 | wine ../bin/c2t-96h.exe -2af | moon.patrol,801 | ii | 800.A00R 800G | mpii.tiff | 0 | 25 |
### Future Edit Instructions Here

3
tests/test.sh
View File

@ -3,7 +3,7 @@
# Path to wine binary for testing Windows binary
PATH=~/wine/bin:$PATH
TESTS=test.md
TESTS=$1
IMAGES=images
TIFFS=tiffs
@ -61,6 +61,7 @@ _test()
>test.log
echo
echo "Tests:"
echo
grep '^|' $TESTS