X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=239f18efdbfd7596ba9277044dd8b2b7e769cc42;hp=4e361a84603d332b06b78b809e4269d47a898006;hb=90c5107bee21062f773cad22aab2a9f1c41e8930;hpb=c07a76e41037530bfdcd9905a8610ce212688956 diff --git a/Makefile b/Makefile index 4e361a8..239f18e 100644 --- a/Makefile +++ b/Makefile @@ -1,62 +1,235 @@ -# +############################################################################# +# # The XWT Makefile # -## Configurables ########################################################################### - -# inputs -jikes_java_sources := $(shell find src -name *.java) -gcj_java_sources := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources) -xwar_sources := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) -cc_sources := src/org/xwt/plat/$(platform).cc - -# outputs -jikes_java_objects := $(jikes_java_sources:src/%.java=bin/%.class) -cc_objects := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o) -gcj_java_objects := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o) - -# tools -gcc_path := $(shell pwd)/gcc -gcc_flags := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g -gcj_flags := -fCLASSPATH=bin -gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags) -gcc := $(gcc_path)/bin/$(target)-g++ $(gcc_flags) -gcjh := $(gcc_path)/bin/$(target)-gcjh +all: JVM Linux Win32 Java2 #Solaris +.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile + + +############################################################################# +# Configurables: +# +target_bin := xwt.$(shell echo $(platform) | tr A-Z a-z) +jikes_flags := -verbose -nowarn -sourcepath src/ +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) -Ibuild/h +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/gcjh +as := $(gcc_path)/$(target)/bin/as ar := $(gcc_path)/$(target)/bin/ar -jikes := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn +ranlib := $(gcc_path)/$(target)/bin/ranlib +strip := $(gcc_path)/$(target)/bin/strip +jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar) + + + +############################################################################# +# Overview: +# +# The Makefile has been divided into phases; each phase depends on the +# previous one. Subphases of the same phase (ie 1a, 1b) are not +# interdependent. You can think of the build process as proceeding +# through the phases in order, but processing subphases within a given +# phase in any order. +# -# platforms -all_platforms := Win32 Linux Java2 +# PHASE 1a: upstream code +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/src/%.c) +$(jpeg_sources): + make -sC upstream jpeg-6b/src + +freetype_sources := $(patsubst %,upstream/freetype-2.1.4/src/src/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c) +freetype_sources += $(patsubst %,upstream/freetype-2.1.4/src/src/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c) +$(freetype_sources): + make -sC upstream freetype-2.1.4/.installed + +upstream/.jikes: + make -sC upstream .jikes + +$(gcc_path)/bin/$(target)-gcj: + make -sC upstream gcc-3.3-$(target) + + +# PHASE 1b: human-written inputs +handwritten_java_sources := $(shell find src -name \*.java) +handwritten_java_pp_sources := $(shell find src -name \*.java.pp) +handwritten_mips_sources := $(shell find src -name \*.mips.c) +handwritten_cc_sources := src/org/xwt/plat/$(platform).cc +handwritten_c_sources := $(jpeg_sources) +handwritten_xwar_sources := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) + + +# 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 +#java_sources += build/java/org/xwt/imp/Freetype.java +$(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java + @echo "symlinking: $@" + @mkdir -p `dirname $@`; \ + cd `dirname $@`; \ + A=`echo $@ | sed 's_[^/]*/_../_g'`; \ + B=`dirname $$A`; \ + C=$$B/$<; \ + ln -s $$C + + +# PHASE 3: class files +class_files := $(java_sources:build/java/%.java=build/class/%.class) +$(class_files): build/class/%.class: build/java/%.java upstream/.jikes + @echo "compiling .java -> .class: $<" + @mkdir -p build/class + @upstream/.jikes $< + +compile: .compile +.compile: $(java_sources) + @echo "compiling .java -> .class: src/**/*.java" + @mkdir -p build/class + @upstream/.jikes $(java_sources) + @touch .compile + +# PHASE 4: gcj-generated headers +java_headers := $(java_sources:build/java/%.java=build/h/%.h) +$(java_headers): build/h/%.h: build/class/%.class .compile + @echo "extracting .class -> .h: $<" + @mkdir -p `dirname $@` + @ls `echo $< | sed s/.class\$$//`*.class |\ + sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../$(gcjh) -d ../h --classpath .) + +# PHASE 4: object files +java_object_files := $(filter-out build/$(platform)/org/xwt/plat/%,$(java_sources:build/java/%=build/$(platform)/%.o)) +java_object_files += $(patsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources)) +cc_object_files := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o) +c_object_files := $(handwritten_c_sources:upstream/jpeg-6b/src/%.c=build/$(platform)/jpeg-6b/%.c.o) +$(java_object_files): 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) + @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)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c + @echo "compiling .c -> .o: $<" + @mkdir -p `dirname $@` + @$(gcc) -Ibuild/h -c $< -o $@ + +# PHASE 5: linking +$(target_bin): $(java_object_files) $(cc_object_files) $(c_object_files) + @echo "linking .o -> $(target_bin)" + @mkdir -p build/$(platform) + @$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) + + +############################################################################## +# Special treatment: +# -## Platform-Neutral ########################################################################### +build/java/org/xwt/Builtin.java:: $(handwritten_xwar_sources) + @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 - $(handwritten_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/class/org/xwt/util/Preprocessor.class + @echo "preprocessing .java.pp -> .java: $<" + @mkdir -p `dirname $@` + @rm -f $@ + @java -cp build/class 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: $@" + @mkdir -p build/java/org/xwt/imp/ + @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 + +build/mips/freetype.mips: $(freetype_mips_objects) + @echo "compiling .c -> .mips: $@" + @mkdir -p build/mips + @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips + @$(gcc_path)/bin/mips-gcc \ + --static \ + -mabi=32 \ + -mips1 \ + -msoft-float \ + -o $@ \ + -I upstream/freetype-2.1.4/src/include \ + $(freetype_sources) \ + -mno-crt0 \ + -Tnullmon.ld \ + -Wl,--warn-once \ + src/org/xwt/imp/Freetype.c \ + -Wl,-s + + + +############################################################################## +# Supported Platforms: +# -ifneq ($(verbose),true) -.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar -silent := --silent -endif +# 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) =========================================" -compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar +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" -all: $(all_platforms) +Solaris: + @make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11" -$(jikes_java_objects): $(jikes_java_sources) - test "$(JAVA_HOME)"x != x || (echo "you forgot to set your $$JAVA_HOME environment variable"; false) - echo "compiling .java -> .class:" - mkdir -p bin - $(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/ - echo "compiling .java -> .class: done" +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" -bin/org/xwt/builtin.xwar: $(xwar_sources) - mkdir -p bin/org/xwt - cd src; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%) +JVM: build/JVM/xwt.jar +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 + @echo + + + +############################################################################## +# Misc +# clean: - rm -rf bin-* bin find . -name \*~ | xargs rm -f find . -name \#\*\# | xargs rm -f + + +############################################################################## +# Maintainer stuff: generating numbered builds, proposing patches +# + update-build: + cvs tag -F xwt-$(current_build) (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build- mv next.build- next.build echo -n "Next build will be " @@ -68,131 +241,98 @@ update-build: cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES echo committed. - -## 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: - cd gcc; make - -gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link - -link: $(gcj_java_objects) $(cc_objects) - echo "linking .o -> $(target_bin)" - $(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o - $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar - -.headers: $(jikes_java_objects) - cd bin; for A in `find * -name \*.class`; do \ - echo "extracting .class -> .h: $$A"; \ - $(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \ - done - echo "extracting .class -> .h: done" - touch .headers - -# turn off optimization of Trap.java due to a compiler bug -bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g - -$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(jikes_java_objects) - echo -ne "compiling .java -> .o: $<" - mkdir -p `dirname $@` - $(gcj) -c $< -o $@ - -$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc - echo -ne "compiling .cc -> .o: $$A" - $(gcc) -Ibin -c $< -o $@ - -bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources) - echo "archiving .xwt -> .xwar" - $(gcj) --resource org/xwt/builtin.xwar -c $< -o $@ - - - -## Platforms ############################################################################## - -Linux: - echo -e "\\n=== Linux =========================================" - make gcj \ - platform=Linux \ - target=i686-pc-linux-gnu \ - target_bin=xwt.linux \ - platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \ - platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java" - -Win32: - echo -e "\\n=== Win32 =========================================" - make gcj \ - platform=Win32 \ - target=i686-pc-mingw32 \ - target_bin=xwt.exe \ - platform_link="-Wl,--subsystem,windows -lcomdlg32" \ - platform_java_sources=src/org/xwt/plat/Win32.java - -Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar - echo -e "\\n=== Java2 =========================================" - echo "archiving .class -> .jar" - mkdir -p bin-Java2 - echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest - cd bin; fastjar cvf ../bin-Java2/xwt.jar -m .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 - echo - -$(java2_objects:bin/%=%) - -PalmOS: - echo "PalmOS is not yet supported" - false - - -## dist.xwt.org ############################################################################ +propose-patch: + @echo -n "Please type a one-line description of this bug: "; \ + read A; \ + echo; \ + echo "Please type any additional comments that explain this patch."; \ + echo "If this patch fixes a bug, include a link to bugs.xwt.org."; \ + echo "When you are done, press control-d on a new line."; \ + echo; \ + ( echo -e "HELO patcher"; \ + echo -e "MAIL FROM:$(USER)@xwt.org"; \ + echo -e "RCPT TO: patches@xwt.org"; \ + echo -e "DATA"; \ + echo -e "From: $(USER)@xwt.org"; \ + echo -e "To: patches@xwt.org"; \ + echo -e "Subject: proposed patch to $(this_branch): $$A"; \ + echo -e ""; \ + cat; \ + echo; \ + cvs diff -Bud; \ + echo .; \ + ) > .message + bash -c "cat .message > /dev/tcp/mail.xwt.org/25" # /dev/tcp is faked by bash; not part of the os 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) echo "***********************************************************" echo "* This build is $(current_build)" echo "***********************************************************" - ifeq ($(shell uname -n),gosset.megacz.com) + ifeq ($(shell uname -n),serverbeach.megacz.com) (make $(silent) dist-private 2>&1) >> .make-dist.out || \ (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false) tail -n 200 .make-dist.out | \ mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org - elsif - ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \ - | grep -v "make...:.\(Entering\|Leaving\).directory" + else + 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 - 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 echo - echo === dist.xwt.org ================================== + echo === master.dist.xwt.org ================================== echo "copying xwt.jar to distribution area..." - cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned + cp xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned - echo "copying xwt.exe to distribution area..." - cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned + echo "stripping xwt.exe and copying it to the distribution area..." + $(strip) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned echo "copying xwt.linux to distribution area..." - cp bin-Linux/xwt.linux /var/www/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 + mv xwt xwt-$(current_build) + tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build) echo echo "*** DONE ******************************************" + + + + + + + +#mips: $(prefix)/mips/lib/libm.a +#$(prefix)/mips/lib/libm.a: src/.newlib $(prefix)/bin/mips-gcc +# mkdir -p build/$(target)/newlib +# cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH \ +# ../../../src/newlib-1.11.0/configure --nfp --enable-multilib --prefix=$(prefix) --target=mips +# cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH EXTRA_CFLAGS=-mstrict-align make +# cd build/$(target)/newlib; make install +# FIXME: this is probably going to cause problems... figure out how to get by without it +# touch .empty.c +# $(prefix)/bin/mips-gcc -c .empty.c -o $(prefix)/mips/lib/crt0.o