X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=cf6a3578ab6f5566a7b341157a1d1df37c11005c;hp=9620e928cb09d198bcc99a49b88b923e29a5d062;hb=78cc1426c506aafe5fe79b333270efd9ecf4e575;hpb=83db7f387cbf85bee0cd4b9390af723d4e52e351

diff --git a/Makefile b/Makefile
index 9620e92..cf6a357 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@
 all:      JVM Linux Win32 Darwin #Solaris
 
 clean:
+	rm -rf build
+
+dist-clean:
 	rm -rf .jikes .configure* .install* build .compile .build*
 	find upstream -name config.cache -exec rm {} \;
 
@@ -46,16 +49,25 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
+java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
+java_sources      += build/java/org/xwt/translators/MIPSApps.java
+all_java_sources  := $(java_sources)
+
+nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
+plat_java_sources         := $(filter build/java/org/xwt/plat/%, $(java_sources))
 
-java_sources      := $(all_java_sources)
-nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
-plat_java_sources      := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
+build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips build/class/org/xwt/mips/Compiler.class
+	mkdir -p build/java/org/xwt/translators
+	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
+	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
+	 java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
+	 > $@
 
 build/java/org/xwt/%.java: src/org/xwt/%.java
 	make build/class/org/xwt/util/Preprocessor.class
 	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
 	mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
@@ -63,18 +75,30 @@ build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
 	@echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
+build/java/org/xwt/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/util/
+	./.jikes -g:none $<
+
 build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p build/class/org/xwt/util/
 	./.jikes $<
 
+build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.java
+	make .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/mips/
+	./.jikes $<
+
 # this forces a clean build every time because jikes is so damn buggy
+preprocess: $(java_sources)
 compile: .compile
-.compile: $(all_java_sources) .jikes
+.compile: $(java_sources) .jikes 
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
-	rm -rf build/class
+	@rm -f $(java_sources:build/java/%.java=build/class/%.class)
 	mkdir -p build/class
-	@./.jikes $(all_java_sources)
+	@./.jikes $(java_sources)
 	touch .compile
 
 # PHASE 4: gcj-generated headers
@@ -135,12 +159,13 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 # Special treatment:
 #
 
-builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
 	mkdir -p build/res/fonts/vera
 	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
-	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraBd.ttf
-build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
@@ -171,32 +196,17 @@ build/JVM/xwt.jar: .compile build/res/builtin.jar
 # Freetype
 #
 
-build/mips/%.c.o: src/%.c
+build/mips/%.c.o: .download_libmspack-20030726 src/%.c
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	mkdir -p $(@D)
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
 	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
 		-Iupstream/freetype-2.1.4/src/include  \
-		-Iupstream/libmspack-20030726/libmspack/mspack/ \
+		-Iupstream/libmspack-20030726/src/mspack \
 		-c -o $@ $<
 
-build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
+build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
-	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
-	mkdir -p build/mips build/res
-	upstream/install/bin/mips-unknown-elf-gcc \
-		-nostdlib \
-		--static \
-		-march=mips1 \
-		-T src/org/xwt/mips/linker.ld \
-		-Lbuild/mips \
-		-Lupstream/freetype-2.1.4/src/objs \
-		-o $@ \
-		build/mips/org/xwt/translators/Freetype.c.o \
-		--strip \
-		-lfreetype
-
-build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips build/res
@@ -206,15 +216,14 @@ build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/o
 		-march=mips1 \
 		-T src/org/xwt/mips/linker.ld \
 		-Lbuild/mips \
-		-Lupstream/libmspack-20030726/build-mips-unknown-elf/ \
+		-Lupstream/freetype-2.1.4/src/objs \
+		-Lupstream//libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
-		build/mips/org/xwt/translators/MSPack.c.o \
-		--strip \
+		$^ \
+		-lfreetype \
 		-lmspack
 
 
-
-
 ##############################################################################
 # Maintainer stuff: generating numbered builds, proposing patches
 #
@@ -317,7 +326,7 @@ dist-private:
 
 
 # this is for Adam; don't mess with it
-test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
-#test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+#test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 
-oldcompile: ; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`