X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=07498137f6329c8520e6d73642a91fb273e6a774;hp=fb677cb05302fdcd4c577beeee135260b8b1d476;hb=72330a2e158829db60c433778f52be2c8d646eb2;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b

diff --git a/Makefile.upstream b/Makefile.upstream
index fb677cb..0749813 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -107,23 +107,17 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
-.download_nestedvm:
-	mkdir -p upstream/nestedvm
-	cd upstream/nestedvm; wget -l 99 -nH -r http://nestedvm.ibex.org/
+.download_org.ibex.%:
+	@echo -e "\033[1mfetching repository                 org.ibex.$*\033[0m"
+	@mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_*
+	@cd upstream; darcs get --verbose --partial --repo-name=org.ibex.$* http://$*.ibex.org
+	@touch $@
+
+.build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm
+	cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
 	touch $@
 
-.build_nestedvm: .vendor .download_nestedvm
-	cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install
-	touch $@
-
-.install_nestedvm: .build_nestedvm
-	touch $@
-	touch .install_gcc-3.3_mips-unknown-elf
-	touch .install_binutils-2.13.2.1_mips-unknown-elf
-
-.download_org.ibex.crypto:
-	mkdir -p upstream/org.ibex.crypto
-	cd upstream/org.ibex.crypto; wget -l 99 -nH -r http://crypto.ibex.org/
+.install_org.ibex.nestedvm: .build_org.ibex.nestedvm
 	touch $@
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
@@ -146,7 +140,7 @@ 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
-	(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/[a-y]*.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 $@
 
@@ -188,22 +182,7 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
-.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
-.install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
-
-.download_mips2java:
-	mkdir -p upstream/install
-	curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf -
-#	echo '/1 :pserver:cvs@cvs.ibex.org:2401/ A' >> ~/.cvspass
-#	cd upstream; cvs -d :pserver:cvs@cvs.ibex.org:/ co mips
-	cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
-	touch $@
-
-.install_mips2java: .download_mips2java
-	(cd upstream/mips; make)
-	touch $@
-
-.install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
+.install_freetype-2.1.4_mips-unknown-elf: .install_org.ibex.nestedvm .download_freetype-2.1.4
 	cd upstream/freetype-2.1.4/src; \
 	   make setup ansi; \
 	   PATH=$$PATH:`pwd`/../../install/bin make \
@@ -223,6 +202,9 @@ endif
 
 .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
 
+.install_gcc-3.3_mips-unknown-elf: .install_org.ibex.nestedvm
+	touch $@
+
 .install_%_$(target): .build_%_$(target)
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); \