From: megacz Date: Fri, 30 Jan 2004 07:04:31 +0000 (+0000) Subject: 2003/08/23 05:43:39 X-Git-Tag: RC3~731 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=0d6a7ae107dd2cc3a2e8f071703a623b93783fe4 2003/08/23 05:43:39 darcs-hash:20040130070431-2ba56-a8b1cf0e3e2c54d4333e8c718c52ada6604a0c32.gz --- diff --git a/Makefile b/Makefile index 389ae8d..cd59b13 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,10 @@ 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_generated_sources := $(java_pp_postproc) bin/org/xwt/imp/Freetype.java +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_generated_sources:bin/%.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) @@ -26,12 +26,12 @@ freetype_sources := $(freetype_base_sources:%=gcc/src/freetype-2.1.4/src/b 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 += $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_generated_sources: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) +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 @@ -55,33 +55,30 @@ 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 $(java_generated_sources) bin/org/xwt/builtin.xwar +compile: .javac $(java_generated_sources) build/xwar/builtin.xwar echo "compiling .java -> .class: [all]" - mkdir -p bin - $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_generated_sources) -d bin/ 2>&1 | \ - grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling .java -> .class: src/_" + 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/_" -bin/%.class: src/%.java .javac +build/%.class: src/%.java .javac @echo "compiling .java -> .class: $<" - @mkdir -p bin - @$(shell cat .javac) -classpath lib/libgcj-minimal.jar $< -d bin/ 2>&1 | \ - grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling .java -> .class: src/_" + @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): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class +$(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 bin org.xwt.util.Preprocessor < $< > $@ + @java -cp build org.xwt.util.Preprocessor < $< > $@ # platforms all: Win32 Linux Java2 #Solaris @@ -107,12 +104,12 @@ jikes: 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 @@ -164,7 +161,8 @@ gcc/src/.freetype: cd gcc/src; patch -p0 < freetype.patch touch gcc/src/.freetype -freetype.mips: 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 \ @@ -176,38 +174,39 @@ freetype.mips: gcc/src/.freetype $(freetype_sources) \ -Wl,--warn-once \ src/org/xwt/imp/Freetype.c \ - $(gcc_path)/mips/lib/libc.a \ + $(gcc_path)/mips/lib/libm.a \ -Wl,-s,-T,$(gcc_path)/mips/lib/nullmon.ld -bin/org/xwt/imp/Freetype.java: freetype.mips bin/org/xwt/imp/MIPS.class +build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/org/xwt/imp/MIPS.class @echo "translating .mips -> .java: $<" - @java -cp bin org.xwt.imp.MIPS org.xwt.imp.Freetype freetype.mips > bin/org/xwt/imp/Freetype.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 -Ibin/) without +# 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 +$(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 bin-$(platform)/$(target_bin) $^ $(platform_link) + $(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 +$(java_headers): build/h/%.h: build/%.class @echo "extracting .class -> .h: $<" - cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\ + 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 +$(java_objects): build/$(platform)/%.java.o: src/%.java @echo "compiling .java -> .o: $<" mkdir -p `dirname $@` $(gcj) -c $< -o $@ @@ -220,15 +219,15 @@ 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 +$(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 +$(c_objects): build/$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h @echo "compiling .c -> .o: $<" @mkdir -p `dirname $@` - $(gcc) -Ibin -c $< -o $@ + $(gcc) -Ibuild/h -c $< -o $@ .upstream: mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install @@ -284,12 +283,12 @@ Carbon: 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 =========================================" +JVM: compile build/xwar/builtin.xwar + echo -e "\\n=== JVM =========================================" echo "archiving .class -> .jar" - mkdir -p bin-Java2 + 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 @@ -343,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 diff --git a/README b/README index a582b93..6f34a57 100644 --- a/README +++ b/README @@ -38,7 +38,17 @@ Directory Structure TM - trademark information for XWT Makefile - build file for gcc 3.3 next.build - the build id of the next build to be generated - bin/ - all binary stuff generated by xwt builds + + build/ - anything generated by the build process winds up here + h/ - header files generated by gcjh + java/ - auto-generated .java source files + class/ - java .class files + xwar/ - generated xwars (mainly builtin.xwar) + Linux/ - Linux binaries + Win32/ - Win32 binaries + Carbon/ - MacOS X / Carbon binaries + Solaris/ - Solaris binaries + gcc/ - build area for a custom copy of gcc3.3 and binutils2.13 Makefile - will download, configure, compile, and private-install gcc3.3/binutils2.13 gcc.patch - a patch to make boehm-gc work on Darwin (Mac OS X)