2003/02/28 00:40:54

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index d8c83dc..6f95c14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,8 @@ compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 all: $(all_platforms)
 
 $(jikes_java_objects): $(jikes_java_sources)
-       echo -ne "compiling  .java -> .class:\\r"
+       test "$(JAVA_HOME)"x != x || (echo "you forgot to set your $$JAVA_HOME environment variable"; false)
+       echo "compiling  .java -> .class:"
        mkdir -p bin
        $(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
        echo "compiling  .java -> .class: done"
@@ -83,22 +84,22 @@ link: $(gcj_java_objects) $(cc_objects)
 
 .headers: $(jikes_java_objects)
        cd bin; for A in `find * -name \*.class`; do \
-               echo -ne "\033[K\\rextracting .class -> .h:     $$A\\r"; \
+               echo "extracting .class -> .h:     $$A"; \
                $(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
                done
-       echo -e "\033[K\\rextracting .class -> .h:     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 $(jikes_java_objects)
-       echo -ne "\033[K\\rcompiling  .java -> .o:     $<\\r"
+       echo -ne "compiling  .java -> .o:     $<"
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-       echo -ne "\033[K\\rcompiling  .cc -> .o:     $$A\\r"
+       echo -ne "compiling  .cc -> .o:     $$A"
        $(gcc) -Ibin -c $< -o $@
 
 bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
@@ -162,11 +163,11 @@ dist:
                        | grep -v "make...:.\(Entering\|Leaving\).directory"
 
        (test `uname -n` = gosset.megacz.com) && \
-               (make $(silent) dist-private 2>> .make-dist.out >> .make-dist.out || \
-                       (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false))
+               (((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))
 
        (test `uname -n` = gosset.megacz.com) && \
-               (cat .make-dist.out | \
+               (tail -n 200 .make-dist.out | \
                        mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org < /dev/null)
 
 dist-private: