Update for 0.7.0 release0.7.0

1 files changed, 13 insertions, 2 deletions

diff --git a/stage b/stage
index 68b2fde..020234f 100755
--- a/stage
+++ b/stage
@@ -186,7 +186,7 @@ case "$mode" in
    *) o=--stage ;;
 esac
 
-scripts=($(private/install/prepare "$o" "$dist_src"))
+scripts=($(private/install/prepare $o "$dist_src"))
 
 for f in "${scripts[@]}"; do
   info "prepared $f"
@@ -216,6 +216,17 @@ fi
 
 # Distribute packages, regenerate and sync the repository.
 #
+
+# These are just for testing (though libodb-mysql needs libmysqlclient).
+#
+etc/stage-pkg -c $mode -d mariadb packaging/mariadb/libmariadb
+etc/stage-pkg -c $mode -d mysql packaging/mysql/libmysqlclient
+
+etc/stage-pkg -c $mode -d cutl ../cutl/libcutl
+etc/stage-pkg -c $mode -d cli ../cli/cli
+
+#
+#
 etc/stage-pkg -c $mode -d apr packaging/apr/libapr1
 etc/stage-pkg -c $mode -d postgresql packaging/postgresql/libpq
 
@@ -229,7 +240,7 @@ etc/stage-pkg -c $mode -d studxml ../studxml/libstudxml
 
 etc/stage-pkg -c $mode -d hello hello/libhello-1.0
 
-# For now we also stage libodb-mysql since we clean up the odb/ subdirectory.
+# For now we also stage libodb-mysql.
 #
 etc/stage-pkg -c $mode -d odb \
 	      ../odb/builds/default/libodb \