X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=811ea8642605f1c32ff9358a929fac21e062f367;hb=753c136696402d156d7eb558d2484dd5fcbab713;hp=2347c9197058a02bc0b09c43f3ffeba09081c44f;hpb=ce46ffc931712d600b6f7ed4a426e4c1751ef4b9;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 2347c91..811ea86 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 
 ifeq ($(platform),)
 # default
-platform := JVM
+platform := Java2
 endif
 
 target_Darwin := powerpc-apple-darwin
@@ -16,7 +16,7 @@ target_Solaris := sparc-sun-solaris2.7
 target_Linux := i686-pc-linux-gnu
 target := $(target_$(platform))
 
-all:         JVM Linux Win32 Darwin Solaris
+all:         Java2 Linux Win32 Darwin Solaris
 
 clean:      ; rm -rf build
 dist-clean:
@@ -32,7 +32,8 @@ libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
 libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
 libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
 
-JVM:        build/JVM/ibex.jar
+Java2:        build/JVM/ibex.jar
+JVM:; make Java2
 Linux:    ; make gcj platform=Linux   link_flags="$(libwing_Linux) -lXpm -lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
@@ -93,10 +94,11 @@ plat_classes_Linux   := org.ibex.plat.Linux $(plat_classes_X11)
 plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11)
 plat_classes_Darwin  := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX)
 
-bleh:; @echo $(plat_classes_$(platform))
-java_src_sources          := $(patsubst %,src/%.java,$(subst .,/,$(plat_classes_$(platform))))
-java_src_sources          += $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat | grep -v NanoGoat)
+plat_java_src_sources     := src/org/ibex/plat/$(platform).java
+java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat)
+java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
+
 java_sources              += build/java/org/xwt/mips/Errno.java
 java_sources              += build/java/org/xwt/mips/Unistd.java
 java_sources              += build/java/org/xwt/mips/Syscalls.java
@@ -127,10 +129,18 @@ build/java/org/xwt/mips/%:
 
 ### Java Source Files ##############################################################################
 
+ifeq ($(platform),Java2)
+.preprocessor: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
+	@make .jikes
+	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
+	./.jikes $^ -d build/class
+	@touch $@
+else
 .preprocessor: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
 	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
 	$(gcj) -Isrc -C $^ -d build/class
 	@touch $@
+endif
 build/cc/%.cc:     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/ibex/%.java: src/org/ibex/%.java .preprocessor
@@ -153,8 +163,8 @@ build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
 compile: .compile
 .compile: .install_mips2java .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
 
-ifeq ($(platform),JVM)
-build/class/%.class: build/java/%.java .jikes
+ifeq ($(platform),Java2)
+build/class/%.class: .preprocessor $(java_sources) .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	rm -rf build/class
 	mkdir -p build/class
@@ -163,10 +173,10 @@ else
 build/class/%.class: build/java/%.java
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p $(@D)
-	$(gcj) -C $< -d build/class
+	$(gcj) -I$(bcel_jar) -C -O0 $< -d build/class
 endif
 
-build/JVM/ibex.jar: build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
+build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"
 	mkdir -p build/JVM
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest
@@ -199,7 +209,7 @@ build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).
 	mkdir -p `dirname $@`
 	$(g++) -c $< -o $@
 
-libjava_dir := upstream/gcc-3.3/build-$(target)/$(target)/libjava
+libjava_dir := $(shell pwd)/upstream/gcc-3.3/build-$(target)/$(target)/libjava
 nat_libjava_files_ := boehm.o exception.o posix-threads.o posix.o prims.o resolve.o java/net/natInetAddress.o
 nat_libjava_files_ += java/net/natPlainSocketImpl.o java/io/natFile*.o java/util/zip/nat*.o gnu/gcj/runtime/natFirstThread.o
 nat_libjava_files_ += gnu/gcj/runtime/natNameFinder.o gnu/gcj/runtime/natStackTrace.o gnu/gcj/runtime/natSharedLibLoader.o
@@ -208,50 +218,49 @@ nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -nam
 nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -name nat\*.o 2>/dev/null)
 nat_libjava_files := $(nat_libjava_files_:%=$(libjava_dir)/%)
 
-.natcalls-$(platform): $(nat_libjava_files)
+build/$(platform)/natibex.a: $(nat_libjava_files)
 	@echo -e "\n\033[1mdetecting CNI calls...\033[0m"
 	rm -f build/$(platform)/natibex.a
 	cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
 		$(shell pwd)/upstream/install/$(target)/bin/ar cq        \
 			$(shell pwd)/build/$(platform)/natibex.a         \
-			$<
-	nm build/$(platform)/natibex.a |\
-		grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
-		> $(shell pwd)/$@
+			$^
 
 bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar
-build/$(platform)/ibex.pruned.jar: .compile .install_jpeg-6b_$(target) build/$(platform)/builtin.o .natcalls-$(platform)
+build/$(platform)/ibex.pruned.jar: .compile .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/natibex.a
 	@echo -e "\n\033[1mpruning              .jar -> .jar\033[0m"
 	cp upstream/install/share/java/libgcj-3.3.jar build/$(platform)/ibex.jar
-	cd build/class; \
-		jar uf ../$(platform)/ibex.jar \
-			`find . -name \*.class | grep -v ibex/plat/` \
-			org/ibex/plat/$(platform)*.class \
-			org/ibex/plat/X11*.class \
-			org/ibex/plat/GCJ*.class \
-			org/ibex/plat/POSIX*.class
-	java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar `cat .natcalls-$(platform)`
+	cd build/class; jar uf ../$(platform)/ibex.jar $(patsubst build/java/%.java,%*.class,$(java_sources)) gnu/regexp/*
+	nm build/$(platform)/natibex.a |\
+		grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
+		| java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar
+	mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/xwt/mips/* org/xwt/mips/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp
 	mv build/$(platform)/ibex.jar.pruned $@
 
 ifneq ($(target_bin_extension),jar)
-build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar .natcalls-$(platform)
-
-	@echo -e "\n\033[1mcompiling              .jar -> .o\033[0m"
-	$(gcj) -c --bootclasspath=build/$(platform)/ibex.jar -d build/$(platform) build/$(platform)/ibex.pruned.jar
-
-	@echo -e "\n\033[1mlinking              .o -> $(target_bin).phat\033[0m"
-	PATH=upstream/install/bin:$$PATH $(gcj)	\
+build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar build/$(platform)/natibex.a build/$(platform)/org/ibex/plat/$(platform).cc.o build/$(platform)/builtin.o
+
+	@echo -e "\n\033[1mlinking              .jar -> $(target_bin).phat\033[0m"
+#	PATH=upstream/install/bin:$$PATH $(gcj)
+#		-Os -w                                                               
+	cd build/$(platform); $(shell pwd)/upstream/install/bin/$(target)-gcj        \
+		-fCLASSPATH=$(shell pwd)/upstream/install/share/java/libgcj-3.3.jar  \
+		-c java/lang/Class.class
+	PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
 		-Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive    \
 		--main=org.ibex.plat.$(platform)                                     \
 		-Dfile.encoding=UTF8                                                 \
 		-Lupstream/install/$(target)/lib -Lupstream/install/lib              \
-		-Os -w                                                               \
-		`find build/$(platform) -name \*.o`                                  \
+		-w                                                                   \
+		build/$(platform)/org/ibex/plat/$(platform).cc.o                     \
+		build/$(platform)/ibex.pruned.jar                                    \
 		build/$(platform)/natibex.a                                          \
+		build/$(platform)/builtin.o                                          \
 		upstream/jpeg-6b/build-$(target)/libjpeg.a                           \
 		$(link_flags)                                                        \
 		$(libjava_dir)/../boehm-gc/.libs/libgcjgc.a                          \
-		-o $@.phat
+		build/$(platform)/Class.o                                            \
+		-lz -o $@.phat
 	@echo; ls -l $@.phat
 
 	@echo -e "\n\033[1mstripping              $(target_bin).phat -> $(target_bin)\033[0m"