all: Java2 Linux Win32 Darwin Solaris
-clean: ; rm -rf build
+clean: ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class
dist-clean:
- rm -rf .jikes .configure* .install* build .compile .build*
+ rm -rf .configure* .install* build .compile .build*
find upstream -name config.cache -exec rm {} \;
- test -e upstream/mips && make -C upstream/mips clean
+ test -e upstream/org.ibex.nestedvm && make -C upstream/org.ibex.nestedvm clean
+ rm .install_org.ibex.nestedvm
libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
-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"
-Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)"
+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"
+Darwin: ; @make gcj platform=Darwin link_flags="$(darwin_linker_flags)"
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,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
-# stupid broke-ass darwin linker...
-darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org/ibex/plat/POSIX.java.o
-
target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
target_bin_extension_Win32 := exe
target_bin_extension_Java2 := jar
target_bin_extension := $(target_bin_extension_$(platform))
target_bin := ibex.$(target_bin_extension)
-jikes_flags := -nowarn
gcc_optimizations := -Os
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
#gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
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)
+nm := upstream/install/$(target)/bin/nm
jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+ifeq ($(platform),Java2)
+javac := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar -d build/class/ -sourcepath build/java/
+else
+javac := $(gcj) -fCLASSPATH=upstream/bcel-5.1/src/bcel-5.1.jar -d build/class/ -Ibuild/java -Iupstream/gnu.regexp-1.1.4/src/src -C
+endif
gcj: .install_gcc-3.3_$(target)
- make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
+ @make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
include Makefile.upstream
# @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_classes_Platform := org.ibex.plat.Platform
+plat_classes_AWT := org.ibex.plat.AWT $(plat_classes_Platform)
+plat_classes_Java2 := org.ibex.plat.Java2 org.ibex.plat.JVM $(plat_classes_AWT)
+plat_classes_GCJ := org.ibex.plat.GCJ $(plat_classes_Platform)
+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))
+
+# 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/util/SeekableInputStream.java
-java_sources += build/java/org/xwt/mips/Compiler.java
-java_sources += build/java/org/xwt/mips/ELF.java
-java_sources += build/java/org/xwt/mips/Interpreter.java
java_sources += build/java/org/xwt/mips/Registers.java
java_sources += build/java/org/xwt/mips/Runtime.java
-java_sources += build/java/org/xwt/mips/UnixRuntime.java
-java_sources += build/java/org/xwt/mips/Errno.java
-java_sources += build/java/org/xwt/mips/Syscalls.java
-java_sources += build/java/org/xwt/mips/Unistd.java
+java_sources += build/java/org/xwt/mips/UsermodeConstants.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
-build/java/org/xwt/mips/util/%:
- @test -e .install_mips2java || make .install_mips2java
- @echo linking $@
- @mkdir -p $(@D)
- @cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
-
-build/java/org/xwt/mips/%:
- @test -e .install_mips2java || make .install_mips2java
- @echo linking $@
- @mkdir -p $(@D)
- @test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \
- ln -sf ../../../../../upstream/mips/build/org/xwt/mips/$*); true
- @test -e upstream/mips/org/xwt/mips/$* && (cd $(@D); \
- ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
-
+.PRECIOUS: $(java_classes) $(java_sources) *.java
### 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
- @echo -e "\n\033[1mpreprocessing .java -> .java: $<\033[0m"
- mkdir -p `dirname $@`; java -cp build/class org.ibex.util.Preprocessor < $^ > $@
-build/java/%.java: src/%.java ; @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)
+$(call link_upstream,%.java,src)
+$(call link_upstream,%.cc,src)
-### Java Class Files ##############################################################################
-build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
- mkdir -p build/java/org/ibex/translators
- @echo -e "\n\033[1mtranslating .mips -> .java: $<\033[0m"
- (echo -e 'package org.ibex.translators;\n'; \
- java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
- | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/ibex/translators/MIPSApps.java
- @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
- ./.jikes -g:none build/java/org/ibex/translators/MIPSApps.java
+### Java Class Files ##############################################################################
compile: .compile
-.compile: .install_mips2java .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
+.compile: .download_org.ibex.nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
-ifeq ($(platform),Java2)
-build/class/%.class: build/java/%.java .preprocessor .jikes
+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"
- mkdir -p build/class
- @./.jikes $< -d build/class
-else
-build/class/%.class: build/java/%.java
+ @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
+
+build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm
+ @mkdir -p build/java/org/ibex/util
+ @echo -e "\n\033[1mtranslating .mips -> .class: $<\033[0m"
+ 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 $(@D)
- $(gcj) -I$(bcel_jar) -C -O0 $< -d build/class
-endif
+ @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/translators/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.Main\n" > build/Java2/.manifest
+ echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest
cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
- 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)
+ cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest `find . -name \*.class -or -name \*.jar`
### Headers ##################################################################################
java_headers := $(java_sources:build/java/%.java=build/h/%.h)
-build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
build/h/%.h: build/class/%.class .compile
@echo -e "\n\033[1mextracting .class -> .h: $<\033[0m"
mkdir -p `dirname $@`
### Builtin Resources ##############################################################################
-builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')
+builtin_src := $(shell find src/org/ibex/core/builtin -name '*.*' \! -name '*.xcf')
build/res/fonts/vera: .download_vera-1.10
mkdir -p build/res/fonts/vera
cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
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 fonts
+ cd build/res; $(jar) cf builtin.jar org/ibex/core/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)
echo "};") > .builtin.c
$(gcc) -c .builtin.c -o build/$(platform)/builtin.o
-build/mips/%.c.o: src/%.c .download_libmspack-20030726
+build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_org.ibex.nestedvm
make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
mkdir -p $(@D)
-Iupstream/libmspack-20030726/src/mspack \
-c -o $@ $<
-build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mips/org/ibex/translators/MSPack.c.o build/mips/org/ibex/translators/main.c.o
+build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/org/ibex/util/MSPack.c.o
make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
@echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m"
upstream/install/bin/mips-unknown-elf-gcc \
--static \
-march=mips1 \
- -T upstream/mips/org/xwt/mips/linker.ld \
- -L upstream/mips/build/org/xwt/mips/ \
+ -T upstream/nestedvm/src/org/xwt/mips/linker.ld \
+ -L upstream/nestedvm/build/org/xwt/mips/ \
-L upstream/freetype-2.1.4/src/objs \
-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
-o $@ \
echo -e "\n\n\n*** DONE ******************************************"
propose-patch:
- @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+ @darcs send --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
@(echo "To: patches@xwt.org";\
SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
echo "Subject: $$SUB";\
commit: propose-patch
darcs push --and-apply xwt@xwt.org:/var/www/org/ibex/core/
-reference: build/class/org/ibex/util/Doc.class doc/reference.xml
- cd doc; java -cp ../build/class org.ibex.util.Doc < reference.xml > reference.tex
- cd doc; pdflatex reference.tex
- open doc/reference.pdf
+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