From: brian <brian@brianweb.net>
Date: Fri, 28 May 2004 04:16:54 +0000 (-0700)
Subject: wget fallback for darcs
X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=commitdiff_plain;h=27227d602d12a4ab3814d1481cebbd01dafb99c9

wget fallback for darcs

darcs-hash:20040528041654-24bed-c9cf7203dce5c33d0760c5dad840441102d42714.gz
---

diff --git a/Makefile b/Makefile
index a26319b..ae46732 100644
--- a/Makefile
+++ b/Makefile
@@ -439,6 +439,23 @@ compiletests: $(patsubst %,build/tests/%.class,FTBench MSPackBench DJpeg Test Fr
 	@true
 
 
+#
+# Darcs stuff
+#
+
+commit:
+	@if [ -d _darcs ]; then darcs push; \
+	else echo "You need darcs to commit"; false; \
+	fi
+
+update:
+	@if [ -d _darcs ]; then darcs pull; \
+	else wget -nH -rl 16 -N -X _darcs http://nestedvm.darcs.brianweb.net; \
+	fi
+
+#
+# Paper stuff
+#
 charts := $(shell find doc/charts -name \*.dat)
 
 # IVME Paper
diff --git a/upstream/Makefile b/upstream/Makefile
index 37d42b5..c89998a 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -31,8 +31,8 @@ url_regex = ftp://ftp.zoo.toronto.edu/pub/regex.shar
 
 url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
 
-darcs_gcclass = http://darcs.brianweb.net/gcclass
-darcs_classgen = http://darcs.brianweb.net/classgen
+darcs_gcclass = http://gcclass.darcs.brianweb.net/
+darcs_classgen = http://classgen.darcs.brianweb.net/
 
 .SECONDARY: # This is broken in gmake < 3.79.1
 
@@ -70,15 +70,24 @@ tasks/extract_%: tasks/download_%
 tasks/extract_darcs_%:
 	mkdir -p build
 	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
-	cd build && darcs get --verbose "$(darcs_$*)"
+	if [ -d "$(root)/_darcs" ]; then \
+		cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \
+	else \
+		mkdir -p "build/$*" && cd "build/$*"; \
+		wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
 	touch $@
 
 update_darcs_%: tasks/extract_darcs_%
-	cd "build/$*" && darcs pull
+	if [ -d "build/$*/darcs" ]; then \
+		cd "build/$*" && darcs pull; \
+	else
+		cd "build/$*" && wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
 	rm "tasks/build_darcs_$*" # to force a rebuild
 
 tasks/build_darcs_%: tasks/extract_darcs_%
-	cd "build/$*" && make
+	cd "build/$*" && $(MAKE)
 	touch $@
 
 tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib