Update stage scripts with ODB-related changes

2 files changed, 51 insertions, 31 deletions

diff --git a/stage b/stage
index d9d3df4..2c572b3 100755
--- a/stage
+++ b/stage
@@ -275,7 +275,7 @@ etc/stage-pkg -c $mode -d openssl packaging/openssl/openssl/libcrypto \
                                   packaging/openssl/openssl/libssl \
                                   packaging/openssl/openssl/openssl
 
-etc/stage-pkg -c $mode -d mariadb packaging/mariadb/libmariadb
+#etc/stage-pkg -c $mode -d mariadb packaging/mariadb/libmariadb
 etc/stage-pkg -c $mode -d mysql packaging/mysql/mysql/libmysqlclient
 
 etc/stage-pkg -c $mode -d libcutl ../cutl/libcutl
@@ -289,7 +289,9 @@ etc/stage-pkg -c $mode -d cli ../cli/cli/cli-examples
 etc/stage-pkg -c $mode -d libapr packaging/libapr/libapr1
 etc/stage-pkg -c $mode -d libapreq packaging/libapreq/libapreq2
 
-etc/stage-pkg -c $mode -d postgresql packaging/postgresql/postgresql/libpq
+etc/stage-pkg -c $mode -d postgresql \
+	      packaging/postgresql/postgresql/libpq \
+              packaging/postgresql/postgresql/psql
 
 etc/stage-pkg -c $mode -d sqlite \
 	      packaging/sqlite/sqlite/libsqlite3 \
@@ -307,16 +309,23 @@ etc/stage-pkg -c $mode -d hello hello/libhello-1.0
 
 # For testing we also stage other libodb-*.
 #
+# Note: cannot have odb-tests/odb-example since depend on mysql-client (which
+# depends on libisocline which doesn't build with -Werror).
+#
 etc/stage-pkg -c $mode -d odb \
-	      ../odb/odb \
-	      ../odb/builds/default/libodb \
-	      ../odb/builds/default/libodb-sqlite \
-	      ../odb/builds/default/libodb-pgsql \
-	      ../odb/builds/default/libodb-mysql \
-	      ../odb/builds/default/libodb-oracle \
-	      ../odb/builds/default/libodb-mssql \
-	      ../odb/builds/default/libodb-boost \
-	      ../odb/builds/default/libodb-qt
+	      ../odb/odb/odb \
+	      ../odb/odb/libodb \
+	      ../odb/odb/libodb-sqlite \
+	      ../odb/odb/libodb-pgsql \
+	      ../odb/odb/libodb-mysql \
+	      ../odb/odb/libodb-oracle \
+	      ../odb/odb/libodb-mssql \
+	      ../odb/odb/libodb-boost \
+	      ../odb/odb/libodb-qt
+
+#	      ../odb/odb/odb-tests
+#	      ../odb/odb/odb-examples
+
 
 # Regenerate the repository (unless $mode is -q) but do not publish.
 #
diff --git a/stage-queue b/stage-queue
index a378dd7..2134bd5 100755
--- a/stage-queue
+++ b/stage-queue
@@ -52,34 +52,45 @@ done
 #etc/stage-pkg -Q alpha -c -d cli ../cli/cli/cli-tests
 #etc/stage-pkg -Q alpha -c -d cli ../cli/cli/cli-examples
 
-etc/stage-pkg -Q alpha -c -d libxsd-frontend ../xsd/libxsd-frontend/
-etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/libxsd
-etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/libxsd-tests
-etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd
-etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd-tests
-etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd-examples
+#etc/stage-pkg -Q alpha -c -d libxsd-frontend ../xsd/libxsd-frontend/
+#etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/libxsd
+#etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/libxsd-tests
+#etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd
+#etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd-tests
+#etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd-examples
 
 #etc/stage-pkg -Q alpha -c -d boost packaging/boost/boost/libboost-*/
 
-etc/stage-pkg -Q alpha -c -d libevent packaging/libevent/libevent
-
-etc/stage-pkg -Q alpha -c -d Qt5 packaging/qt5/Qt5/Qt5Moc \
-                                 packaging/qt5/Qt5/Qt5Rcc \
-                                 packaging/qt5/Qt5/Qt5Uic \
-                                 packaging/qt5/Qt5/libQt5Core \
-				 packaging/qt5/Qt5/libQt5Gui \
-				 packaging/qt5/Qt5/libQt5GuiTests \
-				 packaging/qt5/Qt5/libQt5Widgets \
-				 packaging/qt5/Qt5/libQt5WidgetsTests
+#etc/stage-pkg -Q alpha -c -d Qt5 packaging/qt5/Qt5/Qt5Moc \
+#                                 packaging/qt5/Qt5/Qt5Rcc \
+#                                 packaging/qt5/Qt5/Qt5Uic \
+#                                 packaging/qt5/Qt5/libQt5Core \
+# 				 packaging/qt5/Qt5/libQt5Gui \
+#				 packaging/qt5/Qt5/libQt5GuiTests \
+#				 packaging/qt5/Qt5/libQt5Widgets \
+#				 packaging/qt5/Qt5/libQt5WidgetsTests
 
 etc/stage-pkg -Q alpha -c -d Qt6 packaging/qt6/Qt6/Qt6Moc \
                                  packaging/qt6/Qt6/Qt6Rcc \
                                  packaging/qt6/Qt6/Qt6Uic \
                                  packaging/qt6/Qt6/libQt6Core \
-				 packaging/qt6/Qt6/libQt6Gui \
-				 packaging/qt6/Qt6/libQt6GuiTests \
-				 packaging/qt6/Qt6/libQt6Widgets \
-				 packaging/qt6/Qt6/libQt6WidgetsTests
+                                 packaging/qt6/Qt6/libQt6Gui \
+                                 packaging/qt6/Qt6/libQt6GuiTests \
+                                 packaging/qt6/Qt6/libQt6Widgets \
+                                 packaging/qt6/Qt6/libQt6WidgetsTests
+
+etc/stage-pkg -Q alpha -c -d odb \
+	      ../odb/odb/odb \
+	      ../odb/odb/libodb \
+	      ../odb/odb/libodb-sqlite \
+	      ../odb/odb/libodb-pgsql \
+	      ../odb/odb/libodb-mysql \
+	      ../odb/odb/libodb-oracle \
+	      ../odb/odb/libodb-mssql \
+	      ../odb/odb/libodb-boost \
+	      ../odb/odb/libodb-qt \
+	      ../odb/odb/odb-tests \
+	      ../odb/odb/odb-examples
 
 # Regenerate repository and publish.
 #