-#
+#
# The XWT Makefile
#
# inputs
jikes_java_sources := $(shell find src -name *.java)
gcj_java_sources := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-xwar_sources := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+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
# outputs
gcc := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
gcjh := $(gcc_path)/bin/$(target)-gcjh
ar := $(gcc_path)/$(target)/bin/ar
+strip := $(gcc_path)/$(target)/bin/strip
jikes := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
# platforms
## Platform-Neutral ###########################################################################
-.SILENT: new-release update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar
+ifneq ($(verbose),true)
+.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
+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"
+ 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 " .java -> .class: done"
+ echo "compiling .java -> .class: done"
bin/org/xwt/builtin.xwar: $(xwar_sources)
mkdir -p bin/org/xwt
mv next.build- next.build
echo -n "Next build will be "
cat next.build
+ cvs update CHANGES
+ echo "" >> CHANGES
+ echo `date +%d-%b`" =========== build $(current_build) ================================================" >> 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.
gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
-link: $(gcj_java_objects) $(cc_objects)
+link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
+ 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 "extracting .class -> .h: $$A"; \
$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
done
- echo -e "\033[K\\r.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\\r .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\\r .cc -> .o: $$A\\r"
+ echo -ne "compiling .cc -> .o: $$A"
$(gcc) -Ibin -c $< -o $@
-bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
- echo "bundling -> .xwar"
+bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
+ echo "wrapping .xwar -> .o"
$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
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/%=%)
false
-## dist.xwt.org ############################################################################
+## master.dist.xwt.org ############################################################################
current_build := $(shell cat next.build)
-new-release:
- test `uname -n` = gosset.megacz.com || \
- (echo -e "um, new-release is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
+dist:
+ # this will fail if we haven't checked-in since the comment is null; we want this.
+ cvs commit -m '' > /dev/null
+
echo "***********************************************************"
echo "* This build is $(current_build)"
echo "***********************************************************"
- make --silent update-build
- (make --silent new-release-private &> .make-new-release.out) || \
- (cat .make-new-release.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
- cat .make-new-release.out | \
- mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org
+ ifeq ($(shell uname -n),gosset.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 | \
+ mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
+ else
+ ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
+ | grep -v "make...:.\(Entering\|Leaving\).directory"
+ endif
+
+
+dist-private:
+ make $(silent) update-build
-new-release-private:
# preserve gcc across builds so we don't have to remake it
mv gcc/Makefile Makefile.gcc
- mkdir -p ~/dist.xwt.org-gcc
+ mkdir -p $(HOME)/dist.xwt.org-gcc
rm -rf gcc
- ln -s ~/dist.xwt.org-gcc gcc
+ ln -s $(HOME)/dist.xwt.org-gcc gcc
mv Makefile.gcc gcc/Makefile
# build it
nice -n 19 make all
- cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
- cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
- cp bin-Linux/xwt.linux /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
+ echo
+ echo === master.dist.xwt.org ==================================
+
+ echo "copying xwt.jar to distribution area..."
+ cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+
+ echo "stripping xwt.exe and copying it to the distribution area..."
+ $(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+
+ echo "copying xwt.linux to distribution area..."
+ $(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+ echo
+ echo "*** DONE ******************************************"
projects / org.ibex.core.git / blobdiff