From b1638574f882069f08c93445e6d7ce88c44c793b Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam@megacz.com>
Date: Thu, 10 Dec 2009 10:32:50 -0800
Subject: [PATCH] make sbp an upstream subproject

---
 .gitmodules  |    3 +++
 Makefile     |   12 ++++++++----
 upstream/sbp |    1 +
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 upstream/sbp

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..85272d0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "upstream/sbp"]
+	path = upstream/sbp
+	url = http://research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp.git
diff --git a/Makefile b/Makefile
index 6307b0e..5637537 100644
--- a/Makefile
+++ b/Makefile
@@ -67,11 +67,15 @@ endif
 
 java_files = $(shell find src -name \*.java)
 ship_files = $(shell find ships -name \*.ship)
-fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
+upstream/sbp/edu.berkeley.sbp.jar:
+	git submodule init
+	git submodule update
+	cd upstream/sbp; make edu.berkeley.sbp.jar
+fleet.jar: upstream/sbp/edu.berkeley.sbp.jar $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
 	mkdir -p build/class/edu/berkeley/fleet/assembler/
 	cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
-	javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
-	cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
+	javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:upstream/sbp/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	cd build/class/; jar xf ../../upstream/sbp/edu.berkeley.sbp.jar
 	cd build/class/; jar xf ../../lib/ibex.jar
 	for A in `find ships -name \*.ship`;\
 	  do java \
@@ -80,7 +84,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
 	         edu.berkeley.fleet.Main \
 	         expand $$A;\
 	  done
-	javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+	javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}upstream/sbp/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
 	echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
 	jar cmf build/class/manifest $@ ships -C build/class .
 
diff --git a/upstream/sbp b/upstream/sbp
new file mode 160000
index 0000000..a804bff
--- /dev/null
+++ b/upstream/sbp
@@ -0,0 +1 @@
+Subproject commit a804bff254ea2ede83ba75b5235d7e3bd22a5ddb
-- 
1.7.10.4