X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9b49379067ae24012f2ef46f1fb72df77f54f61f;hb=2c8c7fcd0f3c80dc4ff109ce0f5a9017cc2a82bc;hp=a433bcd5d7cad78dbebf06b899ee80a808945da9;hpb=e819b3bfd2a1480035b4831866071058eedcea60;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index a433bcd..9b49379 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#
+#           
 # The XWT Makefile
 #
 
@@ -6,8 +6,8 @@
 
 # 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)
+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
@@ -21,37 +21,54 @@ 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
+jikes                  := jikes -bootclasspath /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Classes/classes.jar -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
-all_platforms          := Win32 Linux Java
+all_platforms          := Win32 Linux Java2 Darwin
 
 
 ## Platform-Neutral ###########################################################################
 
-.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar
+ifneq ($(verbose),true)
+.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
+silent := --silent
+endif
 
 compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 
 all: $(all_platforms)
 
 $(jikes_java_objects): $(jikes_java_sources)
-	echo -ne " .java -> .class:\\r"
+	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/
-	echo " .java -> .class: done"
+	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/%=%)
 
 clean:
-	rm -rf bin-*
+	rm -rf bin-* bin
 	find . -name \*~ | xargs rm -f
 	find . -name \#\*\# | xargs rm -f
 
+update-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 "" >> 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.
+
 
 ## GCJ-Derived Platforms #######################################################################
 
@@ -61,32 +78,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)
 	cd bin; for A in `find * -name \*.class`; do \
-		echo -ne "\033[K\\r.class -> .h:     $$A\\r"; \
+		echo "extracting .class -> .h:     $$A"; \
 		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
 		done
-	echo -e "\033[K\\r.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\\r .java -> .o:     $<\\r"
+	echo -ne "compiling  .java -> .o:     $<"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "\033[K\\r   .cc -> .o:     $$A\\r"
+	echo -ne "compiling  .cc -> .o:     $$A"
 	$(gcc) -Ibin -c $< -o $@
 
-bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
-	echo "bundling         -> .xwar"
+bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
+	echo "wrapping   .xwar -> .o"
 	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
 
 
@@ -102,6 +120,15 @@ Linux:
 		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
 		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
 
+Darwin:
+	echo -e "\\n=== Darwin ========================================="
+	make gcj \
+		platform=Darwin \
+		target=powerpc-apple-darwin \
+		target_bin=xwt-x11.darwin \
+		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
+		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
+
 Win32:
 	echo -e "\\n=== Win32 ========================================="
 	make gcj \
@@ -111,9 +138,71 @@ Win32:
 		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
 		platform_java_sources=src/org/xwt/plat/Win32.java
 
-Java: compile
+Java2: $(jikes_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 \
+                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
+	echo
+
+$(java2_objects:bin/%=%)
 
 PalmOS:
 	echo "PalmOS is not yet supported"
 	false
 
+
+## master.dist.xwt.org ############################################################################
+
+current_build         := $(shell cat next.build)
+
+dist:
+	# this will fail if we haven't checked-in since the comment is null; we want this.
+	cvs commit -m '' > /dev/null
+
+	echo "***********************************************************"
+	echo "*  This build is $(current_build)"
+	echo "***********************************************************"
+
+        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 \
+			| 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
+	rm -rf gcc
+	ln -s $(HOME)/dist.xwt.org-gcc gcc
+	mv Makefile.gcc gcc/Makefile
+
+	# build it
+	nice -n 19 make all
+
+	echo
+	echo === master.dist.xwt.org ==================================
+
+	echo "copying xwt.jar to distribution area..."
+	cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.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..."
+	$(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+	echo
+	echo "*** DONE ******************************************"