2003/08/19 21:25:03
[org.ibex.core.git] / Makefile
index 1cca13e..7d051c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,23 @@ jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c
 jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 
 # inputs
+java_pp_sources        := $(shell find src -name \*.java.pp)
+java_pp_postproc       := $(java_pp_sources:src/%.java.pp=bin/%.java)
 java_sources           := $(shell find src -name \*.java)
-java_headers           := $(java_sources:src/%.java=bin/%.h)
+java_headers           := $(java_sources:src/%.java=bin/%.h) $(java_pp_postproc:bin/%.java=bin/%.h)
 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
 c_sources              := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
 
+# freetype inputs
+freetype_base_sources  := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c
+freetype_other_sources := smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c
+freetype_sources       := $(freetype_base_sources:%=gcc/src/freetype-2.1.4/src/base/%)
+freetype_sources       += $(freetype_other_sources:%=gcc/src/freetype-2.1.4/src/%)
+
 # outputs
 java_objects           := $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=bin-$(platform)/%.java.o))
+java_objects           += $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_pp_postproc:bin/%.java=bin-$(platform)/%.java.o))
 java_objects           += bin-$(platform)/org/xwt/plat/GCJ.java.o
 java_objects           += $(platform_java_sources:%=bin-$(platform)/org/xwt/plat/%.java.o)
 cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
@@ -56,17 +65,28 @@ ifneq ($(verbose),true)
 silent := --silent
 endif
 
-compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
-       echo "compiling   .java -> .class:"
+compile: .javac $(java_pp_postproc) bin/org/xwt/builtin.xwar
+       echo "compiling          .java -> .class:"
+       mkdir -p bin
+       $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_pp_postproc) -d bin/ 2>&1 | \
+               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
+
+bin/org/xwt/util/Preprocessor.class: .javac
+       echo "compiling preprocessor"
        mkdir -p bin
-       $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
-               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
+       $(shell cat .javac) -classpath lib/libgcj-minimal.jar src/org/xwt/util/Preprocessor.java -d bin/ 2>&1 | \
+               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
+
+$(java_pp_postproc): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class
+       @echo "preprocessing   .java.pp -> .java:     $<"
+       @mkdir -p `dirname $@`
+       @java -cp bin org.xwt.util.Preprocessor < $< > $@
 
 # platforms
-all: Win32 Linux Java2 Darwin Carbon
+all: Win32 Linux Java2 #Solaris
 
 .javac:
-       if \
+       @if \
                type jikes && (jikes --version | grep "Version 1.18"); \
        then \
                echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
@@ -79,7 +99,7 @@ all: Win32 Linux Java2 Darwin Carbon
        else \
                echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
                echo javac > .javac; \
-       fi \
+       fi
 
 jikes:
        curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
@@ -134,19 +154,38 @@ 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
 
+gcc/src/.freetype:
+       mkdir -p gcc/src
+       curl http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz | tar xvzf - -C gcc/src
+       cd gcc/src; patch -p0 < freetype.patch
+       touch gcc/src/.freetype
+
+freetype.mips: gcc/src/.freetype
+       make -C gcc mips target=mips
+       $(gcc_path)/bin/mips-gcc \
+               --static \
+               -march=r3000 \
+               -o freetype.mips \
+               -I gcc/src/freetype-2.1.4/include \
+               $(freetype_sources) \
+               -Wl,--warn-once \
+               src/org/xwt/imp/Freetype.c \
+               $(gcc_path)/mips/lib/libc.a \
+               -Wl,-T,$(gcc_path)/mips/lib/nullmon.ld
+
 # compile is here to force compilation of the .class files (they get used via -Ibin/) without
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
 gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
 
 $(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
-       @echo "linking        .o -> $(target_bin)"
+       @echo "linking               .o -> $(target_bin)"
        $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) 
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-       @echo "wrapping    .xwar -> .o:     bin/org/xwt/builtin.o"
+       @echo "wrapping           .xwar -> .o:     bin/org/xwt/builtin.o"
        @(echo "unsigned int builtin_xwar_length = ";\
          (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
          echo \;;\
@@ -156,13 +195,13 @@ bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
        $(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
 
 $(java_headers): bin/%.h: bin/%.class
-       @echo "extracting .class -> .h:     $<"
+       @echo "extracting        .class -> .h:     $<"
        cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
                sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
                        xargs $(gcjh) --classpath .
 
 $(java_objects): bin-$(platform)/%.java.o: src/%.java
-       @echo "compiling   .java -> .o:     $<"
+       @echo "compiling          .java -> .o:     $<"
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
@@ -175,38 +214,19 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
        rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
-       @echo "compiling     .cc -> .o:     $<"
+       @echo "compiling            .cc -> .o:     $<"
        @mkdir -p `dirname $@`
        $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
 
 $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
-       @echo "compiling      .c -> .o:     $<"
+       @echo "compiling             .c -> .o:     $<"
        @mkdir -p `dirname $@`
        $(gcc) -Ibin -c $< -o $@
 
-upstream:
-       cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
-
-upstream/Carbon/include/Carbon:
-       # 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"; \
-       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 ##############################################################################
 
@@ -219,15 +239,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,windows -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
@@ -238,7 +268,7 @@ 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 ========================================="
        make gcj \
                platform=Carbon \
@@ -249,7 +279,7 @@ Carbon: upstream/Carbon/include/Carbon upstream
 
 Java2: compile bin/org/xwt/builtin.xwar
        echo -e "\\n=== Java2 ========================================="
-       echo "archiving  .class -> .jar"
+       echo "archiving         .class -> .jar"
        mkdir -p bin-Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
        cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
@@ -285,8 +315,7 @@ dist: compile
                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 $(this_branch_flag) \
-                       | 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
 
 
@@ -298,7 +327,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