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
+gcj_flags := -fCLASSPATH=src
gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh := $(gcc_path)/bin/gcjh
+gcjh := $(gcc_path)/bin/$(target)-gcjh
as := $(gcc_path)/$(target)/bin/as
ar := $(gcc_path)/$(target)/bin/ar
## Platform-Neutral ###########################################################################
ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) compile
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
silent := --silent
endif
-compile: 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 | \
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
upstream:
cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
-upstream/Carbon/include/Carbon:
+upstream/Carbon/include/Carbon: upstream
# 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"; \
+ mkdir -p $$outdir; \
librarydir="/System/Library"; \
frameworksubdir="Frameworks"; \
cd $$outdir; \
platform=Win32 \
target=i686-pc-mingw32 \
target_bin=xwt.exe \
- platform_link="-Wl,--subsystem,windows -lcomdlg32"
+ platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+ platform_java_sources="Win32"
Darwin: upstream
echo -e "\\n=== Darwin ========================================="
Carbon: upstream/Carbon/include/Carbon upstream
echo -e "\\n=== Carbon ========================================="
+ cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh
make gcj \
platform=Carbon \
target=powerpc-apple-darwin \
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)
tail -n 200 .make-dist.out | \
mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
else
- ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch_flag) \
- | grep -v "make...:.\(Entering\|Leaving\).directory"
+ 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
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
mv gcc gcc-
ln -s $(HOME)/dist.xwt.org-gcc gcc
mv -f gcc-/Makefile gcc/
- mv -f gcc-/gcc.patch gcc/
+ mv -f gcc-/*.patch gcc/
# build it
nice -n 19 make all