X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=5f55f762c6f13f725883bac4c78d3d55c9c7bf26;hb=5c8da8336c1196bda3fd5d21208a17058dab1371;hp=e170b21c444851a0fa833343af8e790d60142143;hpb=36b17515a42e468be7db1346384ce98df3e30882;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index e170b21..5f55f76 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -16,6 +16,8 @@ url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://dist.xwt.org/jikes-1.18.tgz
 url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
 url_vera-1.10          := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
+url_jode-1.1.1         := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz
+url_java-getopt-1.0.9  := ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.9.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
 	rm -rf upstream/darwin-linker/src
@@ -72,6 +74,16 @@ configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-
 configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
 configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 
+.install_jode-1.1.1_java: .download_java-getopt-1.0.9
+
+configure_jode-1.1.1_java               := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac
+ifeq ($(shell uname),Darwin)
+environment_jode-1.1.1_java             := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.1/Classes/classes.jar
+else
+environment_jode-1.1.1_java             := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar
+endif
+environment_jode-1.1.1_java             += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/
+
 # libjpeg's configury doesn't obey --target
 environment_jpeg-6b_$(target)           += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
 environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
@@ -110,8 +122,8 @@ endif
 	curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3
 	mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true
 	mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true
-	(test -e upstream/gcc-3.3/patches && cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-	(test -e upstream/gcc-3.3/patches-darwin && cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
+	(cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
+	(cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
 .download_%:
@@ -157,9 +169,11 @@ endif
 
 .download_mips2java:
 	mkdir -p upstream/install
-	echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
-	cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
+	curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf -
+#	echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
+#	cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
 	cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
+	touch $@
 
 .install_mips2java: .download_mips2java
 	(cd upstream/mips; make)