From c5fcb8bbf8ec50068313ae0a1fe508f648799658 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 15 Oct 2021 13:34:25 +0200 Subject: Staging scripts updates for queue.stage --- stage | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'stage') diff --git a/stage b/stage index bd4cbc0..cf234df 100755 --- a/stage +++ b/stage @@ -229,6 +229,9 @@ function sync_dist () # [] --prune-empty-dirs $rsync_ops "$@" "$s/" "$d/" } +### +###if false; then + # If we are not preparing packages, publish the distribution now. Otherwise, # wait until we have prepared all the packages (which can take a considerable # time). @@ -251,8 +254,6 @@ fi # Note: $mode is either empty or -q (which implies -d). # -# These are just for testing (though libodb-mysql needs libmysqlclient). -# etc/stage-pkg -c $mode -d zlib packaging/zlib/zlib/libz etc/stage-pkg -c $mode -d openssl packaging/openssl/openssl/libcrypto @@ -268,27 +269,11 @@ etc/stage-pkg -c $mode -d cli ../cli/cli/cli etc/stage-pkg -c $mode -d cli ../cli/cli/cli-tests etc/stage-pkg -c $mode -d cli ../cli/cli/cli-examples -# These are for extra testing before the release (remember to clean up their -# directories after disabling). -# -if false; 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 - -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 - -etc/stage-pkg -c $mode -d xerces-c packaging/xerces-c/xerces-c/libxerces-c - -fi - # # 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 sqlite \ @@ -305,10 +290,6 @@ etc/stage-pkg -c $mode -d libstudxml ../studxml/libstudxml etc/stage-pkg -c $mode -d hello hello/libhello-1.0 -etc/stage-pkg -c $mode -d kconfig packaging/kconfig/kconfig/liblkc \ - packaging/kconfig/kconfig/kconfig-conf \ - packaging/kconfig/kconfig/kconfig-qconf - # For testing we also stage other libodb-*. # etc/stage-pkg -c $mode -d odb \ @@ -343,6 +324,9 @@ etc/stage-pkg -c $mode -g build2 \ libbuild2-kconfig/libbuild2-kconfig \ libbuild2-kconfig/libbuild2-kconfig-tests +###fi +### + sync_dist "$dist_src" "$dist_dst" $rsync_del if [ "$mode" != "-q" ]; then -- cgit v1.1