X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=4e9dc64df87a2b9f4af8d41723e144e6f0b373f2;hb=57f0d69080cef7811a1eb3d4020b22e548be5dbf;hp=2cd421aafba9842fbf01e637a305a890a8db305a;hpb=1f304fb8ca7855489be50173de3b9a3d13c2515a;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 2cd421a..4e9dc64 100644
--- a/Makefile
+++ b/Makefile
@@ -97,14 +97,14 @@ build/java/org/xwt/mips/%:
 
 ### Java Class Files ##############################################################################
 
-build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
-	mkdir -p build/java/org/xwt/translators
+build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
+	mkdir -p build/java/org/ibex/translators
 	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
-	(echo -e 'package org.xwt.translators;\n';                           \
+	(echo -e 'package org.ibex.translators;\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
+	 | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/ibex/translators/MIPSApps.java
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
+	./.jikes -g:none build/java/org/ibex/translators/MIPSApps.java
 
 build/java/org/ibex/%.java: src/org/ibex/%.java
 	make build/class/org/ibex/util/Preprocessor.class
@@ -130,7 +130,7 @@ compile: .compile
 	@./.jikes $(java_sources)
 	touch .compile
 
-build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
+build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/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.ibex.Main\n" > build/JVM/.manifest
@@ -157,7 +157,7 @@ build/h/%.h: build/class/%.class .compile
 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
+build/$(platform)/org/ibex/translators/MIPSApps.java.o: build/class/org/ibex/translators/MIPSApps.class
 	@echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
 	$(gcj) -Os -c $< -o $@
@@ -220,7 +220,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726
 		-Iupstream/libmspack-20030726/src/mspack \
 		-c -o $@ $<
 
-build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o 
+build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mips/org/ibex/translators/MSPack.c.o build/mips/org/ibex/translators/main.c.o 
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
@@ -258,4 +258,11 @@ dist: compile
 	echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-	darcs push -s -A $(USER)@xwt.org -T patches@xwt.org
+	@darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
+	@(echo "To: patches@xwt.org";\
+	 SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
+	 echo "Subject: $$SUB";\
+	 echo;\
+	 cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
+	@rm .darcspatch 
+