# inputs
java_pp_sources := $(shell find src -name \*.java.pp)
-java_pp_postproc := $(java_pp_sources:src/%.java.pp=bin/%.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_pp_postproc: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)
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_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)
+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
# 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_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/_"
+compile: .javac $(java_generated_sources) build/xwar/builtin.xwar
+ echo "compiling .java -> .class: [all]"
+ 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/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/_"
+build/%.class: src/%.java .javac
+ @echo "compiling .java -> .class: $<"
+ @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
- @echo "preprocessing .java.pp -> .java: $<"
+$(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
javac GetBootClassPath.java; \
java -cp . GetBootClassPath > .bootclasspath; \
rm GetBootClassPath.*; \
- echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+ echo -n "jikes -verbose -nowarn -sourcepath src/ -bootclasspath " > .javac; \
cat .bootclasspath >> .javac; \
else \
echo "WARNING: You do not have jikes; falling back to javac. Compiles will be very slow."; \
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
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 \
- -march=r3000 \
- -o freetype.mips \
+ -mabi=32 \
+ -mips1 \
+ -msoft-float \
+ -o $@ \
-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
+ $(gcc_path)/mips/lib/libm.a \
+ -Wl,-s,-T,$(gcc_path)/mips/lib/nullmon.ld
+
+build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/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
-# 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
- @echo "linking .o -> $(target_bin)"
- $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link)
+$(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 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
- @echo "extracting .class -> .h: $<"
- cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
+$(java_headers): build/h/%.h: build/%.class
+ @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 .
-$(java_objects): bin-$(platform)/%.java.o: src/%.java
- @echo "compiling .java -> .o: $<"
+$(java_objects): build/$(platform)/%.java.o: src/%.java
+ @echo "compiling .java -> .o: $<"
mkdir -p `dirname $@`
$(gcj) -c $< -o $@
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: $<"
+$(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
- @echo "compiling .c -> .o: $<"
+$(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
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 ========================================="
- echo "archiving .class -> .jar"
- mkdir -p bin-Java2
+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 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
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
projects / org.ibex.core.git / blobdiff