From 7b35940528c2a79a5439399b492172a23e29bed2 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 7 Feb 2017 13:03:34 -0800
Subject: [PATCH] Change directory structure for the linux snapshot builds.

Fixes #224
---
 build.py                 | 19 +++++++++++--------
 vagrant/scripts/build.sh |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build.py b/build.py
index 2f001d3f..470ffbe7 100755
--- a/build.py
+++ b/build.py
@@ -715,14 +715,17 @@ def uploadTree(srcPath, destPath, options, keep=5):
     allDirs = allDirs.strip().split('\n')
     allDirs.sort()
 
-    # Leave the last keep number of builds, including this new one, on the server.
-    # Delete the rest.
-    rmDirs = allDirs[:-keep]
-    for rmDir in rmDirs:
-        rmDir = opj(uploadDir, rmDir)
-        msg("Cleaning old build {}".format(rmDir))
-        cmd = 'ssh {} "rm -r {}"'.format(host, rmDir)
-        runcmd(cmd)
+    # TODO: Change this to clean out just the leaf folders rather than
+    # removing whole trees.
+
+    # # Leave the last keep number of builds, including this new one, on the server.
+    # # Delete the rest.
+    # rmDirs = allDirs[:-keep]
+    # for rmDir in rmDirs:
+    #     rmDir = opj(uploadDir, rmDir)
+    #     msg("Cleaning old build {}".format(rmDir))
+    #     cmd = 'ssh {} "rm -r {}"'.format(host, rmDir)
+    #     runcmd(cmd)
 
     msg("Upload complete!")
 
diff --git a/vagrant/scripts/build.sh b/vagrant/scripts/build.sh
index 5575fe5b..1ef371fd 100755
--- a/vagrant/scripts/build.sh
+++ b/vagrant/scripts/build.sh
@@ -69,7 +69,7 @@ function do_build {
 
     # copy the results back to the host's shared dist folder
     WXPYVER=$(python -c "import buildtools; buildtools.printVersion()")
-    DEST=~/dist/linux/$WXPYVER/$NAME/$TAG
+    DEST=~/dist/linux/$TAG/$NAME
     mkdir -p $DEST
     mv dist/*.whl $DEST