X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c91c7bbeea241187efa48c3320a111c50bfe4fc8;hb=e411515f2f11de92846d1ae9e47b004ffc6f46be;hp=d0454b0c01c6175c560a420507a9ceac8f622363;hpb=10a313fba2ab2a6e9e9d07adc599cc692b6729c9;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index d0454b0..c91c7bb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 ## Configurables ###########################################################################
 
 # inputs
-javac_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+javac_java_sources     := $(shell find src -name \*.java)
+gcj_java_sources       := $(shell find src -name \*.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
 xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
 cc_sources             := src/org/xwt/plat/$(platform).cc
 
@@ -61,12 +61,9 @@ all: $(all_platforms)
 	fi \
 
 jikes:
-	wget ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 -O jikes-1.18.tar.bz2
-	bunzip2 jikes-1.18.tar.bz2
-	tar xvf jikes-1.18.tar && rm jikes-1.18.tar
-	cd jikes-1.18; ./configure --prefix=`pwd`
-	cd jikes; make && make install
-	ln -s jikes-1.18/bin/jikes .jikes
+	curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
+	cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
+	ln -sf jikes-1.18/bin/jikes .jikes
 
 $(javac_java_objects): $(javac_java_sources) .javac
 	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
@@ -97,6 +94,28 @@ update-build:
 	cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
 	echo committed.
 
+propose-patch:
+	@echo -n "Please type a one-line description of this bug: "; \
+	read A; \
+	echo; \
+	echo "Please type any additional comments that explain this patch."; \
+        echo "If this patch fixes a bug, include a link to bugs.xwt.org."; \
+        echo "When you are done, press control-d on a new line."; \
+	echo; \
+	(	echo -e "HELO patcher"; \
+		echo -e "MAIL FROM:$(USER)@xwt.org"; \
+		echo -e "RCPT TO: patches@xwt.org"; \
+		echo -e "DATA"; \
+		echo -e "From: $(USER)@xwt.org"; \
+		echo -e "To: patches@xwt.org"; \
+		echo -e "Subject: proposed patch to $(this_branch): $$A"; \
+		echo -e ""; \
+		cat; \
+		echo; \
+		cvs diff -Bud; \
+		echo .; \
+	) > .message
+	bash -c "cat .message > /dev/tcp/mail.xwt.org/25"     # /dev/tcp is faked by bash; not part of the os
 
 ## GCJ-Derived Platforms #######################################################################
 
@@ -123,12 +142,12 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
 
 $(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
-	echo -ne "compiling  .java -> .o:     $<"
+	echo "compiling  .java -> .o:     $<"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "compiling  .cc -> .o:     $$A"
+	echo "compiling  .cc -> .o:     $$A"
 	$(gcc) -Ibin -c $< -o $@
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
@@ -162,7 +181,7 @@ Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
 	echo "archiving .class -> .jar"
 	mkdir -p bin-Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-	cd bin; $(jar) cvf ../bin-Java2/xwt.jar -m .manifest \
+	cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
                 org/xwt/builtin.xwar \
 		`find . -name \*.class | grep -v org/xwt/plat/` \
 		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
@@ -189,7 +208,7 @@ dist:
 	echo "*  This build is $(current_build)"
 	echo "***********************************************************"
 
-        ifeq ($(shell uname -n),gosset.megacz.com)
+        ifeq ($(shell uname -n),serverbeach.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 | \