2003/09/03 01:00:44
[org.ibex.core.git] / Makefile
index 56ed758..cd59b13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,18 +10,28 @@ 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=build/java/%.java)
+java_generated_sources := $(java_pp_postproc) build/java/org/xwt/imp/Freetype.java
 java_sources           := $(shell find src -name \*.java)
-java_headers           := $(java_sources:src/%.java=bin/%.h)
+java_headers           := $(java_sources:src/%.java=build/h/%.h) $(java_generated_sources:build/java/%.java=build/h/%.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           += 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)
-c_objects              := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
+java_objects           := $(filter-out build/$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=build/$(platform)/%.java.o))
+java_objects           += $(java_generated_sources:build/java/%.java=build/$(platform)/%.java.o)
+java_objects           += build/$(platform)/org/xwt/plat/GCJ.java.o
+java_objects           += $(platform_java_sources:%=build/$(platform)/org/xwt/plat/%.java.o)
+cc_objects             := $(cc_sources:src/%.cc=build/$(platform)/%.cc.o)
+c_objects              := $(c_sources:src/%.c=build/$(platform)/%.c.o)
 
 # tools
 gcc_path               := $(shell pwd)/gcc/install
@@ -45,28 +55,36 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 # path
 PATH                   := jikes-1.18/bin:$(PATH)
 
-# path
-PATH                   := jikes-1.18/bin:$(PATH)
-
 
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile
 silent := --silent
 endif
 
-compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
-       echo "compiling   .java -> .class:"
-       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/_"
+compile: .javac $(java_generated_sources) build/xwar/builtin.xwar
+       echo "compiling          .java -> .class: [all]"
+       mkdir -p build
+       $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_generated_sources) -d build/ 2>&1 | \
+               grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
+
+build/%.class: src/%.java .javac
+       @echo "compiling          .java -> .class: $<"
+       @mkdir -p build
+       @$(shell cat .javac) -classpath lib/libgcj-minimal.jar $< -d build/ 2>&1 | \
+               grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
+
+$(java_pp_postproc): build/java/%.java: src/%.java.pp build/org/xwt/util/Preprocessor.class
+       @echo "preprocessing   .java.pp -> .java:  $<"
+       @mkdir -p `dirname $@`
+       @java -cp build 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; \
@@ -74,24 +92,24 @@ all: Win32 Linux Java2 Darwin Carbon
                javac GetBootClassPath.java; \
                java -cp . GetBootClassPath > .bootclasspath; \
                rm GetBootClassPath.*; \
-               echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+               echo -n "jikes -verbose -nowarn -sourcepath src/ -bootclasspath " > .javac; \
                cat .bootclasspath >> .javac; \
        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 -
        cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
        ln -sf jikes-1.18/bin/jikes .jikes
 
-bin/org/xwt/builtin.xwar: $(xwar_sources)
-       mkdir -p bin/org/xwt
-       cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
+build/xwar/builtin.xwar: $(xwar_sources)
+       mkdir -p build/xwar
+       cd src; $(jar) cf ../build/xwar/builtin.xwar $(xwar_sources:src/%=%)
 
 clean:
-       rm -rf bin-* bin
+       rm -rf build
        find . -name \*~ | xargs rm -f
        find . -name \#\*\# | xargs rm -f
 
@@ -134,35 +152,62 @@ 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
+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
+
+build/mips/freetype.mips: gcc/src/.freetype
+       mkdir -p build/mips
+       make -C gcc mips target=mips
+       $(gcc_path)/bin/mips-gcc \
+               --static \
+               -mabi=32 \
+               -mips1 \
+               -msoft-float \
+               -o $@ \
+               -I gcc/src/freetype-2.1.4/include \
+               $(freetype_sources) \
+               -Wl,--warn-once \
+               src/org/xwt/imp/Freetype.c \
+               $(gcc_path)/mips/lib/libm.a \
+               -Wl,-s,-T,$(gcc_path)/mips/lib/nullmon.ld
+
+build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/org/xwt/imp/MIPS.class
+       @echo "translating        .mips -> .java:  $<"
+       @mkdir -p build/java/org/xwt/imp/
+       @java -cp build org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
+
+# compile is here to force compilation of the .class files (they get used via -Ibuild) 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)"
-       $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) 
+$(target_bin): $(java_objects) $(cc_objects) $(c_objects) build/$(platform)/org/xwt/builtin.o
+       @echo "linking               .o -> $(target_bin)"
+       $(gcj) --main=org.xwt.Main -o build/$(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"
+build/$(platform)/org/xwt/builtin.o: build/xwar/builtin.xwar
+       @echo "wrapping           .xwar -> .o:     build/$(platform)/org/xwt/builtin.o"
        @(echo "unsigned int builtin_xwar_length = ";\
-         (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
+         (wc -c build/xwar/builtin.xwar | sed "s_build.*__");\
          echo \;;\
          echo "unsigned char builtin_xwar[] = {";\
-         hexdump -ve '"0x" 1/1 "%x,\n"' bin/org/xwt/builtin.xwar;\
+         hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar;\
          echo "};") > .builtin.c
-       $(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
+       $(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.o
 
-$(java_headers): bin/%.h: bin/%.class
-       @echo "extracting .class -> .h:     $<"
-       cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
+$(java_headers): build/h/%.h: build/%.class
+       @echo "extracting        .class -> .h:     $<"
+       cd build; find `echo $< | sed s/.class$$// | sed s_^build/__ `*.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:     $<"
+$(java_objects): build/$(platform)/%.java.o: src/%.java
+       @echo "compiling          .java -> .o:     $<"
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
@@ -174,40 +219,20 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
        cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch
        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:     $<"
+$(cc_objects): build/$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
+       @echo "compiling            .cc -> .o:     $<"
        @mkdir -p `dirname $@`
-       $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
+       $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
 
-$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
-       @echo "compiling      .c -> .o:     $<"
+$(c_objects): build/$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
+       @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: 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;
+       $(gcc) -Ibuild/h -c $< -o $@
+
+.upstream:
+       mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
+       touch .upstream
+
 
 ## Platforms ##############################################################################
 
@@ -220,6 +245,15 @@ 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 \
@@ -229,7 +263,7 @@ Win32:
                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
@@ -240,9 +274,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 \
@@ -250,12 +283,12 @@ Carbon: upstream/Carbon/include/Carbon upstream
                platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" \
                platform_java_sources="POSIX Carbon"
 
-Java2: compile bin/org/xwt/builtin.xwar
-       echo -e "\\n=== Java2 ========================================="
-       echo "archiving  .class -> .jar"
-       mkdir -p bin-Java2
+JVM: compile build/xwar/builtin.xwar
+       echo -e "\\n=== JVM ========================================="
+       echo "archiving         .class -> .jar"
+       mkdir -p build/JVM
        echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-       cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
+       cd build; $(jar) cvfm ../xwt.jar .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
@@ -288,7 +321,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 +333,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
@@ -309,13 +342,13 @@ dist-private:
        echo === master.dist.xwt.org ==================================
 
        echo "copying xwt.jar to distribution area..."
-       cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+       cp xwt.jar /var/www/master.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/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+       $(strip) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
        echo "copying xwt.linux to distribution area..."
-       $(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+       $(strip) build/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