X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=63f32a3db6e5051dcdf0ed5bf1ae4606cb0f2163;hp=e38135e41a3ef1c97823ac44f976567e9a7d69bf;hb=574af437a07d0e80428923a4004f3d7c1b1be7e2;hpb=d8ee62e5c00b793cce08bb509ed0a46841238ba8

diff --git a/Makefile b/Makefile
index e38135e..63f32a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,17 @@
 #############################################################################
 #
 # 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"
+Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
 Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
 Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
@@ -41,29 +46,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:;
-ifeq ($(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,18 +70,21 @@ 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 $<
 
+# 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/%.h: build/class/%.class .compile
+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 $@`
 	ls `echo $< | sed s/.class\$$//`*.class |\
@@ -103,7 +101,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 +115,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) $(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)
-	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 build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
 
 
 ##############################################################################
 # 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 build/res/libmspack.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 .compile .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: .compile 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`;
 
 
 
@@ -181,22 +177,38 @@ 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
 
+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
+	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
+	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
+	mkdir -p build/mips build/res
+	upstream/install/bin/mips-unknown-elf-gcc \
+		-nostdlib \
+		--static \
+		-march=mips1 \
+		-T src/org/xwt/mips/linker.ld \
+		-Lbuild/mips \
+		-Lupstream/libmspack-20030726/build-mips-unknown-elf/ \
+		-o $@ \
+		build/mips/org/xwt/translators/MSPack.c.o \
+		--strip \
+		-lmspack
+
 
 
 
@@ -246,10 +258,6 @@ 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 "***********************************************************"
@@ -260,19 +268,17 @@ dist: compile
 		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
 
@@ -280,13 +286,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