From 60fefa9ae5acd22f8eeb95a6f6a59c700af155b6 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:04:49 +0000 Subject: [PATCH 1/1] 2003/09/06 23:54:18 darcs-hash:20040130070449-2ba56-b5d6d9da31dab694fdff044ab50504271b79129e.gz --- Makefile | 136 +++++++++++++------------------- upstream/Makefile => Makefile.upstream | 108 +++++++++++-------------- 2 files changed, 100 insertions(+), 144 deletions(-) rename upstream/Makefile => Makefile.upstream (51%) diff --git a/Makefile b/Makefile index 91a39cc..3bbbef4 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,14 @@ # The XWT Makefile # -all: JVM 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 ############################################################################# @@ -14,18 +20,13 @@ 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_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/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) @@ -40,121 +41,105 @@ jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) | # phase in any order. # - -# PHASE 1a: 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/src/%.c) -$(jpeg_sources): - make -sC upstream jpeg-6b/src -#freetype_sources := $(patsubst %,upstream/freetype-2.1.4/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/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c) -upstream/.freetype-mips: - make -sC upstream .freetype-mips +upstream/jpeg-6b/src/%.c: download_jpeg-6b -upstream/.jikes: - make -sC upstream .jikes - -$(gcc_path)/bin/$(target)-gcj: - make -sC upstream gcc-3.3-$(target) +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 -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) +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 -#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 - +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/%.class: build/java/%.java upstream/.jikes +upstream/.jikes: ; make -sC upstream .jikes +build/class/%.class: build/java/%.java upstream/.jikes build/class/. @echo "compiling .java -> .class: $<" - @mkdir -p build/class @upstream/.jikes $< compile: .compile -.compile: $(java_sources) +.compile: $(java_sources) build/class/. @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 +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 .) + 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: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 +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) + +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)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c + +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) +$(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)" @mkdir -p build/$(platform) - @$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) + @$(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) +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 - $(handwritten_xwar_sources:src/%=%) | \ + @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 -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/ @@ -195,21 +180,6 @@ build/mips/freetype.mips: $(gcc_path)/bin/mips-gcc build/mips/crt0.o build/mips/ # 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 -Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration" platform_java_sources="POSIX Carbon OpenGL" - -JVM: build/JVM/xwt.jar build/JVM/xwt.jar:.compile @echo "archiving .class -> .jar: build/JVM/xwt.jar" @mkdir -p build/JVM diff --git a/upstream/Makefile b/Makefile.upstream similarity index 51% rename from upstream/Makefile rename to Makefile.upstream index 0c76cc3..46f6c5d 100644 --- a/upstream/Makefile +++ b/Makefile.upstream @@ -3,8 +3,8 @@ # The XWT upstream code Makefile # -# upstream packages we need -packages := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3 mingw-runtime-3.0 freetype-2.1.4 gcc-3.3 jpeg-6b +# deal with Apple's brokenness +setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))" # where to get stuff url_newlib-1.11.0 := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz @@ -16,6 +16,9 @@ url_gcc-3.3 := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc url_jpeg-6b := http://www.ijg.org/files/jpegsrc.v6b.tar.gz url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz +# building gcc requires binutils +configure_gcc-3.3: binutils-2.13.2.1 .configure_gcc-3.3 + # how to configure it configure_gcc-3.3 := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static @@ -26,6 +29,48 @@ configure_gcc-3.3-i686-pc-linux-gnu := --enable-threads=posix --enable-hash- configure_gcc-3.3-sparc-sun-solaris2.7 := --enable-threads=posix --disable-multilib configure_gcc-3.3-mips := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads +# vendor-supplied binaries and headers; this is stuff that comes with various OSes +vendor: .vendor +.vendor: + curl http://www.megacz.com/vendor.tgz | tar xzf - -C upstream/install + curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32 + curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32 + touch .vendor + +download_%: .download_% +.download_%: + echo -e "\ndownloading %..." + mkdir -p upstream/$* + curl $(url_$*) | tar xzf - -C upstream/$* + mv upstream/$*/$* upstream/$*/src; true + (test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true + touch $@ + +configure_%: .configure_% +.configure_%: download_% + echo -e "\nconfiguring %..." + mkdir -p $*/build-$(target) + cd -p $*/build-$(target); \ + $(setcc) ../src/configure \ + --target=$(target) \ + --prefix=`pwd`/../../install \ + $(configure_$*) \ + $(configure_$*)-$(target) + touch $@ + +install_%: .install_% +.install_%: configure_% + echo -e "\nbuilding $*..." + cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make + echo -e "\ninstalling $*..." + cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install + touch $@ + +.install_freetype-2.1.4: download_freetype-2.1.4 install_binutils-2.13.2.1 install_gcc-3.3 + cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../install/bin make CC=mips-gcc AR=mips-ar + ../install/bin/mips-ranlib freetype-2.1.4/objs/libfreetype.a + touch $@ + # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH .jikes: echo "#!/bin/sh" > .jikes @@ -43,62 +88,3 @@ configure_gcc-3.3-mips := --enable-languages=c --nfp --with-new echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes echo 'exit $$EXIT' >> .jikes chmod +x .jikes - -# make the package's directory (if it doesn't exist) -$(packages): - mkdir -p $@ install - -.headers: - curl http://www.megacz.com/upstream.tgz | tar xzf - -C upstream/install - touch .headers - -# if the make target was specified in $(package)-$(target) format, break it apart and recurse -$(packages:%=%-$(target)): %-$(target): % - make $