X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2387ed2a6b257e1a52d79bfac5404f24aa0fc37f;hb=165fa8803768452068567e604e72840ab67e5548;hp=57425630cd413d6e68a2eee6a105232f27d3195a;hpb=93b65b0083674e481a4ed3d967f7bb445c261224;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 5742563..2387ed2 100644
--- a/Makefile
+++ b/Makefile
@@ -27,14 +27,14 @@ c_objects              := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
 gcc_path               := $(shell pwd)/gcc/install
 #gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
 #gcc_optimzations       += -funroll-loops -ffunction-sections -fdata-sections
-gcc_optimizations      := -O0
+gcc_optimizations      := -O2
 debug                  := 
 gcc_flags              := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags              := -fCLASSPATH=bin 
+gcj_flags              := -fCLASSPATH=src
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
 g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/gcjh
+gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 
 as                     := $(gcc_path)/$(target)/bin/as
 ar                     := $(gcc_path)/$(target)/bin/ar
@@ -52,18 +52,18 @@ PATH                   := jikes-1.18/bin:$(PATH)
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) compile
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
 silent := --silent
 endif
 
-compile: bin/org/xwt/builtin.xwar
+compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
 	echo "compiling   .java -> .class:"
 	mkdir -p bin
 	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
 		grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
 
 # platforms
-all: Win32 Linux Java2 Darwin Carbon
+all: Win32 Linux Java2 #Solaris
 
 .javac:
 	if \
@@ -134,7 +134,7 @@ propose-patch:
 ## GCJ-Derived Platforms #######################################################################
 
 # if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/install/bin/$(target)-gcj:
+$(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream
 	make -C gcc
 
 # compile is here to force compilation of the .class files (they get used via -Ibin/) without
@@ -171,7 +171,7 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
 	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
+	cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch
 	rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
@@ -184,29 +184,10 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
 	@mkdir -p `dirname $@`
 	$(gcc) -Ibin -c $< -o $@
 
-upstream:
-	cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
-
-upstream/Carbon/include/Carbon:
-	# A disgusting hack to create symlinks to the OS X Framework headers, since the
-	# standard GCC doesn't know how to search Frameworks for header files.
-	outdir="upstream/Carbon/include"; \
-	librarydir="/System/Library"; \
-	frameworksubdir="Frameworks"; \
-	cd $$outdir; \
-	function CreateHeaderDirectories() \
-	{ \
-		for framework in `ls -d $$1/*.framework`; do \
-			name=`echo $$framework | sed 's/.*\/\([^/]*\)\.framework/\1/'`; \
-			if [[ $$name != "" && ! -e $$name && -e $$framework/Headers ]]; then \
-				ln -s $$framework/Headers $$name; \
-				if [[ -e $$framework/$$frameworksubdir ]]; then \
-					CreateHeaderDirectories $$framework/$$frameworksubdir; \
-				fi; \
-			fi; \
-		done; \
-	}; \
-	CreateHeaderDirectories $$librarydir/$$frameworksubdir;
+.upstream:
+	mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
+	touch .upstream
+
 
 ## Platforms ##############################################################################
 
@@ -219,15 +200,25 @@ Linux:
 		platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
 		platform_java_sources="POSIX X11"
 
+Solaris:
+	echo -e "\\n=== Solaris ========================================="
+	make gcj \
+		platform=Solaris \
+		target=sparc-sun-solaris2.7 \
+		target_bin=xwt.solaris \
+		platform_link="-L$(gcc_path)/lib -lX11 -lXext" \
+		platform_java_sources="POSIX X11"
+
 Win32:
 	echo -e "\\n=== Win32 ========================================="
 	make gcj \
 		platform=Win32 \
 		target=i686-pc-mingw32 \
 		target_bin=xwt.exe \
-		platform_link="-Wl,--subsystem,windows -lcomdlg32"
+		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+		platform_java_sources="Win32"
 
-Darwin: upstream
+Darwin:
 	echo -e "\\n=== Darwin ========================================="
 	ranlib upstream/Darwin/lib/*.a
 	ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
@@ -238,7 +229,7 @@ Darwin: upstream
 		platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
 		platform_java_sources="POSIX X11"
 
-Carbon: upstream/Carbon/include/Carbon upstream
+Carbon:
 	echo -e "\\n=== Carbon ========================================="
 	make gcj \
 		platform=Carbon \
@@ -269,7 +260,8 @@ 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:
+# pre-depend on compile as a sanity check
+dist: compile
 	# 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)
@@ -284,8 +276,7 @@ dist:
 		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_flag) \
-			| grep -v "make...:.\(Entering\|Leaving\).directory"
+		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 
@@ -293,12 +284,11 @@ 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
 	mv gcc gcc-
 	ln -s $(HOME)/dist.xwt.org-gcc gcc
 	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/gcc.patch gcc/
+	mv -f gcc-/*.patch gcc/
 
 	# build it
 	nice -n 19 make all