NanoGoat
[org.ibex.core.git] / Makefile
index dc019ac..91d179a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 #############################################################################
 #
-# The XWT Makefile
-
+# The Ibex Makefile
 #
 
+#  auto directory creation with %/%: %?
+
 target_Darwin := powerpc-apple-darwin
 target_Win32  := i686-pc-mingw32
 target_Solaris := sparc-sun-solaris2.7
@@ -18,9 +19,17 @@ dist-clean:
        find upstream -name config.cache -exec rm {} \;
        test -e upstream/mips && make -C upstream/mips clean
 
-JVM:        build/JVM/xwt.jar
-Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
-Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+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
+
+JVM:        build/JVM/ibex.jar
+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)"
 
@@ -32,33 +41,36 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin
 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_JVM         := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
-target_bin                       := xwt.$(target_bin_extension)
+target_bin                       := ibex.$(target_bin_extension)
 
 jikes_flags        := -nowarn
-gcc_optimizations  := -O2
+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)
-gcc_flags          += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include
-gcc_flags          += -Iupstream/install/include -Ibuild/class
-gcj_flags          := -fCLASSPATH=build/java
-g++_flags          := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
-gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+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)
-gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+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 $(target_bin) link_flags="$(link_flags)" platform=$(platform)
+gcj: .install_gcc-3.3_$(target)
+       make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
 
-java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
+java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat/AWT | grep -v plat/Java2))
 java_sources              += build/java/org/xwt/mips/Errno.java
 java_sources              += build/java/org/xwt/mips/Unistd.java
 java_sources              += build/java/org/xwt/mips/Syscalls.java
@@ -69,12 +81,16 @@ 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_classes              := $(java_sources:build/java/%.java=build/class/%.class)
 
-build/java/org/xwt/mips/util/%: .install_mips2java
+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/%: .install_mips2java
+
+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); \
@@ -83,51 +99,49 @@ build/java/org/xwt/mips/%: .install_mips2java
                ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
 
 
+### Java Source Files ##############################################################################
+
+.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 $@
+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/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
-       mkdir -p build/java/org/xwt/translators
+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.xwt.translators;\nimport org.xwt.mips.*;\n';                           \
+       (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/xwt/translators/MIPSApps.java
+        | 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/xwt/translators/MIPSApps.java
-
-build/java/org/xwt/%.java: src/org/xwt/%.java
-       make build/class/org/xwt/util/Preprocessor.class
-       @echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
-       mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
-
-build/java/%.java: src/%.java ; @echo linking $@; 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'`/$< $@
+       ./.jikes -g:none build/java/org/ibex/translators/MIPSApps.java
 
-build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
+compile: .compile
+.compile: .install_mips2java .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
+build/class/%.class: build/java/%.java
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-       mkdir -p build/class/org/xwt/util/
-       ./.jikes $<
+       mkdir -p $(@D)
+       $(gcj) -I$(bcel_jar) -C $< -d build/class
 
-oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java`
-compile: .compile
-.compile: $(java_sources) .jikes .install_mips2java
-       @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
-       @rm -f $(java_sources:build/java/%.java=build/class/%.class)
-       mkdir -p build/class
-       @./.jikes $(java_sources)
-       touch .compile
-
-build/JVM/xwt.jar: .compile build/res/builtin.jar
-       @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
+build/JVM/ibex.jar: build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
+       @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"
        mkdir -p build/JVM
-       echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
-       cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
-       cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
-               `find . \! -type d \! -path './org/xwt/mips/*'` \
+       echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest
+       cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
+       cd build/class; $(jar) cfm ../JVM/ibex.jar ../JVM/.manifest \
+               `find . \! -type d` \
                $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 
 
-### GCJH Headers ##############################################################################
+### Headers ##################################################################################
 
 java_headers          := $(java_sources:build/java/%.java=build/h/%.h) 
 build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
@@ -141,52 +155,92 @@ build/h/%.h: build/class/%.class .compile
 ### Native Code ##############################################################################
 
 # a hack since we've disabled gcj's awt implementation
-build/$(platform)/org/xwt/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-build/$(platform)/org/xwt/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-
-build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
-       @echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
-       mkdir -p `dirname $@`
-       $(gcj) -Os -c $< -o $@
-
-build/$(platform)/%.java.o: build/java/%.java
-       @echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
-       mkdir -p `dirname $@`
-       $(gcj) -c $< -o $@
+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) 
 
-build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+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++) -c $< -o $@
 
-build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o)
-       @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
-       mkdir -p build/$(platform)
-       rm -f $@
-       upstream/install/$(target)/bin/ar rc $@ $^
-       upstream/install/$(target)/bin/ranlib $@
-
-upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
-       @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
-       mkdir -p build/$(platform)
-       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+libjava_dir := 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/io/natFile*.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)/%)
+
+.natcalls-$(platform): $(nat_libjava_files)
+       @echo -e "\n\033[1mdetecting CNI calls...\033[0m"
+       rm -f build/$(platform)/natibex.a
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
+               $(shell pwd)/upstream/install/$(target)/bin/ar cq        \
+                       $(shell pwd)/build/$(platform)/natibex.a         \
+                       $<
+       nm build/$(platform)/natibex.a |\
+               grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
+               > $(shell pwd)/$@
+
+bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar
+build/$(platform)/ibex.pruned.jar: .compile .install_jpeg-6b_$(target) build/$(platform)/builtin.o .natcalls-$(platform)
+       @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 \
+                       `find . -name \*.class | grep -v ibex/plat/` \
+                       org/ibex/plat/$(platform)*.class \
+                       org/ibex/plat/X11*.class \
+                       org/ibex/plat/GCJ*.class \
+                       org/ibex/plat/POSIX*.class
+       java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar `cat .natcalls-$(platform)`
+       mv build/$(platform)/ibex.jar.pruned $@
+
+build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar .natcalls-$(platform)
+
+       @echo -e "\n\033[1mcompiling              .jar -> .o\033[0m"
+       $(gcj) -c --bootclasspath=build/$(platform)/ibex.jar -d build/$(platform) build/$(platform)/ibex.pruned.jar
+
+       @echo -e "\n\033[1mlinking              .o -> $(target_bin).phat\033[0m"
+       PATH=upstream/install/bin:$$PATH $(gcj) \
+               -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive    \
+               --main=org.ibex.plat.$(platform)                                     \
+               -Dfile.encoding=UTF8                                                 \
+               -Lupstream/install/$(target)/lib -Lupstream/install/lib              \
+               -Os -w                                                               \
+               `find build/$(platform) -name \*.o`                                  \
+               build/$(platform)/natibex.a                                          \
+               upstream/jpeg-6b/build-$(target)/libjpeg.a                           \
+               $(link_flags)                                                        \
+               $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a                          \
+               -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
 
 
 ### Builtin Resources ##############################################################################
 
-builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
+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 -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
-       cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
-       cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+       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 $(^:build/res/%=%)
+       cd build/res; $(jar) cf builtin.jar org/ibex/builtin/scar.png
 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 \;;                                                        \
@@ -195,7 +249,6 @@ build/$(platform)/builtin.o: 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
@@ -206,7 +259,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726
                -Iupstream/libmspack-20030726/src/mspack \
                -c -o $@ $<
 
-build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.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"
@@ -227,50 +280,14 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 
 ### Maintainer ######################################################################################
 
-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
-
 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))
-
-strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
-strip_JVM       := cp build/$(platform)/$(target_bin)
-install-dist:;     $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
+strip_$(platform)     := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+strip_JVM             := cp build/$(platform)/$(target_bin)
+install-dist:;     $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned
 dist: compile
-        ifneq ($(shell uname -n),megacz.com)
-               echo "***********************************************************"
-               echo "*  This build is $(current_build)                                     *"
-               echo "***********************************************************"
-               cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
-               echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
-                        ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
-else
        (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 -e \n`date +%d-%b`" =========== build $(current_build) ================" >> CHANGES
-       cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
        nice -n 19 make all
        make install-dist platform=Win32
        make install-dist platform=Linux
@@ -278,4 +295,13 @@ else
        make install-dist platform=Darwin
        make install-dist platform=JVM
        echo -e "\n\n\n*** DONE ******************************************"
-endif
+
+propose-patch:
+       @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
+       @(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 
+