Temporary rule to remove build directory if old layout in use

Refs #10870
mantidproject · Feb 15, 2015 · d0c3785 · d0c3785
1 parent 759f982
commit d0c3785
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -82,6 +82,15 @@ if [[ ${JOB_NAME} == *clean* ]]; then
   CLEANBUILD=true
   BUILDPKG=true
 fi
+
+if [[ -e $WORKSPACE/build/CMakeCache.txt ]]
+  # Temporary while the builds flick between old & new TestingTools locations
+  grep 'Code/Mantid/TestingTools/cxxtest' $WORKSPACE/build/CMakeCache.txt > /dev/null
+  if [ $? -eq 0 ]; then
+    rm -fr $WORKSPACE/build
+  fi
+fi
+
 if [[ ${JOB_NAME} == *pull_requests* ]]; then
   BUILDPKG=true
 fi

diff --git a/Code/Mantid/Build/Jenkins/buildscript.bat b/Code/Mantid/Build/Jenkins/buildscript.bat
@@ -37,6 +37,14 @@ if "%JOB_NAME%"=="%JOB_NAME:clean=%" (
   set CLEANBUILD=yes
   set BUILDPKG=yes
 )
+
+if EXIST %WORKSPACE%\build\CMakeCache.txt (
+  TYPE %WORKSPACE%\build\CMakeCache.txt | FINDSTR "Code/Mantid/TestingTools/cxxtest"
+  if %ERRORLEVEL% EQU 0 (
+    rmdir /S /Q %WORKSPACE%\build
+  )
+)
+
 if "%JOB_NAME%"=="%JOB_NAME:pull_requests=%" (
   set BUILDPKG=yes
 )