From ce2bc24218bbd980a9b23174c44903743d0305cb Mon Sep 17 00:00:00 2001
From: Ramin Yaghoubzadeh <ryaghoub@techfak.uni-bielefeld.de>
Date: Mon, 12 Nov 2012 16:35:50 +0100
Subject: [PATCH] new DEP

---
 DEPS.txt   |  3 +++
 resolve.sh | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 DEPS.txt

diff --git a/DEPS.txt b/DEPS.txt
new file mode 100644
index 0000000..c16656d
--- /dev/null
+++ b/DEPS.txt
@@ -0,0 +1,3 @@
+REQUIRED="rsb"
+OPTIONAL=""
+
diff --git a/resolve.sh b/resolve.sh
index ae425de..f9c2a20 100755
--- a/resolve.sh
+++ b/resolve.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-PACKAGES="rsb"
+# This file is deprecated.
+# Resolution is performed automatically in the soa script.
+
+eval "`grep '^REQUIRED=\|^OPTIONAL=' DEPS.txt`"
+REQ="$REQUIRED"
+OPT="$OPTIONAL"
 
 shopt -q nullglob || resetnullglob=1
 shopt -s nullglob
@@ -12,7 +17,8 @@ mkdir -p deps/lib
 mkdir -p deps/include
 mkdir -p deps/scripts
 mkdir -p deps/python
-for P in $PACKAGES; do
+for P in $REQ $OPT; do
+	echo "Importing from $P ..."
 	files=(../$P/dist/bin/*);
 	[ "$files" ] && cp -a ../$P/dist/bin/* deps/bin/
 	files=(../$P/dist/lib/*);
@@ -22,10 +28,11 @@ for P in $PACKAGES; do
 	files=(../$P/dist/scripts/*);
 	[ "$files" ] && cp -a ../$P/dist/scripts/* deps/scripts/
 	files=(../$P/dist/python/*.zip);
-	[ "$files" ] && for zipfile in ../$P/dist/python/*.zip; do
+	[ "$files" ] && for zipfile in ../$P/dist/python/*.zip ../$P/dist/*.py.zip; do
 		unzip -oqq $zipfile -d deps/python
 	done
 done
+echo "Done."
 
 [ "$resetdotglob" ] && shopt -u dotglob
 [ "$resetnullglob" ] && shopt -u nullglob
-- 
GitLab