X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=ea56deadeb017c654eb8227c84e129d3310b6e43;hb=ff3815a13aa6a57852f28c789f8a8d22f2a1f26e;hp=ed4c7ab2df1dd49c057794bb930f49518adba70e;hpb=7431226f404a5517a4b68548284872336b0e5249;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index ed4c7ab..ea56dea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,14 @@
 #############################################################################
 #
 # The XWT Makefile
+
 #
 
-all:      JVM Darwin Linux Win32 Solaris
+all:      JVM Linux Win32 Darwin #Solaris
+
+clean:
+	rm -rf .jikes .configure* .install* build .compile .build*
+	find upstream -name config.cache -exec rm {} \;
 
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
@@ -41,40 +46,55 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-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'))
+all_java_sources  := $(filter-out build/java/org/xwt/mips/%, $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java')))
+all_java_sources  += build/java/org/xwt/translators/FreetypeVM.java
 
 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/java/org/xwt/translators/FreetypeVM.java: build/res/freetype.mips build/class/org/xwt/mips/Compiler.class
+	mkdir -p build/java/org/xwt/translators
+	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
+	 java -Xint -cp build/class org.xwt.mips.Compiler FreetypeVM build/res/freetype.mips)\
+	 > $@
 
-build/java/%.java: src/%.java.pp
+build/java/org/xwt/%.java: src/org/xwt/%.java
 	make build/class/org/xwt/util/Preprocessor.class
-	@echo -e "\n\033[1mpreprocessing   .java.pp -> .java:  $<\033[0m"
-	mkdir -p `dirname $@`
-	rm -f $@
-	java -cp build/class org.xwt.util.Preprocessor < $< > $@
+	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
-build/class/%.class: build/java/%.java .jikes
+build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
+	@echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+
+build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class
+	mkdir -p build/class/org/xwt/util/
 	./.jikes $<
 
+build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.* .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/mips/
+	./.jikes $<
+
+
+# this forces a clean build every time because jikes is so damn buggy
+preprocess: $(all_java_sources)
 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:; mkdir -p $(@D); touch $@
 build/h/%.h: build/class/%.class
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
@@ -114,56 +134,51 @@ 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
+build/$(platform)/$(platform).ar: $(java_objects) $(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/$(target)/bin/ar rc $@ $?
+	upstream/install/$(target)/bin/ranlib $@
+
+$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	upstream/install/bin/$(target)-ar rcs $(platform).ar $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
-	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 build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
 
 
 ##############################################################################
 # 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
-
-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.*__");            \
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
+build/res/fonts/vera: .download_vera-1.10
+	mkdir -p build/res/fonts/vera
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraBd.ttf
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
+	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
+	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+
+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)
+gcj: .vendor .compile .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`;
 
 
 
@@ -175,23 +190,44 @@ build/mips/%.c.o: src/%.c
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	mkdir -p $(@D)
 	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 $@ $<
+	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
+		-Iupstream/freetype-2.1.4/src/include  \
+		-Iupstream/libmspack-20030726/src/mspack \
+		-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 \
-		--strip \
-		-lfreetype
+		$^ \
+		-lfreetype \
+#		-Wl,-s \
+
+.install_libmspack-20030726:; make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
+build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
+	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
+	mkdir -p build/mips build/res
+	make .install_libmspack-20030726 
+	upstream/install/bin/mips-unknown-elf-gcc \
+		-nostdlib \
+		--static \
+		-march=mips1 \
+		-T src/org/xwt/mips/linker.ld \
+		-Lbuild/mips \
+		-Lupstream/libmspack-20030726/src/mspack \
+		-Lupstream/libmspack-20030726/build-mips-unknown-elf \
+		-o $@ \
+		$^ \
+		-lmspack \
+#		-Wl,-s \
 
 
 
@@ -242,33 +278,27 @@ this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $
 
 # 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)
-
 	echo "***********************************************************"
 	echo "*  This build is $(current_build)"
 	echo "***********************************************************"
 
-        ifeq ($(shell uname -n),serverbeach.megacz.com)
+        ifeq ($(shell uname -n),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"
+		# 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)
+
+#		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 &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n' | 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
-	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-/*.patch gcc/
-
 	# build it
 	nice -n 19 make all
 
@@ -276,13 +306,23 @@ dist-private:
 	echo === master.dist.xwt.org ==================================
 
 	echo "copying xwt.jar to distribution area..."
-	cp xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+	cp build/JVM/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) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+	upstream/install/i686-pc-mingw32/bin/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) build/Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+	upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
+		-o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+#	echo "copying xwt.solaris to distribution area..."
+#	upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+#		-o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+
+	echo "copying xwt.darwin to distribution area..."
+	upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \
+		-o /var/www/master.dist.xwt.org/xwt-$(current_build).darwin.unsigned
 
 	echo "creating source tarball in distribution area..."
 	CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
@@ -291,3 +331,10 @@ dist-private:
 
 	echo
 	echo "*** DONE ******************************************"
+
+
+# this is for Adam; don't mess with it
+test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+#test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`