X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=4d030d21c56d75e34899d39d945a771391141909;hp=2eb9259de94b06f01a057db392cd7f67c5d38f0d;hb=3591b88b94a6bb378af3d4abe6eb5233ce583104;hpb=de378041d5ca2aca1a2b5a31ef15ae90a86c977f

diff --git a/Makefile b/Makefile
index 2eb9259..4d030d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 #
-# The XWT Makefile
+# The Ibex Makefile
 #
 
 target_Darwin := powerpc-apple-darwin
@@ -17,7 +17,7 @@ dist-clean:
 	find upstream -name config.cache -exec rm {} \;
 	test -e upstream/mips && make -C upstream/mips clean
 
-JVM:        build/JVM/xwt.jar
+JVM:        build/JVM/ibex.jar
 Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
@@ -43,13 +43,13 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/lib
 darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
 # stupid broke-ass darwin linker...
-darwin_linker_flags += build/Darwin/org/xwt/plat/OpenGL.java.o build/Darwin/org/xwt/plat/POSIX.java.o
+darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org/ibex/plat/POSIX.java.o
 
 target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
 target_bin_extension_JVM         := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
-target_bin                       := xwt.$(target_bin_extension)
+target_bin                       := ibex.$(target_bin_extension)
 
 jikes_flags        := -nowarn
 gcc_optimizations  := -O2
@@ -100,24 +100,24 @@ build/java/org/xwt/mips/%:
 build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
 	mkdir -p build/java/org/xwt/translators
 	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
-	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n';                           \
+	(echo -e 'package org.ibex.translators;\nimport org.xwt.mips.*;\n';                           \
 	 java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
 	 | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/xwt/translators/MIPSApps.java
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
 
-build/java/org/xwt/%.java: src/org/xwt/%.java
-	make build/class/org/xwt/util/Preprocessor.class
+build/java/org/ibex/%.java: src/org/ibex/%.java
+	make build/class/org/ibex/util/Preprocessor.class
 	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
-	mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
+	mkdir -p `dirname $@`; java -cp build/class org.ibex.util.Preprocessor < $< > $@
 
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/cc/%.cc:     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
+build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class/org/xwt/util/
+	mkdir -p build/class/org/ibex/util/
 	./.jikes $<
 
 oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java`
@@ -126,15 +126,16 @@ compile: .compile
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
 	@rm -f $(java_sources:build/java/%.java=build/class/%.class)
 	mkdir -p build/class
+	echo @./.jikes $(java_sources)
 	@./.jikes $(java_sources)
 	touch .compile
 
-build/JVM/xwt.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
-	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
+build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
+	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.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 -sf ../../../res/builtin.jar
-	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest
+	cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
+	cd build/class; $(jar) cfm ../JVM/ibex.jar ../JVM/.manifest \
 		`find . \! -type d` \
 		$(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 
@@ -153,8 +154,8 @@ build/h/%.h: build/class/%.class .compile
 ### Native Code ##############################################################################
 
 # a hack since we've disabled gcj's awt implementation
-build/$(platform)/org/xwt/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-build/$(platform)/org/xwt/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/ibex/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/ibex/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
 
 build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
 	@echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
@@ -166,13 +167,13 @@ 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 .configure_jpeg-6b_$(target)
+build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
 	@make $(java_headers)
 	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
 	$(g++) -c $< -o $@
 
-nonplat_java_sources := $(filter-out build/java/org/xwt/plat/$(platform).java,$(java_sources))
+nonplat_java_sources := $(filter-out build/java/org/ibex/plat/$(platform).java,$(java_sources))
 build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
 	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
 	mkdir -p build/$(platform)
@@ -181,15 +182,15 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build
 	upstream/install/$(target)/bin/ranlib $@
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-build/$(platform)/$(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 build/$(platform)/org/xwt/plat/$(platform).java.o
+build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o
 	@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 $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################
 
-builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
+builtin_src := $(shell find src/org/ibex/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
@@ -243,7 +244,7 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 current_build         := $(shell cat next.build)
 strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)
-install-dist:;     $(strip_$(platform)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
+install-dist:;     $(strip_$(platform)) /var/www/master.dist.ibex.org/ibex-$(current_build).$(target_bin_extension).unsigned
 dist: compile
 	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
 	mv next.build- next.build