2003/03/10 23:48:52

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index c803fb9..5d131d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@
 
 # 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)
+gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+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
@@ -21,13 +21,13 @@ gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-siblin
 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
+gcjh                   := $(gcc_path)/bin/gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 strip                  := $(gcc_path)/$(target)/bin/strip
-jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
+jikes                  := jikes -bootclasspath /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Classes/classes.jar -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
-all_platforms          := Win32 Linux Java2
+all_platforms          := Win32 Linux Java2 Darwin
 
 
 ## Platform-Neutral ###########################################################################
@@ -42,7 +42,7 @@ 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)
+       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/
@@ -58,6 +58,7 @@ clean:
        find . -name \#\*\# | xargs rm -f
 
 update-build:
+       cvs tag -F xwt-$(current_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 "
@@ -120,6 +121,15 @@ 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"
 
+Darwin:
+       echo -e "\\n=== Darwin ========================================="
+       make gcj \
+               platform=Darwin \
+               target=powerpc-apple-darwin \
+               target_bin=xwt-x11.darwin \
+               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 \
@@ -153,7 +163,8 @@ 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
+       cvs commit -m '' > /dev/null
+       cvs tag -F xwt-$(current_build)
 
        echo "***********************************************************"
        echo "*  This build is $(current_build)"
@@ -165,7 +176,7 @@ dist:
                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 \
+               ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(current_build) \
                        | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
@@ -195,5 +206,10 @@ dist-private:
        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 "creating source tarball in distribution area..."
+       CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
+       mv xwt xwt-$(current_build)
+       tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build)
+
        echo
        echo "*** DONE ******************************************"