From 6115cbb537ca25e9d5b469fc83b427e17fdc8171 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 2 Dec 2016 15:57:37 -0800
Subject: [PATCH] Move the tarball manipulation and cleanup inside the do_build
 function, and copy the builds to a folder based on the version number.

---
 vagrant/scripts/build.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/vagrant/scripts/build.sh b/vagrant/scripts/build.sh
index abe4dc2b..e8d80b40 100755
--- a/vagrant/scripts/build.sh
+++ b/vagrant/scripts/build.sh
@@ -42,6 +42,8 @@ function do_build {
     TAG=$2
     FLAG=$3
 
+    rm -rf ~/wxPython_Phoenix-*
+
     # setup
     echo "**** do_build $TAG $FLAG ****"
     echo "Using Python from VENV $VENV"
@@ -50,6 +52,9 @@ function do_build {
     echo PYTHON: $(which python)
     echo $(python -c "import sys; print(sys.version)")
 
+    echo "Unpacking source archive..."
+    tar xzf $TARBALL
+
     # move into the source tree
     cd ~/wxPython_Phoenix-*
 
@@ -62,22 +67,19 @@ function do_build {
     # generation parts, all files should already be present
     python build.py $FLAG build_wx build_py bdist_wheel
 
-    # copy the results back to the host shared dist folder
-    mkdir -p ~/dist/$NAME/$TAG
-    mv dist/*.whl ~/dist/$NAME/$TAG
+    # copy the results back to the host's shared dist folder
+    WXPYVER=$(python -c "import buildtools; buildtools.printVersion()")
+    DEST=~/dist/linux/$WXPYVER/$NAME/$TAG
+    mkdir -p $DEST
+    mv dist/*.whl $DEST
 
     # clean up
-    python build.py clean
-    rm -rf dist build
+    cd ~
+    rm -rf ~/wxPython_Phoenix-*
     export PATH=$ORIG_PATH
 }
 
 
-# Get things started...
-rm -rf ~/wxPython_Phoenix-*
-echo "Unpacking source archive..."
-tar xzf $TARBALL
-
 
 # Do a build for each Python virtual environment in ~/venvs
 for VENV in ~/venvs/*; do
@@ -95,4 +97,3 @@ for VENV in ~/venvs/*; do
     fi
 done
 
-rm -rf ~/wxPython_Phoenix-*