c_sources := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
# 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 += bin-$(platform)/org/xwt/plat/GCJ.java.o
java_objects += $(platform_java_sources:%=bin-$(platform)/org/xwt/plat/%.java.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
## 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 .bootclasspath bin/org/xwt/builtin.xwar
+ 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/_"
# platforms
all: Win32 Linux Java2 Darwin Carbon
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/%=%)
## 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:
make -C gcc
-# java_classes 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 -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)"
bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
@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;\
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: $<"
@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: $<"
$(gcc) -Ibin -c $< -o $@
upstream:
- cvs -d :pserver:cvs@cvs.xwt.org:/cvs co upstream
+ cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
+
+upstream/Carbon/include/Carbon:
+ # A disgusting hack to create symlinks to the OS X Framework headers, since the
+ # standard GCC doesn't know how to search Frameworks for header files.
+ outdir="upstream/Carbon/include"; \
+ librarydir="/System/Library"; \
+ frameworksubdir="Frameworks"; \
+ cd $$outdir; \
+ function CreateHeaderDirectories() \
+ { \
+ for framework in `ls -d $$1/*.framework`; do \
+ name=`echo $$framework | sed 's/.*\/\([^/]*\)\.framework/\1/'`; \
+ if [[ $$name != "" && ! -e $$name && -e $$framework/Headers ]]; then \
+ ln -s $$framework/Headers $$name; \
+ if [[ -e $$framework/$$frameworksubdir ]]; then \
+ CreateHeaderDirectories $$framework/$$frameworksubdir; \
+ fi; \
+ fi; \
+ done; \
+ }; \
+ CreateHeaderDirectories $$librarydir/$$frameworksubdir;
## Platforms ##############################################################################
Darwin: upstream
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: upstream/Carbon/include/Carbon upstream
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"
mkdir -p bin-Java2
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)
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-/gcc.patch gcc/
# build it
nice -n 19 make all
projects / org.ibex.core.git / blobdiff