2003/07/22 04:53:55

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 5d4afb1..f79a9d0 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 \
@@ -134,7 +134,7 @@ propose-patch:
 ## 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/install/bin/$(target)-gcj:
+$(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream
        make -C gcc
 
 # compile is here to force compilation of the .class files (they get used via -Ibin/) without
@@ -184,30 +184,10 @@ $(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/Carbon/include/Carbon: upstream
-       # A disgusting hack to create symlinks to the OS X Framework headers, since the
-       # standard GCC doesn't know how to search Frameworks for header files.
-       outdir="upstream/Carbon/include"; \
-       mkdir -p $$outdir; \
-       librarydir="/System/Library"; \
-       frameworksubdir="Frameworks"; \
-       cd $$outdir; \
-       function CreateHeaderDirectories() \
-       { \
-               for framework in `ls -d $$1/*.framework`; do \
-                       name=`echo $$framework | sed 's/.*\/\([^/]*\)\.framework/\1/'`; \
-                       if [[ $$name != "" && ! -e $$name && -e $$framework/Headers ]]; then \
-                               ln -s $$framework/Headers $$name; \
-                               if [[ -e $$framework/$$frameworksubdir ]]; then \
-                                       CreateHeaderDirectories $$framework/$$frameworksubdir; \
-                               fi; \
-                       fi; \
-               done; \
-       }; \
-       CreateHeaderDirectories $$librarydir/$$frameworksubdir;
+.upstream:
+       mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
+       touch .upstream
+
 
 ## Platforms ##############################################################################
 
@@ -220,16 +200,25 @@ Linux:
                platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
                platform_java_sources="POSIX X11"
 
+Solaris:
+       echo -e "\\n=== Solaris ========================================="
+       make gcj \
+               platform=Solaris \
+               target=sparc-sun-solaris2.7 \
+               target_bin=xwt.solaris \
+               platform_link="-L$(gcc_path)/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
+Darwin:
        echo -e "\\n=== Darwin ========================================="
        ranlib upstream/Darwin/lib/*.a
        ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
@@ -240,9 +229,8 @@ Darwin: upstream
                platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
                platform_java_sources="POSIX X11"
 
-Carbon: upstream/Carbon/include/Carbon upstream
+Carbon:
        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 +276,7 @@ dist: compile
                tail -n 200 .make-dist.out | \
                        mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-               echo '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 +288,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