all: Java2 Linux Win32 Darwin Solaris
-clean: ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class
+clean: ; rm -rf build
dist-clean:
rm -rf .configure* .install* build .compile .build*
- find upstream -name config.cache -exec rm {} \;
+ find upstream -name config.cache -exec rm -f {} \;
test -e upstream/org.ibex.nestedvm && make -C upstream/org.ibex.nestedvm clean
- rm .install_org.ibex.nestedvm
+ rm -f .install_org.ibex.nestedvm
libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
Win32: ; @make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32"
Darwin: ; @make gcj platform=Darwin link_flags="$(darwin_linker_flags)"
+libjava_dir := $(shell pwd)/upstream/gcc-3.3/build-$(target)/$(target)/libjava
darwin_libdir := upstream/install/powerpc-apple-darwin/lib
-darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
-darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
darwin_ogl_libdir := /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
-darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin_libdir)/libGL.dylib
-darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
-darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
target_bin_extension_Win32 := exe
target_bin_extension := $(target_bin_extension_$(platform))
target_bin := ibex.$(target_bin_extension)
+ifeq ($(platform),Darwin)
+gcc_optimizations := -O0
+else
gcc_optimizations := -Os
+endif
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
#gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target) -g
gcc_flags += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
-gcc_flags += -ffunction-sections -fdata-sections -fno-omit-frame-pointer
-gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
+#gcc_flags += -ffunction-sections -fdata-sections -fno-omit-frame-pointer
+gcj := CLASSPATH=build/java upstream/install/bin/$(target)-gcj $(gcc_flags)
ifneq ($(platform),Darwin)
gcj += -finhibit-reflection
endif
-gcj += -fassume-compiled -fmerge-all-constants
-gcj += -foptimize-static-class-initialization -feliminate-dwarf2-dups -w
+#gcj += -fassume-compiled -fmerge-all-constants
+#gcj += -foptimize-static-class-initialization -feliminate-dwarf2-dups -w
gcjh := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
g++ := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
gcc := upstream/install/bin/$(target)-gcc $(gcc_flags)
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 := $(shell find src -name '*.java' | grep -v NanoGoat | grep -v Preprocessor | grep -v /plat/)
java_src_sources += $(plat_java_src_sources)
java_sources := $(patsubst src/%.java, build/java/%.java, $(java_src_sources))
-# FIXME ugly
java_sources += build/java/org/xwt/mips/util/SeekableByteArray.java
java_sources += build/java/org/xwt/mips/util/SeekableData.java
java_sources += build/java/org/xwt/mips/util/SeekableFile.java
java_classes := $(java_sources:build/java/%.java=build/class/%.class)
java_classes += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class
-
-.PRECIOUS: $(java_classes) $(java_sources) *.java
+java_classes += build/class/org/ibex/util/MIPSApps.class
### Java Source Files ##############################################################################
+$(java_sources):: .download_org.ibex.crypto .download_org.ibex.nestedvm .download_gnu.regexp-1.1.4
+link_upstream = build/java/$(1):: $(2)/$(1) $(3); \
+ @echo -e "\033[1mlinking .java -> .java: $$@\033[0m"; \
+ 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'`/$< $@
build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
-
-build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Preprocessor.class
- @echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m"
- @mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@
-
-upstream/org.ibex.crypto/%.java:; @make .download_org.ibex.crypto
-upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm
-link_upstream = build/java/$(1): $(2)/$(1);
-link_upstream += @echo -e "\033[1mlinking .java -> .java: $$@\033[0m";
-link_upstream += mkdir -p $$(@D);
-link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
$(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
$(call link_upstream,org/ibex/crypto/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
$(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
$(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
$(call link_upstream,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src)
+build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/util/Preprocessor.class
+ @echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m"
+ mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@
$(call link_upstream,%.java,src)
$(call link_upstream,%.cc,src)
### Java Class Files ##############################################################################
+build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java
+ @mkdir -p build/class/gnu/regexp build/class/org/ibex/util
+ $(javac) $< src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
+
compile: .compile
-.compile: .download_org.ibex.nestedvm .download_bcel-5.1 .download_gnu.regexp-1.1.4 $(java_sources)
+.compile: $(java_sources)
@echo -e "\n\033[1mcompiling .java -> .class\033[0m"
- @mkdir -p build/java build/class
- @mkdir -p build/class/org/ibex/util build/class/gnu/regexp build/java build/class
- @test -e build/class/org/ibex/util/Preprocessor.class || \
- $(javac) src/org/ibex/util/Preprocessor.java \
- src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
@echo $(java_sources) | tr ' ' '\n' | sed 's_build/java/_ _' | sed 's_/_._g' | sed 's_.java$$__g'
- @$(javac) $(java_sources) -d build/class
-
+ @make -s $(java_sources)
+ $(javac) $(java_sources)
+ touch $@
build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm
@mkdir -p build/java/org/ibex/util
java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
-build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
+build/Java2/ibex.jar: compile build/res/builtin.jar build/class/org/ibex/util/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.core.Main\n" > build/Java2/.manifest
build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target)
build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target)
-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/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
filedes += $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileDescriptorPosix.cc
endif
+final_compile := --main=org.ibex.plat.$(platform)
+final_compile += -Dfile.encoding=UTF8
+final_compile += -DPREFIX=\"\"
+final_compile += -Lupstream/install/$(target)/lib -Lupstream/install/lib
+final_compile += -g -save-temps -w -v
+final_compile += -Iupstream/jpeg-6b/build-$(target)/
+final_compile += -Iupstream/jpeg-6b/src
+final_compile += -Ibuild/h
+final_compile += -Iupstream/gcc-3.3/src/gcc
+final_compile += -Iupstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/
+final_compile += -Iupstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/include
+final_compile += -Iupstream/gcc-3.3/src/boehm-gc
+final_compile += -Iupstream/gcc-3.3/src/boehm-gc/include
+final_compile += -Iupstream/gcc-3.3/src/libjava
+final_compile += -Iupstream/gcc-3.3/src/libjava/include
+final_compile += -Iupstream/gcc-3.3/build-$(target)/$(target)/libjava/
+final_compile += -Iupstream/gcc-3.3/build-$(target)/$(target)/libjava/include
+final_compile += -Ufile
+final_compile += src/org/ibex/plat/$(platform).cc
+final_compile += upstream/jpeg-6b/build-$(target)/libjpeg.a
+final_compile += build/$(platform)/builtin.o
+final_compile += build/$(platform)/ibex.pruned.jar
+ifneq ($(platform),Darwin)
+final_compile += $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a
+final_compile += -fno-store-check
+final_compile += -finhibit-reflection
+final_compile += $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*)
+final_compile += $(filedes)
+final_compile += build/$(platform)/Class.o
+final_compile += $(libjava_dir)/gnu/gcj/runtime/FirstThread.o
+final_compile += -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive
+final_compile += -lz
+else
+final_compile += -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
+final_compile += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
+final_compile += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin_libdir)/libGL.dylib
+final_compile += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
+final_compile += -lSystem.B -lmathCommon.A -lGL -lGLU
+#final_compile += $(libjava_dir)/.libs/libgcj.a
+#final_compile += $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a
+#final_compile += -lgcc
+#final_compile += -lm
+#final_compile += -lpthread
+#final_compile += -lgcc
+#final_compile += -lcrt1.o
+#final_compile += -lcrt2.o
+#final_compile += -lSystem
+endif
+
+
ifneq ($(target_bin_extension),jar)
build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/plat/*.cc build/$(platform)/builtin.o $(java_headers)
ln -sf ../../../../build-$(target)/$(target)/libjava/java/lang/natConcreteProcess.cc
endif
# we need -fno-store-check since we can't dynamically resolve references to array classes
- PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \
- --main=org.ibex.plat.$(platform) \
- -Dfile.encoding=UTF8 \
- -DPREFIX=\"\" \
- -Lupstream/install/$(target)/lib -Lupstream/install/lib \
- -finhibit-reflection \
- -fno-store-check \
- -w -g \
- -Iupstream/jpeg-6b/build-$(target)/ \
- -Iupstream/jpeg-6b/src \
- -Ibuild/h \
- -Iupstream/gcc-3.3/src/gcc \
- -Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/boehm-gc/ \
- -Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/boehm-gc/include \
- -Iupstream/gcc-3.3/src/boehm-gc \
- -Iupstream/gcc-3.3/src/boehm-gc/include \
- -Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/libjava/ \
- -Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/libjava/include \
- -Iupstream/gcc-3.3/src/libjava \
- -Iupstream/gcc-3.3/src/libjava/include \
- -Ufile \
- build/$(platform)/ibex.pruned.jar \
- src/org/ibex/plat/$(platform).cc \
- build/$(platform)/builtin.o \
- upstream/jpeg-6b/build-$(target)/libjpeg.a \
- $(link_flags) \
- $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a \
-ifneq ($(platform),Darwin)
- $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \
- $(filedes) \
- build/$(platform)/Class.o \
- $(libjava_dir)/gnu/gcj/runtime/FirstThread.o \
- -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive \
- -lz -o $@.phat \
-else
- $(libjava_dir)/.libs/libgcj.a \
- -o $@ \
-endif
+ PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj $(final_compile) -o $@.phat
ifneq ($(platform),Darwin)
@echo; ls -l $@.phat
@echo -e "\n\033[1mcompressing $(target_bin) -> $(target_bin)\033[0m"
upx-ucl-beta $@
@echo; ls -l $@.phat
+else
+ mv $@.phat $@
endif
endif
upstream/install/bin/mips-unknown-elf-gcc \
--static \
-march=mips1 \
- -T upstream/nestedvm/src/org/xwt/mips/linker.ld \
- -L upstream/nestedvm/build/org/xwt/mips/ \
+ -T upstream/org.ibex.nestedvm/src/org/xwt/mips/linker.ld \
+ -L upstream/org.ibex.nestedvm/build/org/xwt/mips/ \
-L upstream/freetype-2.1.4/src/objs \
-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
-o $@ \
cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex
cd $(@D); pdflatex `basename $*`.tex
open doc/$*.pdf
+
projects / org.ibex.core.git / blobdiff