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

diff --git a/Makefile b/Makefile
index ad45441..948b173 100644
--- a/Makefile
+++ b/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,13 +21,13 @@ 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
 strip                  := $(gcc_path)/$(target)/bin/strip
-jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
+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 Java2
+all_platforms          := Win32 Linux Java2 Darwin
 
 
 ## Platform-Neutral ###########################################################################
@@ -42,7 +42,7 @@ compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 all: $(all_platforms)
 
 $(jikes_java_objects): $(jikes_java_sources)
-	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your $$JAVA_HOME environment variable"; false)
+	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/
@@ -58,6 +58,7 @@ clean:
 	find . -name \#\*\# | xargs rm -f
 
 update-build:
+	cvs tag -F xwt-`cat next.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 "
@@ -78,7 +79,7 @@ $(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
@@ -103,8 +104,8 @@ $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
 	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 $@
 
 
@@ -120,6 +121,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 \
@@ -147,13 +157,13 @@ PalmOS:
 	false
 
 
-## dist.xwt.org ############################################################################
+## 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
+	cvs commit -m '' > /dev/null
 
 	echo "***********************************************************"
 	echo "*  This build is $(current_build)"
@@ -184,16 +194,16 @@ 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 "stripping xwt.exe and copying it to the distribution area..."
-	$(strip) bin-Win32/xwt.exe -o /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
+	$(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/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
 	echo "*** DONE ******************************************"