Skip to content

Commit 261adb6

Browse files
committed
moved to conventional directory hierarchy
1 parent 407eed9 commit 261adb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+29
-77
lines changed

src/LICENSE renamed to LICENSE

File renamed without changes.
File renamed without changes.

src/Makefile renamed to Makefile

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build: jpc
88
debugger: build_core
99
mkdir -p build
1010
echo "Name: JPC Debugger" > debugger.manifest
11-
echo "Author: Ian Preston" >> application.manifest
11+
echo "Author: Ian Preston" >> debugger.manifest
1212
echo "Main-Class: org.jpc.debugger.JPC" >> debugger.manifest
1313
echo "Build-Date: " `date` >> debugger.manifest
1414
echo "Default-Args: -fda mem:resources/images/floppy.img -hda mem:resources/images/dosgames.img -boot fda" >> debugger.manifest
@@ -31,17 +31,15 @@ debugger: build_core
3131
.PHONY: build_core
3232
build_core:
3333
mkdir -p build
34-
javac $(JAVA_BUILD_OPTS) -d build `find org/jpc/emulator -name \*.java` \
35-
`find org/jpc/support -name \*.java` \
36-
`find org/jpc/debugger -name \*.java` \
37-
`find org/jpc/classfile -name \*.java` \
38-
`find org/jpc/debugger -name \*.java` \
39-
`find org/jpc/j2se -name \*.java`
34+
javac $(JAVA_BUILD_OPTS) -d build `find src/org/jpc/emulator -name \*.java` \
35+
`find src/org/jpc/support -name \*.java` \
36+
`find src/org/jpc/debugger -name \*.java` \
37+
`find src/org/jpc/j2se -name \*.java`
4038

4139
.PHONY: tools
42-
tools:
40+
tools: build_core
4341
mkdir -p build
44-
javac $(JAVA_BUILD_OPTS) -d build `find tools -name \*.java`
42+
javac $(JAVA_BUILD_OPTS) -cp build/ -d build `find src/tools -name \*.java`
4543
echo "Name: JPC Tools" > jpc.manifest
4644
echo "Main-Class: tools.Tools" >> jpc.manifest
4745
echo "Author: Ian Preston" >> jpc.manifest
@@ -51,12 +49,12 @@ tools:
5149
rm -f jpc.manifest
5250

5351
.PHONY: tests
54-
tests:
52+
tests: build_core
5553
mkdir -p build
56-
javac $(JAVA_BUILD_OPTS) -d build `find tools -name \*.java` \
57-
`find org/jpc/emulator/execution/decoder -name \*.java` \
58-
org/jpc/emulator/execution/Executable.java \
59-
org/jpc/j2se/Option.java
54+
javac $(JAVA_BUILD_OPTS) -cp build/ -d build `find src/tools -name \*.java` \
55+
`find src/org/jpc/emulator/execution/decoder -name \*.java` \
56+
src/org/jpc/emulator/execution/Executable.java \
57+
src/org/jpc/j2se/Option.java
6058
echo "Name: JPC Tools" > jpc.manifest
6159
echo "Main-Class: tools.TestGenerator" >> jpc.manifest
6260
echo "Class-Path: Tools.jar:." >> jpc.manifest

README.md

Lines changed: 9 additions & 0 deletions

src/TODO renamed to TODO

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ JPC TODO (In rough order of desirability)
33
* make cpu report it is i486 (all linuxes require this)
44
* CPU instruction tests - memory input values, optional compare memory afterwards
55
* make tests with multiple 66 and 67 prefices
6-
* -log-disam for win95 => fuzz test cases
76
* test TombRaider and create bootable hd with autorun
87
* fix bug leading to top ~1/3 of screen being redrawn at the bottom third (e.g. dsl and kolibri)
98
* Soundblaster - fix PCM sound
File renamed without changes.
File renamed without changes.

regenerate_decoder.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
java -cp JPCApplication.jar:Tools.jar tools.Tools
2+
make application
3+
java -cp JPCApplication.jar:Tools.jar tools.Tools -decoder > src/org/jpc/emulator/execution/decoder/ExecutableTables.java
4+
make application
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)