Buildbot: Attempt to make sure install folder is always clean for Win and OSX

1 files changed, 3 insertions, 10 deletions

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 4d7793d60c8..5e25d9f3f04 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -56,7 +56,6 @@ if 'cmake' in builder:
     chroot_name = None  # If not None command will be delegated to that chroot
     cuda_chroot_name = None  # If not None cuda compilationcommand will be delegated to that chroot
     build_cubins = True  # Whether to build Cycles CUDA kernels
-    remove_install_dir = False  # Remove installation folder before building
     bits = 64
 
     # Config file to be used (relative to blender's sources root)
@@ -70,14 +69,12 @@ if 'cmake' in builder:
     cuda_cmake_options = []
 
     if builder.startswith('mac'):
-        install_dir = None
         # Set up OSX architecture
         if builder.endswith('x86_64_10_6_cmake'):
             cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
         cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
 
     elif builder.startswith('win'):
-        install_dir = None
         if builder.startswith('win64'):
             cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"'])
         elif builder.startswith('win32'):
@@ -91,7 +88,6 @@ if 'cmake' in builder:
             deb_name = "jessie"
         elif glibc == 'glibc211':
             deb_name = "squeeze"
-        remove_install_dir = True
         cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
         cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake"
         if builder.endswith('x86_64_cmake'):
@@ -117,8 +113,7 @@ if 'cmake' in builder:
     if 'cuda' not in targets:
         cmake_options += cuda_cmake_options
 
-    if install_dir:
-        cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
+    cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
 
     cmake_options += cmake_extra_options
 
@@ -133,10 +128,8 @@ if 'cmake' in builder:
         cuda_chroot_prefix = chroot_prefix[:]
 
     # Make sure no garbage remained from the previous run
-    # (only do it if builder requested this)
-    if remove_install_dir:
-        if os.path.isdir(install_dir):
-            shutil.rmtree(install_dir)
+    if os.path.isdir(install_dir):
+        shutil.rmtree(install_dir)
 
     for target in targets:
         print("Building target %s" % (target))