X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=7488853efdfde5b4e83cccd0633abd4c82086fff;hp=d9a59f573012bc5611a4a8c7510d662178f4d0ee;hb=6998528f935da289fedee5766dc5a21390a476d4;hpb=e918027f3ad6e7f0033c8ed47d13deb0450a16b1

diff --git a/Makefile b/Makefile
index d9a59f5..7488853 100644
--- a/Makefile
+++ b/Makefile
@@ -4,51 +4,111 @@
 
 ## Configurables ###########################################################################
 
+jpeg_headers := jpeglib.h jconfig.h jmorecfg.h jerror.h jinclude.h jpegint.h jchuff.h jdhuff.h jdct.h jmemsys.h jversion.h
+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
+
 # inputs
-jikes_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-xwar_sources           := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+java_pp_sources        := $(shell find src -name \*.java.pp)
+java_pp_postproc       := $(java_pp_sources:src/%.java.pp=bin/%.java)
+java_sources           := $(shell find src -name \*.java)
+java_headers           := $(java_sources:src/%.java=bin/%.h) $(java_pp_postproc:bin/%.java=bin/%.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 inputs
+freetype_base_sources  := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c
+freetype_other_sources := smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c
+freetype_sources       := $(freetype_base_sources:%=gcc/src/freetype-2.1.4/src/base/%)
+freetype_sources       += $(freetype_other_sources:%=gcc/src/freetype-2.1.4/src/%)
 
 # outputs
-jikes_java_objects     := $(jikes_java_sources:src/%.java=bin/%.class)
-cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
-gcj_java_objects       := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
+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)
 
 # tools
-gcc_path               := $(shell pwd)/gcc
-gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g
-gcj_flags              := -fCLASSPATH=bin 
+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      := -O2
+debug                  := 
+gcc_flags              := $(gcc_optimizations) $(debug) -Isrc/org/ijg
+gcj_flags              := -fCLASSPATH=src
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
 gcjh                   := $(gcc_path)/bin/$(target)-gcjh
+
+as                     := $(gcc_path)/$(target)/bin/as
 ar                     := $(gcc_path)/$(target)/bin/ar
-jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
+ranlib                 := $(gcc_path)/$(target)/bin/ranlib
+strip                  := $(gcc_path)/$(target)/bin/strip
+jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-# platforms
-all_platforms          := Win32 Linux Java2
+# path
+PATH                   := jikes-1.18/bin:$(PATH)
+
+# path
+PATH                   := jikes-1.18/bin:$(PATH)
 
 
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar nohup-dist
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
 silent := --silent
 endif
 
-compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
-
-all: $(all_platforms)
+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/_"
 
-$(jikes_java_objects): $(jikes_java_sources)
-	echo -ne "compiling  .java -> .class:\\r"
+bin/org/xwt/util/Preprocessor.class: .javac
+	echo "compiling preprocessor"
 	mkdir -p bin
-	$(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
-	echo "compiling  .java -> .class: done"
+	$(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/_"
+
+$(java_pp_postproc): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class
+	@echo "preprocessing   .java.pp -> .java:     $<"
+	@mkdir -p `dirname $@`
+	@java -cp bin org.xwt.util.Preprocessor < $< > $@
+
+# platforms
+all: Win32 Linux Java2 #Solaris
+
+.javac:
+	@if \
+		type jikes && (jikes --version | grep "Version 1.18"); \
+	then \
+		echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
+		echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
+		javac GetBootClassPath.java; \
+		java -cp . GetBootClassPath > .bootclasspath; \
+		rm GetBootClassPath.*; \
+		echo -n "jikes -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."; \
+		echo javac > .javac; \
+	fi
+
+jikes:
+	curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
+	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; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
+	cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
 
 clean:
 	rm -rf bin-* bin
@@ -56,55 +116,116 @@ clean:
 	find . -name \#\*\# | xargs rm -f
 
 update-build:
+	cvs tag -F xwt-$(current_build)
 	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
 	mv next.build- next.build
 	echo -n "Next build will be "
 	cat next.build
 	cvs update CHANGES
-	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo "" >> CHANGES
+	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo committing...
 	cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
 	echo committed.
 
+propose-patch:
+	@echo -n "Please type a one-line description of this bug: "; \
+	read A; \
+	echo; \
+	echo "Please type any additional comments that explain this patch."; \
+        echo "If this patch fixes a bug, include a link to bugs.xwt.org."; \
+        echo "When you are done, press control-d on a new line."; \
+	echo; \
+	(	echo -e "HELO patcher"; \
+		echo -e "MAIL FROM:$(USER)@xwt.org"; \
+		echo -e "RCPT TO: patches@xwt.org"; \
+		echo -e "DATA"; \
+		echo -e "From: $(USER)@xwt.org"; \
+		echo -e "To: patches@xwt.org"; \
+		echo -e "Subject: proposed patch to $(this_branch): $$A"; \
+		echo -e ""; \
+		cat; \
+		echo; \
+		cvs diff -Bud; \
+		echo .; \
+	) > .message
+	bash -c "cat .message > /dev/tcp/mail.xwt.org/25"     # /dev/tcp is faked by bash; not part of the os
 
 ## 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:
-	cd gcc; make
-
-gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
-
-link: $(gcj_java_objects) $(cc_objects)
-	echo "linking       .o -> $(target_bin)"
-	$(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
-	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
-
-.headers: $(jikes_java_objects)
-	cd bin; for A in `find * -name \*.class`; do \
-		echo -ne "\033[K\\rextracting .class -> .h:     $$A\\r"; \
-		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
-		done
-	echo -e "\033[K\\rextracting .class -> .h:     done"
-	touch .headers
-
-# turn off optimization of Trap.java due to a compiler bug
-bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
-
-$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(jikes_java_objects)
-	echo -ne "\033[K\\rcompiling  .java -> .o:     $<\\r"
+$(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream
+	make -C gcc
+
+gcc/src/.freetype:
+	mkdir -p gcc/src
+	curl http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz | tar xvzf - -C gcc/src
+	cd gcc/src; patch -p0 < freetype.patch
+	touch gcc/src/.freetype
+
+freetype.mips: gcc/src/.freetype
+	make -C gcc mips target=mips
+	$(gcc_path)/bin/mips-gcc \
+		--static \
+		-march=r3000 \
+		-o freetype.mips \
+		-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
+
+# 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 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) 
+
+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 = ";\
+	  (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;\
+	  echo "};") > .builtin.c
+	$(gcc) -c .builtin.c -o bin-$(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 |\
+		sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
+			xargs $(gcjh) --classpath .
+
+$(java_objects): bin-$(platform)/%.java.o: src/%.java
+	@echo "compiling   .java -> .o:     $<"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "\033[K\\rcompiling  .cc -> .o:     $$A\\r"
+# unpack and patch the ijg library
+src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.patch
+	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 -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 -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
+
+$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
+	@echo "compiling      .c -> .o:     $<"
+	@mkdir -p `dirname $@`
 	$(gcc) -Ibin -c $< -o $@
 
-bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
-	echo "archiving   .xwt -> .xwar"
-	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
-
+.upstream:
+	mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
+	touch .upstream
 
 
 ## Platforms ##############################################################################
@@ -115,8 +236,17 @@ Linux:
 		platform=Linux \
 		target=i686-pc-linux-gnu \
 		target_bin=xwt.linux \
-		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
-		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
+		platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
+		platform_java_sources="POSIX X11"
+
+Solaris:
+	echo -e "\\n=== Solaris ========================================="
+	make gcj \
+		platform=Solaris \
+		target=sparc-sun-solaris2.7 \
+		target_bin=xwt.solaris \
+		platform_link="-L$(gcc_path)/lib -lX11 -lXext" \
+		platform_java_sources="POSIX X11"
 
 Win32:
 	echo -e "\\n=== Win32 ========================================="
@@ -125,71 +255,99 @@ Win32:
 		target=i686-pc-mingw32 \
 		target_bin=xwt.exe \
 		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
-		platform_java_sources=src/org/xwt/plat/Win32.java
+		platform_java_sources="Win32"
+
+Darwin:
+	echo -e "\\n=== Darwin ========================================="
+	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/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
+		platform_java_sources="POSIX X11"
+
+Carbon:
+	echo -e "\\n=== Carbon ========================================="
+	make gcj \
+		platform=Carbon \
+		target=powerpc-apple-darwin \
+		target_bin=xwt.carbon \
+		platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" \
+		platform_java_sources="POSIX Carbon"
 
-Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+Java2: compile bin/org/xwt/builtin.xwar
 	echo -e "\\n=== Java2 ========================================="
-	echo "archiving .class -> .jar"
+	echo "archiving  .class -> .jar"
 	mkdir -p bin-Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-	cd bin; fastjar cvf ../bin-Java2/xwt.jar -m .manifest \
+	cd bin; $(jar) cvfm ../bin-Java2/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
 
-$(java2_objects:bin/%=%)
-
 PalmOS:
 	echo "PalmOS is not yet supported"
 	false
 
 
-## dist.xwt.org ############################################################################
+## master.dist.xwt.org ############################################################################
 
 current_build         := $(shell cat next.build)
+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))
 
-nohup-dist:
-	rm .make-dist.out
-	touch .make-dist.out
-	nice -n 19 nohup make dist & \
-		tail -f .make-dist.out | grep -v "make...:.\(Entering\|Leaving\).directory"
+# 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)
 
-dist:
-	test `uname -n` = gosset.megacz.com || \
-		(echo -e "um, dist is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
 	echo "***********************************************************"
 	echo "*  This build is $(current_build)"
 	echo "***********************************************************"
 
-	make $(silent) update-build
-	(make $(silent) dist-private &> .make-dist.out) || \
-		(cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-	cat .make-dist.out | \
-		mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org < /dev/null
+        ifeq ($(shell uname -n),serverbeach.megacz.com)
+		(make $(silent) dist-private 2>&1) >> .make-dist.out || \
+			(tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
+		tail -n 200 .make-dist.out | \
+			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
+        else
+		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
+
 
 dist-private:
+	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-/*.patch gcc/
 
 	# build it
 	nice -n 19 make all
 
 	echo
-	echo === dist.xwt.org ==================================
+	echo === master.dist.xwt.org ==================================
 
 	echo "copying xwt.jar to distribution area..."
-	cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
+	cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
 
-	echo "copying xwt.exe to distribution area..."
-	cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.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
 
 	echo "copying xwt.linux to distribution area..."
-	cp bin-Linux/xwt.linux /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
+	$(strip) bin-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
+	mv xwt xwt-$(current_build)
+	tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build)
 
 	echo
 	echo "*** DONE ******************************************"