X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=3bbbef41a7a7294d4b43b540cc2162b8c37dbdc6;hb=60fefa9ae5acd22f8eeb95a6f6a59c700af155b6;hp=fb09e67877a09703ec27f6d6cf3be35c44307e8c;hpb=94cf093f6318ccd0ef8b6e5a198f55e9165d0316;p=org.ibex.core.git diff --git a/Makefile b/Makefile index fb09e67..3bbbef4 100644 --- a/Makefile +++ b/Makefile @@ -3,28 +3,30 @@ # The XWT Makefile # -all: Linux Win32 Java2 #Solaris -.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile +all: JVM Linux Win32 Carbon Java2 #Solaris + +JVM: build/JVM/xwt.jar +Linux: ; @make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-lX11 -lXext --static" +Solaris: ; @make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-lX11 -lXext" +Win32: ; @make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" +Carbon: ; @make gcj platform=Carbon target=powerpc-apple-darwin \ + platform_link=-Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration ############################################################################# # Configurables: # -target_bin := xwt.$(shell echo $(target) | tr A-Z a-z) +target_bin := xwt.$(shell echo $(platform) | tr A-Z a-z) jikes_flags := -verbose -nowarn -sourcepath src/ -gcc_path := upstream/prefix +gcc_path := upstream/install gcc_optimizations := -O2 -#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections -gcc_flags := $(gcc_optimizations) -gcj_flags := -fCLASSPATH=src +#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls +#gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections +gcc_flags := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ +gcj_flags += -fCLASSPATH=build/java gcj := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags) g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags) gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags) -gcjh := $(gcc_path)/bin/$(target)-gcjh -as := $(gcc_path)/$(target)/bin/as -ar := $(gcc_path)/$(target)/bin/ar -ranlib := $(gcc_path)/$(target)/bin/ranlib -strip := $(gcc_path)/$(target)/bin/strip jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar) @@ -39,127 +41,136 @@ jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) | # phase in any order. # - -# PHASE 1a: human-written inputs -handwritten_java_sources := $(find src -name \*.java) -handwritten_java_pp_sources := $(find src -name \*.java.pp) -handwritten_mips_sources := $(find src -name \*.mips.c) -handwritten_cc_sources := src/org/xwt/plat/$(platform).cc -handwritten_c_sources := $(jpeg_c_sources:%.c=src/org/ijg/%.c) -handwritten_xwar_sources := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) - - -# PHASE 1b: upstream code +# PHASE 1a: upstream code and how to fetch it +include Makefile.upstream jpeg_c_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c -jpeg_sources := $(jpeg_c_sources:%.c=upstream/jpeg-6b/%.c) -$(jpeg_sources): - make -C upstream .jpeg-6b -freetype_sources := $(patsubst %,upstream/freetype-2.1.4/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c) -freetype_sources += $(patsubst %,upstream/freetype-2.1.4/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c) -$(freetype_sources): upstream/.freetype-2.1.4a - make -C upstream .freetype-2.1.4 +upstream/jpeg-6b/src/%.c: download_jpeg-6b -upstream/.jikes: - make -C upstream .jikes +freetype_sources := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c smooth.c sfnt.c truetype.c +upstream/freetype-2.1.4/%.c: ; make -sC upstream freetype-2.1.4/src -$(gcc_path)/bin/$(target)-gcj: - make -C upstream .gcc-$(target) +$(gcc_path)/bin/$(target)-gcj: ; make -sC upstream gcc-3.3-$(target) +# PHASE 1b: human-written inputs +java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name \*.java)) +java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name \*.java.pp)) +java_sources += $(patsubst src/%.mips.c, build/java/%.java, $(shell find src -name \*.mips.c)) +java_sources += build/java/org/xwt/Builtin.java -# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them) -java_sources := $(handwritten_java_sources:src/%.java=build/java/%.java) -java_sources += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java) -java_sources += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java) -java_sources += build/java/org/xwt/Builtin.java -build/java/%.java: src/%.java - cd `dirname $@`; \ - A=`echo $@ | sed 's_[^/]*/_../_g'`; \ - B=`dirname $$A`; \ - C=$$B/$<; \ - ln -s $$C +# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them) +build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ +build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ +build/c/jpeg/%.c: upstream/jpeg-6b/src/%.c + @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ +build/c/freetype/%.c: upstream/freetype-2.1.4/src/base/%.c + @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ +build/c/freetype/%.c: upstream/freetype-2.1.4/src/%/%.c + @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ + +build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class + @echo "preprocessing .java.pp -> .java: $<" + @mkdir -p `dirname $@` + @rm -f $@ + @java -cp build/class org.xwt.util.Preprocessor < $< > $@ # PHASE 3: class files -class_files := $(java_sources:build/java/%.java=build/class/%.class) -class_files += build/class/org/xwt/imp/Freetype.class -build/%.class: build/java/%.java src/%.java upstream/.jikes mkdir_build - @$(shell cat upstream/.jikes) -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/_" +upstream/.jikes: ; make -sC upstream .jikes +build/class/%.class: build/java/%.java upstream/.jikes build/class/. + @echo "compiling .java -> .class: $<" + @upstream/.jikes $< +compile: .compile +.compile: $(java_sources) build/class/. + @echo "compiling .java -> .class: src/**/*.java" + @upstream/.jikes $(java_sources) + @touch .compile # PHASE 4: gcj-generated headers -java_headers := $(build_java_sources:build/java/%.java=build/h/%.h) -$(java_headers): build/h/%.h: build/%.class +java_headers := $(java_sources:build/java/%.java=build/h/%.h) +build/h/%.h: build/class/%.class .compile @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 . + @mkdir -p `dirname $@` + @ls `echo $< | sed s/.class\$$//`*.class |\ + sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../$(gcc_path)/bin/gcjh -d ../h --classpath .) # PHASE 4: object files -java_object_files := $(filter-out build/$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=build/$(platform)/%.java.o)) -java_object_files += $(pathsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources)) -java_object_files += build/$(platform)/org/xwt/imp/Freetype.java.o -cc_object_files := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o) -c_object_files := $(handwritten_c_sources:src/%.c=build/$(platform)/%.c.o) -$(java_objects): build/$(platform)/%.java.o: src/%.java +build/$(platform)/%.java.o: build/java/%.java @echo "compiling .java -> .o: $<" - mkdir -p `dirname $@` - $(gcj) -c $< -o $@ -$(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h + @mkdir -p `dirname $@` + @$(gcj) -c $< -o $@ + +build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/*.cc $(java_headers) @echo "compiling .cc -> .o: $<" @mkdir -p `dirname $@` - $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@ -$(c_object_files): build/$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h + @$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@ + +build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c @echo "compiling .c -> .o: $<" @mkdir -p `dirname $@` - $(gcc) -Ibuild/h -c $< -o $@ + @$(gcc) -Ibuild/h -c $< -o $@ # PHASE 5: linking -$(target_bin): $(objects) +$(target_bin).ar: $(java_object_files) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files) + @echo "archiving .o -> $(target_bin).ar" + @rm -f $(target_bin).ar + @$(ar) -c $(target_bin).ar $^ + +$(target_bin): $(target_bin).ar @echo "linking .o -> $(target_bin)" - $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) + @mkdir -p build/$(platform) + @$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -L$(gcc_path)/lib $(platform_link) ############################################################################## # Special treatment: # -build/java/org/xwt/Builtin.java: $(handwritten_xwar_sources) mkdir_build - @echo "wrapping .xwar -> .o: build/java/org/xwt/Builtin.java" - echo "package org.xwt;" > build/java/org/xwt/Builtin.java - echo "class Builtin {" >> build/java/org/xwt/Builtin.java - echo "public static String encoded = " >> build/java/org/xwt/Builtin.java - cd src; $(jar) cf - $(xwar_sources:src/%=%) | uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | sed 's_(.+)_"\1" +_' >> ../build/java/org/xwt/Builtin.java - echo "\"\"; } >> build/java/org/xwt/Builtin.java - -postprocessed_sources := $(handwritten_java_pp_sources:src/%.pp=build/java/%) -$(postprocessed_sources): 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 < $< > $@ - -build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class - @echo "translating .mips -> .java: $<" +build/java/org/xwt/Builtin.java:: $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) + @mkdir -p `dirname $@` build build/java build/class build/h build + @echo "zipping/uuencoding .xwt -> .java: build/java/org/xwt/Builtin.java" + @echo "package org.xwt;" > build/java/org/xwt/Builtin.java + @echo "class Builtin {" >> build/java/org/xwt/Builtin.java + @echo "public static String encoded = " >> build/java/org/xwt/Builtin.java + @cd src; $(jar) cf - $(<:src/%=%) | \ + uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \ + sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java + @echo "\"\"; }" >> build/java/org/xwt/Builtin.java + +build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/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 - -build/mips/freetype.mips: upstream/.freetype - make -C upstream .gcc-mips target=mips + @rm -f $@ + @java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java + +$(gcc_path)/bin/mips-gcc: + @make -sC upstream gcc-3.3-mips target=mips + +build/mips/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype + @mkdir -p build/mips + @echo "compiling $< -> $@ (mips)" + @$(gcc_path)/bin/mips-gcc \ + -march=mips1 \ + -I upstream/freetype-2.1.4/include \ + -c -o $@ $< + +build/mips/freetype.mips: $(gcc_path)/bin/mips-gcc build/mips/crt0.o build/mips/syscalls.o build/mips/Freetype.o upstream/.freetype-mips + @echo "compiling .c -> .mips: $@" + @mkdir -p build/mips + @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed freetype-2.1.4/src target=mips $(gcc_path)/bin/mips-gcc \ + -nostdlib \ --static \ - -mabi=32 \ - -mips1 \ - -msoft-float \ + -march=mips1 \ + -T src/org/xwt/imp/linker.ld \ + -Lbuild/mips \ + -Lupstream/freetype-2.1.4/objs \ -o $@ \ - -I gcc/src/freetype-2.1.4/include \ - $(freetype_sources) \ - -Wl,--warn-once \ - src/org/xwt/imp/Freetype.c \ - -Wl,-s,-T,$(gcc_path)/mips/lib/nullmon.ld - + build/mips/Freetype.o \ + -lfreetype ############################################################################## @@ -169,30 +180,14 @@ build/mips/freetype.mips: upstream/.freetype # 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) - echo -e "\\n=== $(target) =========================================" - -Linux: - make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" platform_java_sources="POSIX X11" - -Solaris: - make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11" - -Win32: - make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32 - -Carbon: - make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" platform_java_sources="POSIX Carbon" - -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 build; $(jar) cvfm ../xwt.jar .manifest \ - org/xwt/builtin.xwar \ +build/JVM/xwt.jar:.compile + @echo "archiving .class -> .jar: build/JVM/xwt.jar" + @mkdir -p build/JVM + @echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest + @cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \ `find . -name \*.class | grep -v org/xwt/plat/` \ - org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015 - echo + org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class + @echo @@ -200,8 +195,6 @@ JVM: compile build/xwar/builtin.xwar # Misc # -mkdirs: - mkdir -p build build/java build/class build/h build clean: find . -name \*~ | xargs rm -f find . -name \#\*\# | xargs rm -f @@ -305,13 +298,6 @@ dist-private: echo "*** DONE ******************************************" -compile: .javac $(java_sources) build/xwar/builtin.xwar build/org/xwt/imp/Freetype.class - echo "compiling .java -> .class: src/**/*.java" - mkdir -p build - cp build/org/xwt/imp/MIPS.class build/org/xwt/imp/MIPS.class.old - $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d build/ 2>&1 | \ - grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling .java -> .class: src/_" - cmp build/org/xwt/imp/MIPS.class build/org/xwt/imp/MIPS.class.old && mv build/org/xwt/imp/MIPS.class.old build/org/xwt/imp/MIPS.class