ifneq ($(verbose),true)
.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
-#silent := --silent
+silent := --silent
endif
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"
.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)
echo "***********************************************************"
(test `uname -n` = gosset.megacz.com) || \
- ssh xwt@xwt.org /home/xwt/dist | grep -v "make...:.\(Entering\|Leaving\).directory"
+ ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
+ | grep -v "make...:.\(Entering\|Leaving\).directory"
(test `uname -n` = gosset.megacz.com) && \
- (make $(silent) dist-private &> .make-dist.out || \
+ (((make $(silent) dist-private 2>&1) >> .make-dist.out) || \
(cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false))
(test `uname -n` = gosset.megacz.com) && \