2003/07/15 12:06:38

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 56ed758..dda8468 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
                grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
 
 # platforms
-all: Win32 Linux Java2 Darwin Carbon
+all: Win32 Linux Java2 Solaris
 
 .javac:
        if \
@@ -184,8 +184,9 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        @mkdir -p `dirname $@`
        $(gcc) -Ibin -c $< -o $@
 
-upstream:
-       cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
+.upstream:
+       curl http://www.megacz.com/upstream.tgz | tar xvzf -
+       touch .upstream
 
 upstream/Carbon/include/Carbon: upstream
        # A disgusting hack to create symlinks to the OS X Framework headers, since the
@@ -220,13 +221,22 @@ Linux:
                platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
                platform_java_sources="POSIX X11"
 
+Solaris: .upstream
+       echo -e "\\n=== Solaris ========================================="
+       make gcj \
+               platform=Solaris \
+               target=sparc-sun-solaris2.7 \
+               target_bin=xwt.solaris \
+               platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext" \
+               platform_java_sources="POSIX X11"
+
 Win32:
        echo -e "\\n=== Win32 ========================================="
        make gcj \
                platform=Win32 \
                target=i686-pc-mingw32 \
                target_bin=xwt.exe \
-               platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+               platform_link="-Wl,--subsystem,console -lcomdlg32" \
                platform_java_sources="Win32"
 
 Darwin: upstream
@@ -242,7 +252,6 @@ Darwin: upstream
 
 Carbon: upstream/Carbon/include/Carbon upstream
        echo -e "\\n=== Carbon ========================================="
-       cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh
        make gcj \
                platform=Carbon \
                target=powerpc-apple-darwin \
@@ -288,7 +297,7 @@ dist: compile
                tail -n 200 .make-dist.out | \
                        mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-               echo 'export JAVA_HOME=/usr/lib/j2sdk1.4;cd /home/xwt;date=`date +%d-%b-%H%M`;mkdir xwt-$$date;cd xwt-$$date;/usr/bin/cvs -d /cvs co $(this_branch_flag) xwt;mv xwt/* .;mv xwt/.* .;rmdir xwt;touch .make-dist.out;nohup make dist &> /dev/null &;echo;cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+               echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 
@@ -300,7 +309,7 @@ dist-private:
        mv gcc gcc-
        ln -s $(HOME)/dist.xwt.org-gcc gcc
        mv -f gcc-/Makefile gcc/
-       mv -f gcc-/gcc.patch gcc/
+       mv -f gcc-/*.patch gcc/
 
        # build it
        nice -n 19 make all