X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=3369b98cb6f1626c310595151ff1294f59499cb4;hp=b984de7a226ca26be56fcd75fd44f7a2dcc3bfdd;hb=db9fd9570a6e8302a34e6fc32d04d58b59e39a99;hpb=1c20383eb478d9f2f1a7936b278330a9df3967ee

diff --git a/Makefile b/Makefile
index b984de7..3369b98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,335 +1,387 @@
-#############################################################################
+############################################################################# 
 #
-# The XWT Makefile
+# The Ibex Makefile
 #
 
-all:                   JVM Linux Win32 Java2 #Solaris
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile
-
-
-#############################################################################
-# Configurables:
-#
-target_bin             := xwt.$(shell echo $(target) | tr A-Z a-z)
-jikes_flags            := -verbose -nowarn -sourcepath src/
-gcc_path               := upstream/install
-gcc_optimizations      := -O2
-#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections
-gcc_flags              := $(gcc_optimizations)
-gcj_flags              := -fCLASSPATH=src
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
-g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
-as                     := $(gcc_path)/$(target)/bin/as
-ar                     := $(gcc_path)/$(target)/bin/ar
-ranlib                 := $(gcc_path)/$(target)/bin/ranlib
-strip                  := $(gcc_path)/$(target)/bin/strip
-jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
-
-
-
-#############################################################################
-# Overview:
-# 
-# The Makefile has been divided into phases; each phase depends on the
-# previous one.  Subphases of the same phase (ie 1a, 1b) are not
-# interdependent.  You can think of the build process as proceeding
-# through the phases in order, but processing subphases within a given
-# phase in any order.
-#
-
-
-# PHASE 1a: human-written inputs
-handwritten_java_sources      := $(find src -name \*.java)
-handwritten_java_pp_sources   := $(find src -name \*.java.pp)
-handwritten_mips_sources      := $(find src -name \*.mips.c)
-handwritten_cc_sources        := src/org/xwt/plat/$(platform).cc
-handwritten_c_sources         := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
-handwritten_xwar_sources      := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-
-
-# PHASE 1b: upstream code
-jpeg_c_sources    := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
-jpeg_c_sources    += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
-jpeg_c_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
-jpeg_sources      := $(jpeg_c_sources:%.c=upstream/jpeg-6b/src/%.c)
-$(jpeg_sources):
-	make -sC upstream jpeg-6b/.installed
-
-freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/src/src/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c)
-freetype_sources    += $(patsubst %,upstream/freetype-2.1.4/src/src/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
-$(freetype_sources):
-	make -sC upstream freetype-2.1.4/.installed
-
-upstream/.jikes:
-	make -sC upstream .jikes
-
-$(gcc_path)/bin/$(target)-gcj:
-	make -sC upstream gcc-3.3-$(target)
-
-
-# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
-java_sources    := $(handwritten_java_sources:src/%.java=build/java/%.java)
-java_sources    += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
-java_sources    += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
-java_sources    += build/java/org/xwt/Builtin.java
-build/java/%.java:: src/%.java
-	@mkdir -p `dirname $@`;                  \
-	cd `dirname $@`;                        \
-	A=`echo $@ | sed 's_[^/]*/_../_g'`;     \
-	B=`dirname $$A`;                        \
-	C=$$B/$<;                               \
-	ln -s $$C	
-
-
-# PHASE 3: class files
-class_files           := $(java_sources:build/java/%.java=build/class/%.class)
-class_files           += build/class/org/xwt/imp/Freetype.class build/class/org/xwt/imp/MIPS.class
-$(class_files): build/class/%.class: build/java/%.java upstream/.jikes
-	@$(shell cat upstream/.jikes) -classpath lib/libgcj-minimal.jar $< -d build/class/ 2>&1 | \
-		grep -v ^\\[read | sed s_^\\[write\ build/class/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
-
-
-# PHASE 4: gcj-generated headers
-java_headers          := $(build_java_sources:build/java/%.java=build/h/%.h)
-$(java_headers): build/h/%.h: build/%.class
-	@echo "extracting        .class -> .h:     $<"
-	cd build; find `echo $< | sed s/.class$$// | sed s_^build/__ `*.class |\
-		sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
-			xargs $(gcjh) --classpath .
-
-# PHASE 4: object files
-java_object_files          := $(filter-out build/$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=build/$(platform)/%.java.o))
-java_object_files          += $(pathsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources))
-java_object_files          += build/$(platform)/org/xwt/imp/Freetype.java.o
-cc_object_files            := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o)
-c_object_files             := $(handwritten_c_sources:src/%.c=build/$(platform)/%.c.o)
-$(java_objects): build/$(platform)/%.java.o: build/java/%.java
-	@echo "compiling          .java -> .o:     $<"
-	@mkdir -p `dirname $@`
-	$(gcj) -c $< -o $@
-$(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
-	@echo "compiling            .cc -> .o:     $<"
-	@mkdir -p `dirname $@`
-	$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
-$(c_object_files): build/$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
-	@echo "compiling             .c -> .o:     $<"
-	@mkdir -p `dirname $@`
-	$(gcc) -Ibuild/h -c $< -o $@
-
-# PHASE 5: linking
-$(target_bin): $(objects)
-	@echo "linking               .o -> $(target_bin)"
-	$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) 
-
-
-##############################################################################
-# Special treatment:
-#
-
-build/java/org/xwt/Builtin.java: $(handwritten_xwar_sources)
-	@mkdir -p `dirname $@` build build/java build/class build/h build
-	@echo "zipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java"
-	@echo "package org.xwt;"                  >  build/java/org/xwt/Builtin.java
-	@echo "class Builtin {"                   >> build/java/org/xwt/Builtin.java
-	@echo "public static String encoded = "   >> build/java/org/xwt/Builtin.java
-	@cd src; $(jar) cf - $(handwritten_xwar_sources:src/%=%) | \
-		uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \
-		sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
-	@echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
-
-postprocessed_sources   := $(handwritten_java_pp_sources:src/%.pp=build/java/%)
-$(postprocessed_sources):  build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
-	@echo "preprocessing   .java.pp -> .java:  $<"
-	@mkdir -p `dirname $@`
-	@java -cp build org.xwt.util.Preprocessor < $< > $@
-
-build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
-	@echo "translating        .mips -> .java:  $<"
-	@mkdir -p build/java/org/xwt/imp/
-	@rm -f $@
-	@java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
-
-build/mips/freetype.mips: $(freetype_mips_objects)
-	@echo "compiling             .c -> .mips:  $<"
-	@mkdir -p build/mips
-	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips
-	@$(gcc_path)/bin/mips-gcc \
+#  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:         Java2 Linux Win32 Darwin Solaris
+
+clean:      ; rm -rf build; rm .preprocessor
+dist-clean:
+	rm -rf .jikes .configure* .install* build .compile .build*
+	find upstream -name config.cache -exec rm {} \;
+	test -e upstream/mips && make -C upstream/mips clean
+
+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)"
+
+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
+
+# 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
+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
+gcj                += -fassume-compiled -fmerge-all-constants -finhibit-reflection
+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)
+jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+
+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_AWT     := org.ibex.plat.AWT
+plat_classes_Java2   := org.ibex.plat.Java2 org.ibex.plat.JVM $(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/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_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
+
+
+### 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'`/$< $@
+
+
+### 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
+
+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 -O0 $< -d build/class
+endif
+
+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 ../Java2/ibex.jar ../Java2/.manifest \
+		`find . \! -type d` \
+		$(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
+
+
+### 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 $@`
+	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 .)
+
+
+### Native Code ##############################################################################
+
+# 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) 
+
+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
+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
+
+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 $@`
+	$(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"
+	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/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 $@
+
+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
+
+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)
+
+	@echo -e "\n\033[1mlinking              .jar -> $(target_bin).phat\033[0m"
+# -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
+# 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=\"\"                                                            \
+		-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                                         \
+		$(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                              \
+		build/$(platform)/Class.o                                                \
+		$(libjava_dir)/gnu/gcj/runtime/FirstThread.o \
+		-lz -o $@.phat
+	@echo; ls -l $@.phat
+
+	@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
+endif
+
+### Builtin Resources ##############################################################################
+
+builtin_src := $(shell find src/org/ibex/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/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
+	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/translators/Freetype.c.o build/mips/org/ibex/translators/MSPack.c.o build/mips/org/ibex/translators/main.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 \
-		-mabi=32 \
-		-mips1 \
-		-msoft-float \
+		-march=mips1 \
+		-T upstream/mips/org/xwt/mips/linker.ld \
+		-L upstream/mips/build/org/xwt/mips/ \
+		-L upstream/freetype-2.1.4/src/objs \
+		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
-		-I upstream/freetype-2.1.4/src/include \
-		$(freetype_sources) \
-		-mno-crt0 \
-		-Tnullmon.ld \
-		-Wl,--warn-once \
-		src/org/xwt/imp/Freetype.c \
-		-Wl,-s
-
-
-
-##############################################################################
-# Supported Platforms:
-#
-
-# compile is here to force compilation of the .class files (they get used via -Ibuild) without
-# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
-	@echo -e "\\n=== $(target) ========================================="
-
-Linux:
-	@make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" platform_java_sources="POSIX X11"
-
-Solaris:
-	@make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11"
-
-Win32:
-	@make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32
-
-Carbon:
-	@make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" platform_java_sources="POSIX Carbon"
-
-JVM: compile $(class_files)
-	@echo -e "\\n=== JVM ========================================="
-	@echo "archiving         .class -> .jar"
-	@mkdir -p build/JVM
-	@echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
-	@cd build/class; $(jar) cvfm ../JVM/xwt.jar ../JVM/.manifest \
-		`find . -name \*.class | grep -v org/xwt/plat/` \
-		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
-	@echo
-
-
-
-##############################################################################
-# Misc
-#
-
-clean:
-	find . -name \*~ | xargs rm -f
-	find . -name \#\*\# | xargs rm -f
-
+		$^ \
+		-lfreetype \
+		-lmspack   \
+		-Wl,--gc-sections
 
 
-##############################################################################
-# Maintainer stuff: generating numbered builds, proposing patches
-#
-
-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.
-
-propose-patch:
-	@echo -n "Please type a one-line description of this bug: "; \
-	read A; \
-	echo; \
-	echo "Please type any additional comments that explain this patch."; \
-        echo "If this patch fixes a bug, include a link to bugs.xwt.org."; \
-        echo "When you are done, press control-d on a new line."; \
-	echo; \
-	(	echo -e "HELO patcher"; \
-		echo -e "MAIL FROM:$(USER)@xwt.org"; \
-		echo -e "RCPT TO: patches@xwt.org"; \
-		echo -e "DATA"; \
-		echo -e "From: $(USER)@xwt.org"; \
-		echo -e "To: patches@xwt.org"; \
-		echo -e "Subject: proposed patch to $(this_branch): $$A"; \
-		echo -e ""; \
-		cat; \
-		echo; \
-		cvs diff -Bud; \
-		echo .; \
-	) > .message
-	bash -c "cat .message > /dev/tcp/mail.xwt.org/25"     # /dev/tcp is faked by bash; not part of the os
+### Maintainer ######################################################################################
 
 current_build         := $(shell cat next.build)
-this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
-this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
-
-# pre-depend on compile as a sanity check
+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
-	# 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),serverbeach.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
-		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | 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
-	mkdir -p $(HOME)/dist.xwt.org-gcc
-	mv gcc gcc-
-	ln -s $(HOME)/dist.xwt.org-gcc gcc
-	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/*.patch gcc/
-
-	# build it
+	(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
+	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 ******************************************"
 
-	echo
-	echo === master.dist.xwt.org ==================================
-
-	echo "copying xwt.jar to distribution area..."
-	cp 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) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
-
-	echo "copying xwt.linux to distribution area..."
-	$(strip) build/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 ******************************************"
-
-
-compile: upstream/.jikes $(java_sources) build/class/org/xwt/imp/Freetype.class
-	echo "compiling          .java -> .class: src/**/*.java"
-	mkdir -p build
-	cp build/class/org/xwt/imp/MIPS.class build/class/org/xwt/imp/MIPS.class.old
-	$(shell cat upstream/.jikes) -classpath lib/libgcj-minimal.jar $(java_sources) -d build/ 2>&1 | \
-		grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
-	cmp build/class/org/xwt/imp/MIPS.class build/class/org/xwt/imp/MIPS.class.old && mv build/class/org/xwt/imp/MIPS.class.old build/class/org/xwt/imp/MIPS.class
-
+propose-patch:
+	@darcs push --and-apply --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 --and-apply 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 < `basename $*`.xml > `basename $*`.tex
+	cd $(@D); pdflatex `basename $*`.tex
+	open doc/$*.pdf
 
 
-#mips: $(prefix)/mips/lib/libm.a
-#$(prefix)/mips/lib/libm.a: src/.newlib $(prefix)/bin/mips-gcc
-#	mkdir -p build/$(target)/newlib
-#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH \
-#		../../../src/newlib-1.11.0/configure --nfp --enable-multilib --prefix=$(prefix) --target=mips
-#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH EXTRA_CFLAGS=-mstrict-align make
-#	cd build/$(target)/newlib; make install
-# FIXME: this is probably going to cause problems... figure out how to get by without it
-#	touch .empty.c
-#	$(prefix)/bin/mips-gcc -c .empty.c -o $(prefix)/mips/lib/crt0.o