X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c1fdeb4b93014db8a526ccaf942edab5fd3cb424;hb=4ef1f9e66eccf0e5fdbcf029b692d891ba2e69d0;hp=d0280810e20a8154ed1eee813d514e8668d56d24;hpb=abfc329e03859a35eb662d4da9f279f35a6fc919;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index d028081..c1fdeb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
-#         
+#           
 # The XWT Makefile
 #
 
 ## Configurables ###########################################################################
 
 # inputs
-jikes_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-xwar_sources           := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+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
 
 # outputs
-jikes_java_objects     := $(jikes_java_sources:src/%.java=bin/%.class)
+javac_java_objects     := $(javac_java_sources:src/%.java=bin/%.class)
 cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
 gcj_java_objects       := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
 
@@ -21,34 +21,63 @@ gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-siblin
 gcj_flags              := -fCLASSPATH=bin 
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
+gcjh                   := $(gcc_path)/bin/gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
-jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
+strip                  := $(gcc_path)/$(target)/bin/strip
+jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 # platforms
 all_platforms          := Win32 Linux Java2
 
+# path
+PATH                   := jikes-1.18/bin:$(PATH)
+
 
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar nohup-dist
+.SILENT: $(javac_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
 silent := --silent
 endif
 
-compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+compile: $(javac_java_objects) bin/org/xwt/builtin.xwar
 
 all: $(all_platforms)
 
-$(jikes_java_objects): $(jikes_java_sources)
-	echo -ne "compiling  .java -> .class:\\r"
+.javac:
+	if \
+		type jikes && (jikes --version | grep "Version 1.18"); \
+	then \
+		echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
+		echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
+		javac GetBootClassPath.java; \
+		java -cp . GetBootClassPath > .bootclasspath; \
+		rm GetBootClassPath.*; \
+		echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+		cat .bootclasspath >> .javac; \
+	else \
+		echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
+		echo javac > .javac; \
+	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
+
+$(javac_java_objects): $(javac_java_sources) .javac
+	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
+	echo "compiling  .java -> .class:"
 	mkdir -p bin
-	$(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
+	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(javac_java_sources) -d bin/
 	echo "compiling  .java -> .class: done"
 
 bin/org/xwt/builtin.xwar: $(xwar_sources)
 	mkdir -p bin/org/xwt
-	cd src; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
+	cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
 
 clean:
 	rm -rf bin-* bin
@@ -56,17 +85,40 @@ clean:
 	find . -name \#\*\# | xargs rm -f
 
 update-build:
+	cvs tag -F xwt-$(current_build)
 	(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
 	echo -n "Next build will be "
 	cat next.build
 	cvs update CHANGES
-	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo "" >> CHANGES
+	echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
 	echo committing...
 	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 #######################################################################
 
@@ -76,33 +128,33 @@ $(shell pwd)/gcc/bin/$(target)-gcj:
 
 gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
-link: $(gcj_java_objects) $(cc_objects)
+link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 	echo "linking       .o -> $(target_bin)"
 	$(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
 	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
 
-.headers: $(jikes_java_objects)
+.headers: $(javac_java_objects)
 	cd bin; for A in `find * -name \*.class`; do \
-		echo -ne "\033[K\\rextracting .class -> .h:     $$A\\r"; \
+		echo "extracting .class -> .h:     $$A"; \
 		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
 		done
-	echo -e "\033[K\\rextracting .class -> .h:     done"
+	echo "extracting .class -> .h:     done"
 	touch .headers
 
 # turn off optimization of Trap.java due to a compiler bug
 bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
 
-$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(jikes_java_objects)
-	echo -ne "\033[K\\rcompiling  .java -> .o:     $<\\r"
+$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
+	echo -ne "compiling  .java -> .o:     $<"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "\033[K\\rcompiling  .cc -> .o:     $$A\\r"
+	echo -ne "compiling  .cc -> .o:     $$A"
 	$(gcc) -Ibin -c $< -o $@
 
-bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
-	echo "archiving   .xwt -> .xwar"
+bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
+	echo "wrapping   .xwar -> .o"
 	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
 
 
@@ -127,12 +179,12 @@ Win32:
 		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
 		platform_java_sources=src/org/xwt/plat/Win32.java
 
-Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
 	echo -e "\\n=== Java2 ========================================="
 	echo "archiving .class -> .jar"
 	mkdir -p bin-Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-	cd bin; fastjar cvf ../bin-Java2/xwt.jar -m .manifest \
+	cd bin; $(jar) cvf ../bin-Java2/xwt.jar -m .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
@@ -145,30 +197,34 @@ PalmOS:
 	false
 
 
-## dist.xwt.org ############################################################################
+## master.dist.xwt.org ############################################################################
 
 current_build         := $(shell cat next.build)
-
-nohup-dist:
-	rm .make-dist.out
-	touch .make-dist.out
-	nice -n 19 nohup make dist & \
-		tail -f .make-dist.out | grep -v "make...:.\(Entering\|Leaving\).directory"
+this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
 
 dist:
-	test `uname -n` = gosset.megacz.com || \
-		(echo -e "um, dist is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
+	# 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 "***********************************************************"
 
-	make $(silent) update-build
-	(make $(silent) dist-private &> .make-dist.out) || \
-		(cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-	cat .make-dist.out | \
-		mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org < /dev/null
+        ifeq ($(shell uname -n),gosset.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 | \
+			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
+        else
+		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch) \
+			| 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
 	mv gcc/Makefile Makefile.gcc
 	mkdir -p $(HOME)/dist.xwt.org-gcc
@@ -180,16 +236,21 @@ dist-private:
 	nice -n 19 make all
 
 	echo
-	echo === dist.xwt.org ==================================
+	echo === master.dist.xwt.org ==================================
 
 	echo "copying xwt.jar to distribution area..."
-	cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
+	cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
 
-	echo "copying xwt.exe to distribution area..."
-	cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
+	echo "stripping xwt.exe and copying it to the distribution area..."
+	$(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
 	echo "copying xwt.linux to distribution area..."
-	cp bin-Linux/xwt.linux /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
+	$(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+	echo "creating source tarball in distribution area..."
+	CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
+	mv xwt xwt-$(current_build)
+	tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build)
 
 	echo
 	echo "*** DONE ******************************************"