2003/03/27 04:45:11

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index d0454b0..d1edd07 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 ## 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)
+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
 
@@ -61,12 +61,9 @@ all: $(all_platforms)
        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
+       curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
+       cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
+       ln -sf 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)
@@ -97,6 +94,28 @@ update-build:
        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
 
 ## GCJ-Derived Platforms #######################################################################
 
@@ -123,12 +142,12 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 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:     $<"
+       echo "compiling  .java -> .o:     $<"
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-       echo -ne "compiling  .cc -> .o:     $$A"
+       echo "compiling  .cc -> .o:     $$A"
        $(gcc) -Ibin -c $< -o $@
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
@@ -189,7 +208,7 @@ dist:
        echo "*  This build is $(current_build)"
        echo "***********************************************************"
 
-        ifeq ($(shell uname -n),gosset.megacz.com)
+        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 | \