summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rwxr-xr-xstage13
-rwxr-xr-xstage-queue62
3 files changed, 42 insertions, 35 deletions
diff --git a/LICENSE b/LICENSE
index e63bcec..64e1b0c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2014-2024 the build2 authors (see the AUTHORS file).
+Copyright (c) 2014-2025 the build2 authors (see the AUTHORS file).
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/stage b/stage
index c4efdd3..0e4aec5 100755
--- a/stage
+++ b/stage
@@ -259,24 +259,29 @@ fi
# Extra packages for testing.
#
-if false; then
+if true; then
etc/stage-pkg -c $mode -d curl packaging/curl/curl/libcurl
etc/stage-pkg -c $mode -d curl packaging/curl/curl/curl
etc/stage-pkg -c $mode -d curl packaging/curl/ca-certificates-curl/libca-certificates-curl
+fi
+if false; then
etc/stage-pkg -c $mode -d icu packaging/icu/icu/libicuuc
etc/stage-pkg -c $mode -d icu packaging/icu/icu/libicui18n
etc/stage-pkg -c $mode -d icu packaging/icu/icu/libicuio
fi
etc/stage-pkg -c $mode -d zlib packaging/zlib/zlib/libz
+etc/stage-pkg -c $mode -d zstd packaging/zstd/zstd/libzstd
etc/stage-pkg -c $mode -d openssl packaging/openssl/openssl/libcrypto \
packaging/openssl/openssl/libssl \
packaging/openssl/openssl/openssl
+# Note: currently libmysqlclient is only compatible with openssl 1.1.x.
+#
#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 mysql packaging/mysql/mysql/libmysqlclient
etc/stage-pkg -c $mode -d libcutl ../cutl/libcutl
@@ -312,17 +317,19 @@ etc/stage-pkg -c $mode -d hello hello/libhello-1.0
# Note: cannot have odb-tests/odb-example since depend on mysql-client (which
# depends on libisocline which doesn't build with -Werror).
#
+# Note: cannot have libodb-mysql because don't have libmysqlclient (see above).
+#
etc/stage-pkg -c $mode -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/libodb-mysql
# ../odb/odb/odb-tests
# ../odb/odb/odb-examples
diff --git a/stage-queue b/stage-queue
index cc4f86f..04feb1e 100755
--- a/stage-queue
+++ b/stage-queue
@@ -44,20 +44,19 @@ done
# packaging/kconfig/kconfig/kconfig-conf \
# packaging/kconfig/kconfig/kconfig-qconf
-#etc/stage-pkg -Q alpha -c -d xerces-c packaging/xerces-c/xerces-c/libxerces-c
-
#etc/stage-pkg -Q alpha -c -d libcutl ../cutl/libcutl
#etc/stage-pkg -Q alpha -c -d cli ../cli/cli/cli
#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 xerces-c packaging/xerces-c/xerces-c/libxerces-c
#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 xsd ../xsd/xsd/libxsd \
+# ../xsd/xsd/libxsd-tests \
+# ../xsd/xsd/xsd \
+# ../xsd/xsd/xsd-tests \
+# ../xsd/xsd/xsd-examples \
#etc/stage-pkg -Q alpha -c -d boost packaging/boost/boost/libboost-*/
@@ -71,34 +70,35 @@ done
# 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
-
-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
+#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
+
+#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
# Standard pre-installed build system modules that cannot be fully tested in
# the stage repository due to extra dependencies.
#
-etc/stage-pkg -Q alpha -c -d build2 \
- libbuild2-qt/libbuild2-qt \
- libbuild2-qt/libbuild2-qt-tests
+#etc/stage-pkg -Q alpha -c -d build2 \
+# libbuild2-qt/libbuild2-qt \
+# libbuild2-qt/libbuild2-qt-tests
+
# Regenerate repository and publish.
#