X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7d051c026d997bf8472899196d3049091bc5d58e;hb=6833b92bd60998e0c08a9e4f83dbc2712faa8aa3;hp=4676d6123c77b6b9404f3089118fca30fc33b9b8;hpb=35af224a7e474b5b54c338e3cc70ad509b8f56b2;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 4676d61..7d051c0 100644 --- a/Makefile +++ b/Makefile @@ -10,32 +10,40 @@ 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_classes := $(java_sources:src/%.java=bin/%.class) 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) c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o) # tools -gcc_path := $(shell pwd)/gcc +gcc_path := $(shell pwd)/gcc/install #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions #gcc_optimzations += -funroll-loops -ffunction-sections -fdata-sections -gcc_optimizations := -O0 +gcc_optimizations := -O2 debug := gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg -gcj_flags := -fCLASSPATH=bin +gcj_flags := -fCLASSPATH=src gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags) g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags) gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags) -gcjh := $(gcc_path)/bin/gcjh +gcjh := $(gcc_path)/bin/$(target)-gcjh as := $(gcc_path)/$(target)/bin/as ar := $(gcc_path)/$(target)/bin/ar @@ -53,17 +61,32 @@ PATH := jikes-1.18/bin:$(PATH) ## Platform-Neutral ########################################################################### ifneq ($(verbose),true) -.SILENT: $(java_classes) $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) +.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile silent := --silent endif -compile: $(java_classes) bin/org/xwt/builtin.xwar +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 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; \ @@ -76,19 +99,13 @@ 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 - cd jikes-1.18; ./configure --prefix=`pwd` && make && make install ln -sf jikes-1.18/bin/jikes .jikes -$(java_classes): $(java_sources) .javac - 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/_" - bin/org/xwt/builtin.xwar: $(xwar_sources) mkdir -p bin/org/xwt cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%) @@ -137,21 +154,40 @@ 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/bin/$(target)-gcj: +$(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream make -C gcc -# java_classes 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 + +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 $(java_classes) $(target_bin) +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 = ";\ - (du -b bin/org/xwt/builtin.xwar | sed "s_bin.*__");\ + (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\ echo \;;\ echo "unsigned char builtin_xwar[] = {";\ hexdump -ve '"0x" 1/1 "%x,\n"' bin/org/xwt/builtin.xwar;\ @@ -159,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 $@ @@ -174,21 +210,23 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz cd src/org/ijg/jpeg-6b; ./configure --target=$(target) cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) .. - cd src/org/ijg; patch -p0 < jmorecfg.h.patch + 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: $<" + @echo "compiling .cc -> .o: $<" @mkdir -p `dirname $@` - $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -c $< -o $@ + $(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:/cvs co upstream +.upstream: + mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install + touch .upstream + ## Platforms ############################################################################## @@ -201,39 +239,47 @@ 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/*.a - ar x /usr/lib/libcc_dynamic.a upstream/darwin/darwin-fpsave.o + ranlib upstream/Darwin/lib/*.a + ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o make gcj \ platform=Darwin \ target=powerpc-apple-darwin \ target_bin=xwt.darwin \ - platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \ + platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \ platform_java_sources="POSIX X11" -Carbon: upstream +Carbon: echo -e "\\n=== Carbon =========================================" - ranlib upstream/darwin/*.a - ar x /usr/lib/libcc_dynamic.a upstream/darwin/darwin-fpsave.o make gcj \ platform=Carbon \ target=powerpc-apple-darwin \ target_bin=xwt.carbon \ - platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \ + platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" \ platform_java_sources="POSIX Carbon" -Java2: $(java_classes) bin/org/xwt/builtin.xwar +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 \ @@ -253,7 +299,8 @@ current_build := $(shell cat next.build) this_branch := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD) this_branch_flag := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch)) -dist: +# pre-depend on compile as a sanity check +dist: compile # this will fail if we haven't checked-in since the comment is null; we want this. cvs commit -m '' > /dev/null cvs tag -F xwt-$(current_build) @@ -268,8 +315,7 @@ dist: 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 @@ -277,11 +323,11 @@ dist-private: make $(silent) update-build # preserve gcc across builds so we don't have to remake it - mv gcc/Makefile Makefile.gcc mkdir -p $(HOME)/dist.xwt.org-gcc - rm -rf gcc + mv gcc gcc- ln -s $(HOME)/dist.xwt.org-gcc gcc - mv Makefile.gcc gcc/Makefile + mv -f gcc-/Makefile gcc/ + mv -f gcc-/*.patch gcc/ # build it nice -n 19 make all