X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=6f0ddc0176b0a52eb278e1d9af1d0ec09aadc3e5;hb=fd6731e682bcf3801104fc3c35c808ba241b1739;hp=91d179a2ee0b50254467ee7de3810ba6645c901d;hpb=a41252ba1e0f5dd90100aa2064c011268809c038;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 91d179a..6f0ddc0 100644 --- a/Makefile +++ b/Makefile @@ -5,13 +5,18 @@ # auto directory creation with %/%: %? +ifeq ($(platform),) +# default +platform := Java2 +endif + target_Darwin := powerpc-apple-darwin target_Win32 := i686-pc-mingw32 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: @@ -27,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/Java2/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" @@ -46,7 +52,7 @@ darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z) target_bin_extension_Win32 := exe -target_bin_extension_JVM := jar +target_bin_extension_Java2 := jar target_bin_extension := $(target_bin_extension_$(platform)) target_bin := ibex.$(target_bin_extension) @@ -70,7 +76,28 @@ gcj: .install_gcc-3.3_$(target) include Makefile.upstream -java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat/AWT | grep -v plat/Java2)) +# find the superclasses of a platform class +#superclass_%: +# @if [ "$*" = "org.ibex.plat.Darwin" ]; then echo org.ibex.plat.OpenGL; fi +# @echo $* +# @grep -s extends src/$(subst .,/,$*).java | sed s_.\*extends\ __ | head -n 1 | sed s_\ .\*__ |\ +# xargs --replace make -s superclass_org.ibex.plat.{} + +plat_classes_AWT := org.ibex.plat.AWT +plat_classes_Java2 := org.ibex.plat.Java2 $(plat_classes_AWT) +plat_classes_GCJ := org.ibex.plat.GCJ +plat_classes_Win32 := org.ibex.plat.Win32 $(plat_classes_GCJ) +plat_classes_POSIX := org.ibex.plat.POSIX $(plat_classes_GCJ) +plat_classes_X11 := org.ibex.plat.X11 $(plat_classes_POSIX) +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) + +plat_java_src_sources := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_classes_$(platform)))) +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 @@ -101,10 +128,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 @@ -126,17 +161,25 @@ 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),Java2) +build/class/%.class: build/java/%.java .preprocessor .jikes + @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" + mkdir -p build/class + @./.jikes $< -d build/class +else build/class/%.class: build/java/%.java @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p $(@D) - $(gcj) -I$(bcel_jar) -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 - @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 +build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class + @echo -e "\n\033[1marchiving .class -> .jar: build/Java2/ibex.jar\033[0m" + mkdir -p build/Java2 + echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/Java2/.manifest cd build/class/org/ibex; ln -sf ../../../res/builtin.jar - cd build/class; $(jar) cfm ../JVM/ibex.jar ../JVM/.manifest \ + cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest \ `find . \! -type d` \ $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno) @@ -164,7 +207,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 @@ -173,49 +216,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 $@ -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 +ifneq ($(target_bin_extension),jar) +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 .o -> $(target_bin).phat\033[0m" - PATH=upstream/install/bin:$$PATH $(gcj) \ + @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" @@ -225,7 +268,7 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar .natcalls-$(p @echo -e "\n\033[1mcompressing $(target_bin) -> $(target_bin)\033[0m" upx-ucl-beta $@ @echo; ls -l $@.phat - +endif ### Builtin Resources ############################################################################## @@ -237,7 +280,7 @@ build/res/fonts/vera: .download_vera-1.10 cd build/res/fonts/vera; ln -fs ../../../../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 org/ibex/builtin/scar.png + cd build/res; $(jar) cf builtin.jar org/ibex/builtin/scar.png fonts build/$(platform)/builtin.o: build/res/builtin.jar @echo -e "\n\033[1mwrapping .jar -> .o: resources.o\033[0m" @mkdir -p $(@D) @@ -282,7 +325,7 @@ build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mip current_build := $(shell cat next.build) strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o -strip_JVM := cp build/$(platform)/$(target_bin) +strip_Java2 := cp build/$(platform)/$(target_bin) install-dist:; $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned dist: compile (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build- @@ -293,7 +336,7 @@ dist: compile make install-dist platform=Linux make install-dist platform=Solaris make install-dist platform=Darwin - make install-dist platform=JVM + make install-dist platform=Java2 echo -e "\n\n\n*** DONE ******************************************" propose-patch: