X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=65b56b7df5c0ea703708eebe943ead1e4a5c7357;hb=06387752a84130f22cdc4babd4a8936d3a30a2f4;hp=948b173c889fdd0ecd4197504f0cea945eabdd4a;hpb=e9d7ccbe163f3ea1fabb78120fe8b0ea267f71cf;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 948b173..65b56b7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,53 +4,88 @@
 
 ## Configurables ###########################################################################
 
+jpeg_headers := jpeglib.h jconfig.h jmorecfg.h jerror.h jinclude.h jpegint.h jchuff.h jdhuff.h jdct.h jmemsys.h jversion.h
+jpeg_c_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
+jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
+jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
+
 # inputs
-jikes_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)
+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
+c_sources              := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
 
 # outputs
-jikes_java_objects     := $(jikes_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)
+java_classes           := $(java_sources:src/%.java=bin/%.class)
+java_objects           := $(gcj_java_sources:src/%.java=bin-$(platform)/%.java.o)
+cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
+c_objects              := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
 
 # tools
 gcc_path               := $(shell pwd)/gcc
-gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g
+#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops
+gcc_optimizations      := -O0
+debug                  := 
+gcc_flags              := $(gcc_optimizations) $(debug) -ffunction-sections -fdata-sections -Isrc/org/ijg
 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/gcjh
+g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
+gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 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
+jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 # platforms
-all_platforms          := Win32 Linux Java2 Darwin
+all_platforms          := Win32 Linux Java2
+
+# path
+PATH                   := jikes-1.18/bin:$(PATH)
 
 
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
+.SILENT: $(java_classes) .headers $(java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
 silent := --silent
 endif
 
-compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
+compile: $(java_classes) bin/org/xwt/builtin.xwar
 
 all: $(all_platforms)
 
-$(jikes_java_objects): $(jikes_java_sources)
+.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:
+	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
+
+$(java_classes): $(java_sources) .javac
 	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
-	echo "compiling  .java -> .class:"
+	echo "compiling   .java -> .class:"
 	mkdir -p bin
-	$(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
-	echo "compiling  .java -> .class: done"
+	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(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
@@ -58,7 +93,7 @@ clean:
 	find . -name \#\*\# | xargs rm -f
 
 update-build:
-	cvs tag -F xwt-`cat next.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 "
@@ -70,6 +105,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 #######################################################################
 
@@ -79,12 +136,12 @@ $(shell pwd)/gcc/bin/$(target)-gcj:
 
 gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
-link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
-	echo "linking       .o -> $(target_bin)"
+link: $(java_objects) $(cc_objects) $(c_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
+	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ -lstdc++ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
 
-.headers: $(jikes_java_objects)
+.headers: $(java_classes)
 	cd bin; for A in `find * -name \*.class`; do \
 		echo "extracting .class -> .h:     $$A"; \
 		$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
@@ -95,17 +152,31 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 # 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 "compiling  .java -> .o:     $<"
-	mkdir -p `dirname $@`
+# unpack and patch the ijg library
+src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.patch
+	cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz
+	cd src/org/ijg/jpeg-6b; ./configure --target=$(target)
+	cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) ..
+	cd src/org/ijg; patch -p0 < jmorecfg.h.patch
+	rm -rf src/org/ijg/jpeg-6b
+
+$(java_objects): bin-$(platform)/%.java.o: src/%.java $(java_classes)
+	@echo "compiling   .java -> .o:     $<"
+	@mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "compiling  .cc -> .o:     $$A"
+$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc src/org/ijg/jmorecfg.h
+	@echo "compiling     .cc -> .o:     $<"
+	@mkdir -p `dirname $@`
+	$(g++) -Ibin -c $< -o $@
+
+$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
+	@echo "compiling      .c -> .o:     $<"
+	@mkdir -p `dirname $@`
 	$(gcc) -Ibin -c $< -o $@
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-	echo "wrapping   .xwar -> .o"
+	@echo "wrapping    .xwar -> .o"
 	$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
 
 
@@ -121,15 +192,6 @@ 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 \
@@ -139,12 +201,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: $(java_classes) bin/org/xwt/builtin.xwar
 	echo -e "\\n=== Java2 ========================================="
-	echo "archiving .class -> .jar"
+	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) 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
@@ -160,22 +222,25 @@ PalmOS:
 ## master.dist.xwt.org ############################################################################
 
 current_build         := $(shell cat next.build)
+this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
+this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
 
 dist:
 	# 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 "***********************************************************"
 
-        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 | \
 			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
+		ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch_flag) \
 			| grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
@@ -205,5 +270,10 @@ dist-private:
 	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 "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 ******************************************"