X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=86fd40ef20a84abc7eaddfad6adc19fdf8a793a4;hb=3807f2066945114c7a278858cfe65a33904e16c0;hp=47cfc3f7883664bc5b3cc2a4bd7403d0b4d5a167;hpb=14c79b82aa525bab500334fac875b4d2b2685926;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 47cfc3f..86fd40e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 #############################################################################
 #
 # The XWT Makefile
+
 #
 
 all:      JVM Darwin Linux Win32 Solaris
@@ -53,6 +54,7 @@ build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(
 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
@@ -66,15 +68,18 @@ build/class/%.class: build/java/%.java .jikes
 	mkdir -p build/class
 	./.jikes $<
 
+# this forces a clean build every time because jikes is so damn buggy
 compile: .compile
-.compile: $(all_java_sources)
+.compile: $(all_java_sources) .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+	rm -rf build/class
 	mkdir -p build/class
-	@./.jikes $^
+	@./.jikes $(all_java_sources)
 	touch .compile
 
 # PHASE 4: gcj-generated headers
 java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
+build/h/edu/stanford/ejalbert/BrowserLauncher.h:; touch $@
 build/h/%.h: build/class/%.class
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
@@ -114,56 +119,47 @@ 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)
 java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
 
-$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a 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)
+build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/builtin.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)
-	upstream/install/bin/$(target)-ar rcs $(platform).ar $^
-	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) $(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
+	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/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/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: .vendor .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/xwar/builtin.xwar build/mips/freetype.mips
+build/JVM/xwt.jar: .compile 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`;
 
 
 
@@ -177,10 +173,10 @@ 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/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/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 \