X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=3bbbef41a7a7294d4b43b540cc2162b8c37dbdc6;hp=d3d09c8fdf5e0e1a9704ec1dd30304e5c922c466;hb=60fefa9ae5acd22f8eeb95a6f6a59c700af155b6;hpb=3a0c6aa6f903a1ff1cc00b7f8573e89b4ed5839e

diff --git a/Makefile b/Makefile
index d3d09c8..3bbbef4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,88 +1,210 @@
-#           
+#############################################################################
+#
 # The XWT Makefile
 #
 
-## Configurables ###########################################################################
-
-# inputs
-javac_java_sources     := $(shell find src -name \*.java)
-gcj_java_sources       := $(shell find src -name \*.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-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
-
-# outputs
-javac_java_objects     := $(javac_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)
-
-# tools
-gcc_path               := $(shell pwd)/gcc
-#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops
-gcc_optimizations      := -O0
-gcc_flags              := $(gcc_optimizations) -g -ffunction-sections -fdata-sections
-gcj_flags              := -fCLASSPATH=bin 
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/gcjh
-ar                     := $(gcc_path)/$(target)/bin/ar
-strip                  := $(gcc_path)/$(target)/bin/strip
-jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+all:      JVM Linux Win32 Carbon Java2 #Solaris
 
-# platforms
-all_platforms          := Win32 Linux Java2
+JVM:        build/JVM/xwt.jar
+Linux:    ; @make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-lX11 -lXext --static"
+Solaris:  ; @make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-lX11 -lXext"
+Win32:    ; @make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32"
+Carbon:   ; @make gcj platform=Carbon target=powerpc-apple-darwin \
+		      platform_link=-Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration
 
-# path
-PATH                   := jikes-1.18/bin:$(PATH)
 
+#############################################################################
+# Configurables:
+#
+target_bin             := xwt.$(shell echo $(platform) | tr A-Z a-z)
+jikes_flags            := -verbose -nowarn -sourcepath src/
+gcc_path               := upstream/install
+gcc_optimizations      := -O2
+#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
+#gcc_optimizations      += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
+gcc_flags              := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/
+gcj_flags              += -fCLASSPATH=build/java
+gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
+jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-## Platform-Neutral ###########################################################################
 
-ifneq ($(verbose),true)
-.SILENT: $(javac_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
-silent := --silent
-endif
 
-compile: $(javac_java_objects) bin/org/xwt/builtin.xwar
+#############################################################################
+# Overview:
+# 
+# The Makefile has been divided into phases; each phase depends on the
+# previous one.  Subphases of the same phase (ie 1a, 1b) are not
+# interdependent.  You can think of the build process as proceeding
+# through the phases in order, but processing subphases within a given
+# phase in any order.
+#
 
-all: $(all_platforms)
+# PHASE 1a: upstream code and how to fetch it
+include Makefile.upstream
+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
+
+upstream/jpeg-6b/src/%.c: download_jpeg-6b
+
+freetype_sources    := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c smooth.c sfnt.c truetype.c
+upstream/freetype-2.1.4/%.c: ; make -sC upstream freetype-2.1.4/src
+
+$(gcc_path)/bin/$(target)-gcj:  ; make -sC upstream gcc-3.3-$(target)
+
+# PHASE 1b: human-written inputs
+java_sources      := $(patsubst src/%.java,    build/java/%.java, $(shell find src -name \*.java))
+java_sources      += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name \*.java.pp))
+java_sources      += $(patsubst src/%.mips.c,  build/java/%.java, $(shell find src -name \*.mips.c))
+java_sources      += build/java/org/xwt/Builtin.java
+
+
+# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
+	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/freetype/%.c: upstream/freetype-2.1.4/src/base/%.c
+	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/freetype/%.c: upstream/freetype-2.1.4/src/%/%.c
+	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+
+build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
+	@echo "preprocessing   .java.pp -> .java:  $<"
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	@java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
+# PHASE 3: class files
+upstream/.jikes:                ; make -sC upstream .jikes
+build/class/%.class: build/java/%.java upstream/.jikes build/class/.
+	@echo "compiling          .java -> .class: $<"
+	@upstream/.jikes $<
+
+compile: .compile
+.compile: $(java_sources) build/class/.
+	@echo "compiling          .java -> .class: src/**/*.java"
+	@upstream/.jikes $(java_sources)
+	@touch .compile
+
+# PHASE 4: gcj-generated headers
+java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
+build/h/%.h: build/class/%.class .compile
+	@echo "extracting        .class -> .h:     $<"
+	@mkdir -p `dirname $@`
+	@ls `echo $< | sed s/.class\$$//`*.class |\
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../$(gcc_path)/bin/gcjh -d ../h --classpath .)
+
+# PHASE 4: object files
+build/$(platform)/%.java.o: build/java/%.java
+	@echo "compiling          .java -> .o:     $<"
+	@mkdir -p `dirname $@`
+	@$(gcj) -c $< -o $@
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/*.cc $(java_headers)
+	@echo "compiling            .cc -> .o:     $<"
+	@mkdir -p `dirname $@`
+	@$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
+
+build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+	@echo "compiling             .c -> .o:     $<"
+	@mkdir -p `dirname $@`
+	@$(gcc) -Ibuild/h -c $< -o $@
+
+# PHASE 5: linking
+$(target_bin).ar: $(java_object_files) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
+	@echo "archiving             .o -> $(target_bin).ar"
+	@rm -f $(target_bin).ar
+	@$(ar) -c $(target_bin).ar $^
+
+$(target_bin): $(target_bin).ar
+	@echo "linking               .o -> $(target_bin)"
+	@mkdir -p build/$(platform)
+	@$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -L$(gcc_path)/lib $(platform_link) 
+
+
+##############################################################################
+# Special treatment:
+#
 
-.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 \
+build/java/org/xwt/Builtin.java:: $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+	@mkdir -p `dirname $@` build build/java build/class build/h build
+	@echo "zipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java"
+	@echo "package org.xwt;"                  >  build/java/org/xwt/Builtin.java
+	@echo "class Builtin {"                   >> build/java/org/xwt/Builtin.java
+	@echo "public static String encoded = "   >> build/java/org/xwt/Builtin.java
+	@cd src; $(jar) cf - $(<:src/%=%) | \
+		uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \
+		sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
+	@echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
+
+build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
+	@echo "translating        .mips -> .java:  $@"
+	@mkdir -p build/java/org/xwt/imp/
+	@rm -f $@
+	@java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
+
+$(gcc_path)/bin/mips-gcc:
+	@make -sC upstream gcc-3.3-mips target=mips
+
+build/mips/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype
+	@mkdir -p build/mips
+	@echo "compiling $< -> $@ (mips)"
+	@$(gcc_path)/bin/mips-gcc \
+		-march=mips1 \
+		-I upstream/freetype-2.1.4/include \
+		-c -o $@ $<
+
+build/mips/freetype.mips: $(gcc_path)/bin/mips-gcc build/mips/crt0.o build/mips/syscalls.o build/mips/Freetype.o  upstream/.freetype-mips
+	@echo "compiling             .c -> .mips:  $@"
+	@mkdir -p build/mips
+	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed freetype-2.1.4/src target=mips
+	$(gcc_path)/bin/mips-gcc \
+		-nostdlib \
+		--static \
+		-march=mips1 \
+		-T src/org/xwt/imp/linker.ld \
+		-Lbuild/mips \
+		-Lupstream/freetype-2.1.4/objs \
+		-o $@ \
+		build/mips/Freetype.o \
+		-lfreetype
+
+
+##############################################################################
+# Supported Platforms:
+#
 
-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
+# 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)
+build/JVM/xwt.jar:.compile
+	@echo "archiving         .class -> .jar:   build/JVM/xwt.jar"
+	@mkdir -p build/JVM
+	@echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+	@cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+		`find . -name \*.class | grep -v org/xwt/plat/` \
+		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class
+	@echo
 
-$(javac_java_objects): $(javac_java_sources) .javac
-	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
-	echo "compiling  .java -> .class:"
-	mkdir -p bin
-	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(javac_java_sources) -d bin/
-	echo "compiling  .java -> .class: done"
 
-bin/org/xwt/builtin.xwar: $(xwar_sources)
-	mkdir -p bin/org/xwt
-	cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
+
+##############################################################################
+# Misc
+#
 
 clean:
-	rm -rf bin-* bin
 	find . -name \*~ | xargs rm -f
 	find . -name \#\*\# | xargs rm -f
 
+
+
+##############################################################################
+# Maintainer stuff: generating numbered builds, proposing patches
+#
+
 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-
@@ -119,89 +241,12 @@ propose-patch:
 	) > .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) bin-$(platform)/org/xwt/builtin.o
-	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: $(javac_java_objects)
-	cd bin; for A in `find * -name \*.class`; do \
-		echo "extracting .class -> .h:     $$A"; \
-		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
-		done
-	echo "extracting .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 $(javac_java_objects)
-	echo "compiling  .java -> .o:     $<"
-	mkdir -p `dirname $@`
-	$(gcj) -c $< -o $@
-
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo "compiling  .cc -> .o:     $$A"
-	$(gcc) -Ibin -c $< -o $@
-
-bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-	echo "wrapping   .xwar -> .o"
-	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
-
-
-
-## Platforms ##############################################################################
-
-Linux:
-	echo -e "\\n=== Linux ========================================="
-	make gcj \
-		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"
-
-Win32:
-	echo -e "\\n=== Win32 ========================================="
-	make gcj \
-		platform=Win32 \
-		target=i686-pc-mingw32 \
-		target_bin=xwt.exe \
-		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
-		platform_java_sources=src/org/xwt/plat/Win32.java
-
-Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
-	echo -e "\\n=== Java2 ========================================="
-	echo "archiving .class -> .jar"
-	mkdir -p bin-Java2
-	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.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
-
-
-## 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))
 
-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)
@@ -216,20 +261,18 @@ dist:
 		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) \
-			| 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
 
-
 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
@@ -238,13 +281,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
@@ -253,3 +296,20 @@ dist-private:
 
 	echo
 	echo "*** DONE ******************************************"
+
+
+
+
+
+
+
+#mips: $(prefix)/mips/lib/libm.a
+#$(prefix)/mips/lib/libm.a: src/.newlib $(prefix)/bin/mips-gcc
+#	mkdir -p build/$(target)/newlib
+#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH \
+#		../../../src/newlib-1.11.0/configure --nfp --enable-multilib --prefix=$(prefix) --target=mips
+#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH EXTRA_CFLAGS=-mstrict-align make
+#	cd build/$(target)/newlib; make install
+# FIXME: this is probably going to cause problems... figure out how to get by without it
+#	touch .empty.c
+#	$(prefix)/bin/mips-gcc -c .empty.c -o $(prefix)/mips/lib/crt0.o