X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9c249c136a06efa8e58ac4d6ec576dc317907b2a;hb=36b17515a42e468be7db1346384ce98df3e30882;hp=16e15b7b31b78ffcec3378392819572fcef5616c;hpb=7cdb6f2bc07df1e9d2eeeaea537bc33e7463f816;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 16e15b7..cf38732 100644
--- a/Makefile
+++ b/Makefile
@@ -1,199 +1,259 @@
-#           
-# The XWT Makefile
+#############################################################################
 #
+# The XWT Makefile
 
-## Configurables ###########################################################################
-
-# 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)
-cc_sources             := src/org/xwt/plat/$(platform).cc
-
-# outputs
-jikes_java_objects     := $(jikes_java_sources:src/%.java=bin/%.class)
-cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
-gcj_java_objects       := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
-
-# tools
-gcc_path               := $(shell pwd)/gcc
-gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g
-gcj_flags              := -fCLASSPATH=bin 
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-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
-all_platforms          := Win32 Linux Java2
-
-
-## Platform-Neutral ###########################################################################
-
-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)
-	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"
-
-bin/org/xwt/builtin.xwar: $(xwar_sources)
-	mkdir -p bin/org/xwt
-	cd src; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
-
-clean:
-	rm -rf bin-* bin
-	find . -name \*~ | xargs rm -f
-	find . -name \#\*\# | xargs rm -f
-
-update-build:
-	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
-	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 'this comment should not appear in CHANGES' next.build CHANGES
-	echo committed.
-
-
-## GCJ-Derived Platforms #######################################################################
+#
 
-# if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/bin/$(target)-gcj:
-	cd gcc; make
+target_Darwin := powerpc-apple-darwin
+target_Win32  := i686-pc-mingw32
+target_Solaris := sparc-sun-solaris2.7
+target_Linux := i686-pc-linux-gnu
+target := $(target_$(platform))
+
+all:         JVM Linux Win32 Darwin Solaris
+
+clean:      ; rm -rf build
+dist-clean:
+	rm -rf .jikes .configure* .install* build .compile .build*
+	find upstream -name config.cache -exec rm {} \;
+	test -e upstream/mips && make -C upstream/mips clean
+
+JVM:        build/JVM/xwt.jar
+Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
+Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
+Darwin:   ; make gcj platform=Darwin  link_flags="$(darwin_linker_flags)"
+
+darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
+darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
+darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
+darwin_ogl_libdir   := /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
+darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin_libdir)/libGL.dylib
+darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
+darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
+
+target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
+target_bin_extension_Win32       := exe
+target_bin_extension_JVM         := jar
+target_bin_extension             := $(target_bin_extension_$(platform))
+target_bin                       := xwt.$(target_bin_extension)
+
+jikes_flags        := -nowarn
+gcc_optimizations  := -O2
+#gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
+#gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
+
+gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)
+gcc_flags          += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include
+gcc_flags          += -Iupstream/install/include
+gcj_flags          := -fCLASSPATH=build/java
+g++_flags          := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
+gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
+g++                := upstream/install/bin/$(target)-gcj $(gcc_flags)
+gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+
+gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)
+
+include Makefile.upstream
+
+java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
+
+
+### Java Class Files ##############################################################################
+
+build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
+	mkdir -p build/java/org/xwt/translators
+	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
+	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n';                           \
+	 java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
+	 | sed 's,//.*$$,,;'| tr -d '\n') > build/java/org/xwt/translators/MIPSApps.java
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
+
+build/java/org/xwt/%.java: src/org/xwt/%.java
+	make build/class/org/xwt/util/Preprocessor.class
+	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+
+build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/util/
+	./.jikes $<
+
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java`
+compile: .compile
+.compile: $(java_sources) .jikes .install_mips2java
+	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+	@rm -f $(java_sources:build/java/%.java=build/class/%.class)
+	mkdir -p build/class
+	@./.jikes $(java_sources)
+	touch .compile
+
+build/JVM/xwt.jar: .compile build/res/builtin.jar
+	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
+	mkdir -p build/JVM
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+	cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
+	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+		`find . \! -type d \! -path './org/xwt/mips/*'` \
+		$(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
+
+
+### GCJH Headers ##############################################################################
+
+java_headers          := $(java_sources:build/java/%.java=build/h/%.h) 
+build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
+build/h/%.h: build/class/%.class .compile
+	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
+	mkdir -p `dirname $@`
+	ls `echo $< | sed s/.class\$$//`*.class |\
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs $(gcjh) -d ../h --classpath .)
 
-gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
-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
+### Native Code ##############################################################################
 
-.headers: $(jikes_java_objects)
-	cd bin; for A in `find * -name \*.class`; do \
-		echo "extracting .class -> .h:     $$A"; \
-		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
-		done
-	echo "extracting .class -> .h:     done"
-	touch .headers
+# a hack since we've disabled gcj's awt implementation
+build/$(platform)/org/xwt/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/xwt/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
 
-# turn off optimization of Trap.java due to a compiler bug
-bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
+build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
+	@echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
+	$(gcj) -Os -c $< -o $@
 
-$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(jikes_java_objects)
-	echo -ne "compiling  .java -> .o:     $<"
+build/$(platform)/%.java.o: build/java/%.java
+	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "compiling  .cc -> .o:     $$A"
-	$(gcc) -Ibin -c $< -o $@
-
-bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-	echo "wrapping   .xwar -> .o"
-	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
-
-
-
-## Platforms ##############################################################################
-
-Linux:
-	echo -e "\\n=== Linux ========================================="
-	make gcj \
-		platform=Linux \
-		target=i686-pc-linux-gnu \
-		target_bin=xwt.linux \
-		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
-		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
-
-Win32:
-	echo -e "\\n=== Win32 ========================================="
-	make gcj \
-		platform=Win32 \
-		target=i686-pc-mingw32 \
-		target_bin=xwt.exe \
-		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
-		platform_java_sources=src/org/xwt/plat/Win32.java
-
-Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
-	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-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 | tr \\012 \\015
-	echo
-
-$(java2_objects:bin/%=%)
-
-PalmOS:
-	echo "PalmOS is not yet supported"
-	false
-
-
-## dist.xwt.org ############################################################################
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+	@make $(java_headers)
+	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
+	$(g++) -c $< -o $@
+
+build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o)
+	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
+	mkdir -p build/$(platform)
+	rm -f $@
+	upstream/install/$(target)/bin/ar rc $@ $^
+	upstream/install/$(target)/bin/ranlib $@
+
+upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
+$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
+	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
+	mkdir -p build/$(platform)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+
+
+### Builtin Resources ##############################################################################
+
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
+build/res/fonts/vera: .download_vera-1.10
+	mkdir -p build/res/fonts/vera
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
+	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
+	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+build/$(platform)/builtin.o: build/res/builtin.jar
+	@echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
+	@(echo "unsigned int builtin_length = ";                                \
+		(wc -c build/res/builtin.jar | sed "s_build.*__");              \
+		echo \;;                                                        \
+		echo "unsigned char builtin_bytes[] = {";                       \
+		hexdump -ve '"0x" 1/1 "%x,\n"' build/res/builtin.jar;           \
+		echo "};") > .builtin.c
+	$(gcc) -c .builtin.c -o build/$(platform)/builtin.o
+
+
+build/mips/%.c.o: src/%.c .download_libmspack-20030726
+	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
+	mkdir -p $(@D)
+	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
+	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
+		-Iupstream/freetype-2.1.4/src/include  \
+		-Iupstream/libmspack-20030726/src/mspack \
+		-c -o $@ $<
+
+build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o 
+	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
+	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
+	mkdir -p build/mips build/res
+	upstream/install/bin/mips-unknown-elf-gcc \
+		--static \
+		-march=mips1 \
+		-T upstream/mips/org/xwt/mips/linker.ld \
+		-L upstream/mips/build/org/xwt/mips/ \
+		-L upstream/freetype-2.1.4/src/objs \
+		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
+		-o $@ \
+		$^ \
+		-lfreetype \
+		-lmspack   \
+		-Wl,--gc-sections
+
+
+### Maintainer ######################################################################################
+
+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
 
 current_build         := $(shell cat next.build)
-
-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 "***********************************************************"
-
-        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
-
-	# preserve gcc across builds so we don't have to remake it
-	mv gcc/Makefile Makefile.gcc
-	mkdir -p $(HOME)/dist.xwt.org-gcc
-	rm -rf gcc
-	ln -s $(HOME)/dist.xwt.org-gcc gcc
-	mv Makefile.gcc gcc/Makefile
-
-	# build it
+this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
+this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
+
+strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+strip_JVM       := cp build/$(platform)/$(target_bin)
+install-dist:;     $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
+dist: compile
+        ifneq ($(shell uname -n),megacz.com)
+		echo "***********************************************************"
+		echo "*  This build is $(current_build)                                     *"
+		echo "***********************************************************"
+		cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
+		echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
+			 ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+else
+	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
+	mv next.build- next.build
+	echo -n "Next build will be "; cat next.build
+	cvs update CHANGES; echo -e \n`date +%d-%b`" =========== build $(current_build) ================" >> CHANGES
+	cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
 	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 "stripping xwt.exe and copying it to the distribution area..."
-	$(strip) bin-Win32/xwt.exe -o /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
-
-	echo "copying xwt.linux to distribution area..."
-	$(strip) bin-Linux/xwt.linux -o /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
-
-	echo
-	echo "*** DONE ******************************************"
+	make install-dist platform=Win32
+	make install-dist platform=Linux
+	make install-dist platform=Solaris
+	make install-dist platform=Darwin
+	make install-dist platform=JVM
+	echo -e "\n\n\n*** DONE ******************************************"
+endif