Call install script preparation from stage

1 files changed, 18 insertions, 2 deletions

diff --git a/stage b/stage
index d6fc7fa..d4b5272 100755
--- a/stage
+++ b/stage
@@ -7,10 +7,11 @@
 # -o
 #    Only package baseutils/mingw.
 # -q
-#    Put packages into the queue instead of staging.
+#    Put packages into the queue instead of staging. Used to update for
+#    queue.
 # -p
 #    Regenerate build2-toolchain into queue's 0/ and update the checksums file
-#    but don't do anything else.
+#    but don't do anything else. Used to update for public.
 #
 usage="usage: etc/stage"
 
@@ -118,6 +119,9 @@ if [ "$only" = true ]; then
   exit 0
 fi
 
+##
+##if false; then
+
 mkdir -p /tmp/dist
 
 # Dist build2-toolchain.
@@ -156,6 +160,15 @@ checksum_line "build2-mingw-$v-x86_64-windows.tar.xz"
 #checksum_line "build2-baseutils-$v-i686-windows.zip"
 #checksum_line "build2-mingw-$v-i686-windows.tar.xz"
 
+# Prepare install script/batch files.
+#
+case "$mode" in
+  -q) o=--queue ;;
+  -p) o=        ;;
+   *) o=--stage ;;
+esac
+private/install/prepare "$o" "$dist_src"
+
 if [ "$mode" = "-p" ]; then
   exit 0
 fi
@@ -170,6 +183,9 @@ read
 rsync -v -rlpt -c --copy-unsafe-links --prune-empty-dirs --delete-after \
   $rsync_ops "$dist_src/" "$dist_dst/"
 
+##fi
+##
+
 # Distribute packages, regenerate and sync the repository.
 #
 etc/stage-pkg -c $mode -d apr packaging/apr/libapr1