added background color option to Font.drawGlyph()
[org.ibex.core.git] / Makefile
index d0454b0..9ca6dea 100644 (file)
--- a/Makefile
+++ b/Makefile
-#           
-# The XWT Makefile
+############################################################################# 
+#
+# The Ibex Makefile
 #
 
-## Configurables ###########################################################################
-
-# inputs
-javac_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-cc_sources             := src/org/xwt/plat/$(platform).cc
+#  auto directory creation with %/%: %?
 
-# outputs
-javac_java_objects     := $(javac_java_sources:src/%.java=bin/%.class)
-cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
-gcj_java_objects       := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
+ifeq ($(platform),)
+# default
+platform := Java2
+endif
 
-# tools
-gcc_path               := $(shell pwd)/gcc
-gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g
-gcj_flags              := -fCLASSPATH=bin 
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/gcjh
-ar                     := $(gcc_path)/$(target)/bin/ar
-strip                  := $(gcc_path)/$(target)/bin/strip
-jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+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:         Java2 Linux Win32 Darwin Solaris
+
+clean:      ; rm -rf build
+dist-clean:
+       rm -rf .configure* .install* build .compile .build*
+       find upstream -name config.cache -exec rm -f {} \;
+       test -e upstream/org.ibex.nestedvm && make -C upstream/org.ibex.nestedvm clean
+       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
+libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libwraster.a
+
+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
+
+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)"
+
+libjava_dir         := $(shell pwd)/upstream/gcc-3.3/build-$(target)/$(target)/libjava
+darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
+darwin_ogl_libdir   := /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
+
+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)
+
+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                := 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
+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
 
-# platforms
-all_platforms          := Win32 Linux Java2
+gcj: .install_gcc-3.3_$(target)
+       @make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
+
+include Makefile.upstream
+
+# 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_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 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))
+
+java_sources              += build/java/org/ibex/nestedvm/util/Seekable.java
+java_sources              += build/java/org/ibex/nestedvm/util/Platform.java
+java_sources              += build/java/org/ibex/nestedvm/Registers.java
+java_sources              += build/java/org/ibex/nestedvm/Runtime.java
+java_sources              += build/java/org/ibex/nestedvm/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_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'`/$< $@
+$(call link_upstream,org/ibex/nestedvm/%.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: $(java_sources)
+       @echo -e "\n\033[1mcompiling          .java -> .class\033[0m"
+       @echo $(java_sources) | tr ' ' '\n' | sed 's_build/java/_    _' | sed 's_/_._g' | sed 's_.java$$__g'
+       @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
+       @echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
+       java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/classgen/build \
+               org.ibex.nestedvm.Compiler org.ibex.util.MIPSApps $< -outfile $@
+
+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
+       cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
+       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/%.h: build/class/%.class .compile
+       @echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
+       mkdir -p `dirname $@`
+       ls `echo $< | sed s/.class\$$//`*.class |\
+                sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs $(gcjh) -d ../h --classpath .)
 
-# path
-PATH                   := jikes-1.18/bin:$(PATH)
 
+### Native Code ##############################################################################
 
-## Platform-Neutral ###########################################################################
+# a hack since we've disabled gcj's awt implementation
+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) 
 
-ifneq ($(verbose),true)
-.SILENT: $(javac_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
-silent := --silent
-endif
+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
+nat_libjava_files_ += gnu/gcj/runtime/natStringBuffer.o gnu/gcj/runtime/natVMClassLoader.o gnu/gcj/runtime/natFinalizerThread.o
+nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -name \*.o -not -name '*[A-Z]*' 2>/dev/null)
+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)/%)
+nat_libjava_files += $(libjava_dir)/java/io/natFile.o $(libjava_dir)/java/io/natFileDescriptor.o
 
-compile: $(javac_java_objects) bin/org/xwt/builtin.xwar
-
-all: $(all_platforms)
-
-.javac:
-       if \
-               type jikes && (jikes --version | grep "Version 1.18"); \
-       then \
-               echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
-               echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
-               javac GetBootClassPath.java; \
-               java -cp . GetBootClassPath > .bootclasspath; \
-               rm GetBootClassPath.*; \
-               echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
-               cat .bootclasspath >> .javac; \
-       else \
-               echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
-               echo javac > .javac; \
-       fi \
-
-jikes:
-       wget ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 -O jikes-1.18.tar.bz2
-       bunzip2 jikes-1.18.tar.bz2
-       tar xvf jikes-1.18.tar && rm jikes-1.18.tar
-       cd jikes-1.18; ./configure --prefix=`pwd`
-       cd jikes; make && make install
-       ln -s jikes-1.18/bin/jikes .jikes
-
-$(javac_java_objects): $(javac_java_sources) .javac
-       test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
-       echo "compiling  .java -> .class:"
-       mkdir -p bin
-       $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(javac_java_sources) -d bin/
-       echo "compiling  .java -> .class: done"
-
-bin/org/xwt/builtin.xwar: $(xwar_sources)
-       mkdir -p bin/org/xwt
-       cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
-
-clean:
-       rm -rf bin-* bin
-       find . -name \*~ | xargs rm -f
-       find . -name \#\*\# | xargs rm -f
-
-update-build:
-       cvs tag -F xwt-$(current_build)
-       (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
-       mv next.build- next.build
-       echo -n "Next build will be "
-       cat next.build
-       cvs update CHANGES
-       echo "" >> CHANGES
-       echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
-       echo committing...
-       cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
-       echo committed.
-
-
-## GCJ-Derived Platforms #######################################################################
-
-# if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/bin/$(target)-gcj:
-       cd gcc; make
-
-gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
-
-link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
-       echo "linking       .o -> $(target_bin)"
-       $(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
-       $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
-
-.headers: $(javac_java_objects)
-       cd bin; for A in `find * -name \*.class`; do \
-               echo "extracting .class -> .h:     $$A"; \
-               $(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
-               done
-       echo "extracting .class -> .h:     done"
-       touch .headers
-
-# turn off optimization of Trap.java due to a compiler bug
-bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
-
-$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
-       echo -ne "compiling  .java -> .o:     $<"
+build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
+       @make $(java_headers)
+       @echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
        mkdir -p `dirname $@`
-       $(gcj) -c $< -o $@
-
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-       echo -ne "compiling  .cc -> .o:     $$A"
-       $(gcc) -Ibin -c $< -o $@
-
-bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-       echo "wrapping   .xwar -> .o"
-       $(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
-
+       $(g++) -Iupstream/gcc-3.3/build-$(target)/$(target)/libjava -c $< -o $@
+
+
+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) |\
+               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/ibex/nestedvm/* org/ibex/nestedvm/; 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
+filedes += $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileDescriptorWin32.cc
+else
+filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFilePosix.cc
+filedes += $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileDescriptorPosix.cc
+endif
 
-## Platforms ##############################################################################
+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
 
-Linux:
-       echo -e "\\n=== Linux ========================================="
-       make gcj \
-               platform=Linux \
-               target=i686-pc-linux-gnu \
-               target_bin=xwt.linux \
-               platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
-               platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
 
-Win32:
-       echo -e "\\n=== Win32 ========================================="
-       make gcj \
-               platform=Win32 \
-               target=i686-pc-mingw32 \
-               target_bin=xwt.exe \
-               platform_link="-Wl,--subsystem,windows -lcomdlg32" \
-               platform_java_sources=src/org/xwt/plat/Win32.java
+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)
 
-Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
-       echo -e "\\n=== Java2 ========================================="
-       echo "archiving .class -> .jar"
-       mkdir -p bin-Java2
-       echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-       cd bin; $(jar) cvf ../bin-Java2/xwt.jar -m .manifest \
-                org/xwt/builtin.xwar \
-               `find . -name \*.class | grep -v org/xwt/plat/` \
-               org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
-       echo
+       @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  \
+               -finhibit-reflection                                                 \
+               -fno-store-check                                                     \
+               -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 $(final_compile) -o $@.phat
 
-$(java2_objects:bin/%=%)
+ifneq ($(platform),Darwin)
+       @echo; ls -l $@.phat
 
-PalmOS:
-       echo "PalmOS is not yet supported"
-       false
+       @echo -e "\n\033[1mstripping              $(target_bin).phat -> $(target_bin)\033[0m"
+       strip $@.phat -o $@
+       @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
 
-## master.dist.xwt.org ############################################################################
+### Builtin Resources ##############################################################################
+
+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/VeraMono.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/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 "unsigned int builtin_length = ";                                \
+               (wc -c build/res/builtin.jar | sed "s_build.*__");              \
+               echo \;;                                                        \
+               echo "unsigned char builtin_bytes[] = {";                       \
+               hexdump -ve '"0x" 1/1 "%x,\n"' build/res/builtin.jar;           \
+               echo "};") > .builtin.c
+       $(gcc) -c .builtin.c -o build/$(platform)/builtin.o
+
+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)
+       echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
+       upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
+               -Iupstream/freetype-2.1.4/src/include  \
+               -Iupstream/libmspack-20030726/src/mspack \
+               -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"
+       mkdir -p build/mips build/res
+       upstream/install/bin/mips-unknown-elf-gcc \
+               --static \
+               -march=mips1 \
+               -T upstream/org.ibex.nestedvm/src/org/ibex/nestedvm/linker.ld \
+               -L upstream/org.ibex.nestedvm/build/org/ibex/nestedvm/ \
+               -L upstream/freetype-2.1.4/src/objs \
+               -L upstream/libmspack-20030726/build-mips-unknown-elf/ \
+               -o $@ \
+               $^ \
+               -lfreetype \
+               -lmspack   \
+               -Wl,--gc-sections
+
+
+### Maintainer ######################################################################################
 
 current_build         := $(shell cat next.build)
-this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
-
-dist:
-       # this will fail if we haven't checked-in since the comment is null; we want this.
-       cvs commit -m '' > /dev/null
-       cvs tag -F xwt-$(current_build)
-
-       echo "***********************************************************"
-       echo "*  This build is $(current_build)"
-       echo "***********************************************************"
-
-        ifeq ($(shell uname -n),gosset.megacz.com)
-               (make $(silent) dist-private 2>&1) >> .make-dist.out || \
-                       (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-               tail -n 200 .make-dist.out | \
-                       mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
-        else
-               ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch) \
-                       | grep -v "make...:.\(Entering\|Leaving\).directory"
-        endif
-
-
-dist-private:
-       make $(silent) update-build
-
-       # preserve gcc across builds so we don't have to remake it
-       mv gcc/Makefile Makefile.gcc
-       mkdir -p $(HOME)/dist.xwt.org-gcc
-       rm -rf gcc
-       ln -s $(HOME)/dist.xwt.org-gcc gcc
-       mv Makefile.gcc gcc/Makefile
-
-       # build it
+strip_$(platform)     := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+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-
+       mv next.build- next.build
+       echo -n "Next build will be "; cat next.build
        nice -n 19 make all
-
-       echo
-       echo === master.dist.xwt.org ==================================
-
-       echo "copying xwt.jar to distribution area..."
-       cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
-
-       echo "stripping xwt.exe and copying it to the distribution area..."
-       $(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
-
-       echo "copying xwt.linux to distribution area..."
-       $(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
-
-       echo "creating source tarball in distribution area..."
-       CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
-       mv xwt xwt-$(current_build)
-       tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build)
-
-       echo
-       echo "*** DONE ******************************************"
+       make install-dist platform=Win32
+       make install-dist platform=Linux
+       make install-dist platform=Solaris
+       make install-dist platform=Darwin
+       make install-dist platform=Java2
+       echo -e "\n\n\n*** DONE ******************************************"
+
+propose-patch:
+       @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";\
+        echo;\
+        cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
+       @rm .darcspatch 
+
+commit: propose-patch
+       darcs push xwt@xwt.org:/var/www/org/ibex/core/
+
+upstream/org.ibex.doc/src/org/ibex/doc/Doc.java: .download_org.ibex.doc
+build/class/org/ibex/doc/Doc.class: upstream/org.ibex.doc/src/org/ibex/doc/Doc.java
+       $(javac) upstream/org.ibex.doc/src/org/ibex/doc/Doc.java
+doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/doc/Doc.class
+       cd doc/$*; java -cp ../../build/class org.ibex.doc.Doc < $*.xml > $*.tex
+       cd doc/$*; pdflatex $*.tex
+       mv doc/$*/$*.pdf doc/$*.pdf
+       test `uname` == Darwin && open doc/$*.pdf
+reference: ; rm -f doc/reference.pdf; make doc/reference.pdf
\ No newline at end of file