X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7d0cb52d8a3f893f1104bcd6d2152780187690d7;hb=38786988d12f2c48a314ee37c326965ff0bcadb6;hp=73093feed69e62870dd2ec8e8310ad890b787c89;hpb=cbf3213acd633866b3e686358d3eb3d7f657cd4a;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 73093fe..7d0cb52 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 #############################################################################
 #
 # The XWT Makefile
+
 #
 
 all:      JVM Darwin Linux Win32 Solaris
@@ -41,29 +42,19 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-superclass_%: 
-	@echo $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $*)
-	@make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__)
-
 all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
 all_java_sources  += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name '*.java.pp'))
 
-superclass_org.xwt.plat.Platform:;
-ifneq ($(platform),)
-plat_deps         := $(shell make -s superclass_org.xwt.plat.$(platform) platform= )
-endif
-
-# HACK: FIXME
-ifeq ($(platform),Darwin)
-plat_deps         += build/java/org/xwt/plat/OpenGL.java
-endif
-
-java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) $(plat_deps)
+java_sources      := $(all_java_sources)
+nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
+plat_java_sources      := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
 
+# FIXME: must have a relitavely new GNU sed... Apple sed fails silently (why?)
 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/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
 
 build/java/%.java: src/%.java.pp
 	make build/class/org/xwt/util/Preprocessor.class
@@ -75,7 +66,7 @@ build/java/%.java: src/%.java.pp
 build/class/%.class: build/java/%.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p build/class
-	@./.jikes $<
+	./.jikes $<
 
 compile: .compile
 .compile: $(all_java_sources)
@@ -86,7 +77,7 @@ compile: .compile
 
 # PHASE 4: gcj-generated headers
 java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
-build/h/%.h: build/class/%.class .compile
+build/h/%.h: build/class/%.class
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
 	ls `echo $< | sed s/.class\$$//`*.class |\
@@ -103,7 +94,10 @@ build/$(platform)/%.java.o: build/java/%.java
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
-build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc $(java_headers) .configure_jpeg-6b_$(target)
+headers: $(java_headers)
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+	@make headers
 	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
 	$(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/  -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@
@@ -114,60 +108,55 @@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
 	$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
+# FIXME use libjpeg
 jpeg_sources    := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
 jpeg_sources    += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
 jpeg_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o
+java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+
+build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
+	mkdir -p build/$(platform)
+	upstream/install/bin/$(target)-ar rc $@ $?
+	upstream/install/bin/$(target)-ranlib $@
+
+$(target_bin): build/$(platform)/$(platform).ar upstream/jpeg-6b/build-$(target)/libjpeg.a 
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib $(link_flags) $^ build/$(platform)/org/xwt/plat/$(platform).java.o
 
 
 ##############################################################################
 # Special treatment:
 #
 
-build/xwar/org/xwt/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*)
-	@echo -e "\n\033[1mzipping                * -> .xwar: builtin.xwar\033[0m"
-	mkdir -p build/xwar
-	cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips
+	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
+	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
-build/$(platform)/org/xwt/builtin.res.o: build/xwar/org/xwt/builtin.xwar
-	@echo -e "\n\033[1mwrapping           .xwar -> .o: builtin.res.o\033[0m"
-	@(echo "unsigned int builtin_xwar_length = ";                           \
-		(wc -c build/xwar/builtin.xwar | sed "s_build.*__");            \
+build/$(platform)/builtin.o: build/res/builtin.jar
+	@echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
+	@(echo "unsigned int builtin_length = ";                                \
+		(wc -c build/res/builtin.jar | sed "s_build.*__");              \
 		echo \;;                                                        \
-		echo "unsigned char builtin_xwar[] = {";                        \
-		hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar;         \
+		echo "unsigned char builtin_bytes[] = {";                       \
+		hexdump -ve '"0x" 1/1 "%x,\n"' build/res/builtin.jar;           \
 		echo "};") > .builtin.c
-	$(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.res.o
-
-build/$(platform)/freetype.res.o: build/mips/freetype.mips
-	@echo -e "\n\033[1mwrapping           .mips -> .o: freetype.res.o\033[0m"
-	@(echo "unsigned int freetype_mips_length = ";                           \
-		(wc -c build/mips/freetype.mips | sed "s_build.*__");            \
-		echo \;;                                                         \
-		echo "unsigned char freetype_mips[] = {";                        \
-		hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips;         \
-		echo "};") > .freetype.c
-	$(gcc) -c .freetype.c -o build/$(platform)/freetype.res.o
-
+	$(gcc) -c .builtin.c -o build/$(platform)/builtin.o
 
 # 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: .compile .vendor .install_gcc-3.3_$(target) $(target_bin)
+gcj: .vendor .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: .compile build/xwar/builtin.xwar build/mips/freetype.mips
+build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/res/builtin.jar
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
 	mkdir -p build/JVM
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
-	cd build/class/org/xwt/; ln -fs ../../../xwar/builtin.xwar  # HACK
-	cd build/class/org/xwt/; ln -fs ../../../mips/freetype.mips         # HACK
-	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
-	rm build/class/org/xwt/builtin.xwar
-	rm build/class/org/xwt/freetype.mips
+	cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
+	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . \! -type d`;
 
 
 
@@ -181,19 +170,19 @@ build/mips/%.c.o: src/%.c
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
 	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 -I upstream/freetype-2.1.4/src/include -c -o $@ $<
 
-build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o build/mips/org/xwt/imp/crt0.c.o build/mips/org/xwt/imp/syscalls.c.o
+build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
-	mkdir -p build/mips
+	mkdir -p build/mips build/res
 	upstream/install/bin/mips-unknown-elf-gcc \
 		-nostdlib \
 		--static \
 		-march=mips1 \
-		-T src/org/xwt/imp/linker.ld \
+		-T src/org/xwt/mips/linker.ld \
 		-Lbuild/mips \
 		-Lupstream/freetype-2.1.4/src/objs \
 		-o $@ \
-		build/mips/org/xwt/imp/Freetype.c.o \
+		build/mips/org/xwt/translators/Freetype.c.o \
 		--strip \
 		-lfreetype