fixed bug 362: preprocessor not preserving line numbers

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 2273a80..4e9dc64 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ build/java/org/xwt/mips/%:
 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/ibex/translators/MIPSApps.java
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
@@ -258,5 +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