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
-gcj += -fassume-compiled -fmerge-all-constants -finhibit-reflection
+ifneq ($(platform),Darwin)
+gcj += -finhibit-reflection
+endif
+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
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_sources += build/java/org/xwt/mips/Runtime.java
java_sources += build/java/org/xwt/mips/UsermodeConstants.java
+java_sources += build/java/org/ibex/crypto/DER.java
+java_sources += build/java/org/ibex/crypto/Digest.java
+java_sources += build/java/org/ibex/crypto/HMAC.java
+java_sources += build/java/org/ibex/crypto/MD2.java
+java_sources += build/java/org/ibex/crypto/MD5.java
+java_sources += build/java/org/ibex/crypto/PKCS1.java
+java_sources += build/java/org/ibex/crypto/RC4.java
+java_sources += build/java/org/ibex/crypto/RSA.java
+java_sources += build/java/org/ibex/crypto/SHA1.java
+java_sources += build/java/org/ibex/crypto/X509.java
+java_sources += build/java/org/ibex/crypto/Base64.java
+java_sources += build/java/org/ibex/net/ssl/RootCerts.java
+java_sources += build/java/org/ibex/net/SSL.java
+
+java_sources += build/java/gnu/regexp/CharIndexed.java
+java_sources += build/java/gnu/regexp/CharIndexedCharArray.java
+java_sources += build/java/gnu/regexp/CharIndexedInputStream.java
+java_sources += build/java/gnu/regexp/CharIndexedString.java
+java_sources += build/java/gnu/regexp/CharIndexedStringBuffer.java
+java_sources += build/java/gnu/regexp/RE.java
+java_sources += build/java/gnu/regexp/REException.java
+java_sources += build/java/gnu/regexp/REFilterInputStream.java
+java_sources += build/java/gnu/regexp/REMatch.java
+java_sources += build/java/gnu/regexp/REMatchEnumeration.java
+java_sources += build/java/gnu/regexp/RESyntax.java
+java_sources += build/java/gnu/regexp/REToken.java
+java_sources += build/java/gnu/regexp/RETokenAny.java
+java_sources += build/java/gnu/regexp/RETokenBackRef.java
+java_sources += build/java/gnu/regexp/RETokenChar.java
+java_sources += build/java/gnu/regexp/RETokenEnd.java
+java_sources += build/java/gnu/regexp/RETokenEndSub.java
+java_sources += build/java/gnu/regexp/RETokenLookAhead.java
+java_sources += build/java/gnu/regexp/RETokenWordBoundary.java
+java_sources += build/java/gnu/regexp/RETokenOneOf.java
+java_sources += build/java/gnu/regexp/RETokenPOSIX.java
+java_sources += build/java/gnu/regexp/RETokenRange.java
+java_sources += build/java/gnu/regexp/RETokenRepeated.java
+java_sources += build/java/gnu/regexp/RETokenStart.java
+java_sources += build/java/gnu/regexp/UncheckedRE.java
+java_sources += build/java/gnu/regexp/CharIndexedReader.java
+java_sources += build/java/gnu/regexp/REFilterReader.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
### Java Source Files ##############################################################################
+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); 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 -s .download_org.ibex.crypto &>/dev/null
-upstream/org.ibex.nestedvm/%.java:; @make -s .download_org.ibex.nestedvm &>/dev/null
-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 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 ##############################################################################
compile: .compile
-.compile: .download_org.ibex.nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
-
-build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java .download_gnu.regexp-1.1.4
- @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+.compile: .download_org.ibex.nestedvm .download_bcel-5.1 .download_gnu.regexp-1.1.4 $(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
- $(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
+ @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
+
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 $@
-$(java_classes): build/class/org/ibex/util/Preprocessor.class $(java_sources)
- @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
- @mkdir -p build/java build/class
- $(javac) $(java_sources) -d build/class
-
-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
bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar
build/$(platform)/ibex.pruned.jar: .compile $(java_classes) .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o
@echo -e "\n\033[1mpruning .jar -> .jar\033[0m"
+ifneq ($(platform),Darwin)
cp upstream/install/share/java/libgcj-3.3.jar build/$(platform)/ibex.jar
cd build/class; jar uf ../$(platform)/ibex.jar $(java_classes:build/class/%.class=%*.class)
- (nm $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\
+ ($(nm) $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\
grep _ZN | c++filt --format java | grep " U " | sed 's_ * U __' | sed 's_(.*__' \
| java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar | tee nanogoat.log
mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; 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 $@
+endif
+ifeq ($(platform),Darwin)
+ cd build/class; jar cf ../$(platform)/ibex.pruned.jar \
+ org/ibex/plat/Platform*.class \
+ $(filter-out org/ibex/util/NanoGoat%,$(java_classes:build/class/%.class=%*.class))
+endif
ifeq ($(platform),Win32)
filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileWin32.cc
build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/plat/*.cc build/$(platform)/builtin.o $(java_headers)
@echo -e "\n\033[1mlinking .jar -> $(target_bin).phat\033[0m"
+ifneq ($(platform),Darwin)
# -Os
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
cd upstream/gcc-3.3/src/libjava/java/lang;\
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 \
- -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive \
--main=org.ibex.plat.$(platform) \
-Dfile.encoding=UTF8 \
-DPREFIX=\"\" \
-Ufile \
build/$(platform)/ibex.pruned.jar \
src/org/ibex/plat/$(platform).cc \
- $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \
- $(filedes) \
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 \
- -lz -o $@.phat
+ $(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
+
+ifneq ($(platform),Darwin)
@echo; ls -l $@.phat
@echo -e "\n\033[1mstripping $(target_bin).phat -> $(target_bin)\033[0m"
upx-ucl-beta $@
@echo; ls -l $@.phat
endif
+endif
### Builtin Resources ##############################################################################
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 $@ \
@rm .darcspatch
commit: propose-patch
- darcs push --and-apply xwt@xwt.org:/var/www/org/ibex/core/
+ darcs push xwt@xwt.org:/var/www/org/ibex/core/
doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.class doc/%.xml
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