From 08ec20e29c8c1e4646cc05e2f9269798bbc8b101 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:54:05 +0000 Subject: [PATCH] 2003/02/27 06:09:35 darcs-hash:20040130065405-2ba56-10efed85ad930f974b4243f4187f327dec83a8a4.gz --- Makefile | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index f93ba5b..d95c353 100644 --- a/Makefile +++ b/Makefile @@ -31,17 +31,20 @@ all_platforms := Win32 Linux Java2 ## Platform-Neutral ########################################################################### -.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar +ifneq ($(verbose),true) +.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar nohup-dist +silent := --silent +endif compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar all: $(all_platforms) $(jikes_java_objects): $(jikes_java_sources) - echo -ne " .java -> .class:\\r" + echo -ne "compiling .java -> .class:\\r" mkdir -p bin $(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/ - echo " .java -> .class: done" + echo "compiling .java -> .class: done" bin/org/xwt/builtin.xwar: $(xwar_sources) mkdir -p bin/org/xwt @@ -57,8 +60,11 @@ update-build: mv next.build- next.build echo -n "Next build will be " cat next.build + cvs update CHANGES + echo `date +%d-%b`" ==== build $(current_build) ==============================" >> CHANGES + echo "" >> CHANGES echo committing... - cvs commit -m 'updated next.build' next.build + cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES echo committed. @@ -71,31 +77,32 @@ $(shell pwd)/gcc/bin/$(target)-gcj: gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link link: $(gcj_java_objects) $(cc_objects) + echo "linking .o -> $(target_bin)" $(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar .headers: $(jikes_java_objects) cd bin; for A in `find * -name \*.class`; do \ - echo -ne "\033[K\\r.class -> .h: $$A\\r"; \ + echo -ne "\033[K\\rextracting .class -> .h: $$A\\r"; \ $(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \ done - echo -e "\033[K\\r.class -> .h: done" + echo -e "\033[K\\rextracting .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\\r .java -> .o: $<\\r" + echo -ne "\033[K\\rcompiling .java -> .o: $<\\r" mkdir -p `dirname $@` $(gcj) -c $< -o $@ $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc - echo -ne "\033[K\\r .cc -> .o: $$A\\r" + echo -ne "\033[K\\rcompiling .cc -> .o: $$A\\r" $(gcc) -Ibin -c $< -o $@ bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources) - echo "bundling -> .xwar" + echo "archiving .xwt -> .xwar" $(gcj) --resource org/xwt/builtin.xwar -c $< -o $@ @@ -121,12 +128,15 @@ Win32: platform_java_sources=src/org/xwt/plat/Win32.java Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar - mkdir -p bin-Java12 + echo -e "\\n=== Java2 =========================================" + echo "archiving .class -> .jar" + mkdir -p bin-Java2 echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest - cd bin; fastjar cvf ../bin-Java12/xwt.jar -m .manifest \ + cd bin; fastjar cvf ../bin-Java2/xwt.jar -m .manifest \ org/xwt/builtin.xwar \ `find . -name \*.class | grep -v org/xwt/plat/` \ - org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class + org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015 + echo $(java2_objects:bin/%=%) @@ -142,7 +152,8 @@ current_build := $(shell cat next.build) nohup-dist: rm .make-dist.out touch .make-dist.out - (nice -n 19 nohup make dist &>/dev/null) & tail -f .make-dist.out + nice -n 19 nohup make dist & \ + tail -f .make-dist.out | grep -v "make...:.\(Entering\|Leaving\).directory" dist: test `uname -n` = gosset.megacz.com || \ @@ -151,11 +162,11 @@ dist: echo "* This build is $(current_build)" echo "***********************************************************" - make --silent update-build - (make --silent dist-private &> .make-dist.out) || \ + make $(silent) update-build + (make $(silent) dist-private &> .make-dist.out) || \ (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false) cat .make-dist.out | \ - mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org + mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org < /dev/null dist-private: # preserve gcc across builds so we don't have to remake it @@ -168,7 +179,17 @@ dist-private: # build it nice -n 19 make all + echo + echo === dist.xwt.org ================================== + + echo "copying xwt.jar to distribution area..." cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned + + echo "copying xwt.exe to distribution area..." cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned + + echo "copying xwt.linux to distribution area..." cp bin-Linux/xwt.linux /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned + echo + echo "*** DONE ******************************************" -- 1.7.10.4