From 58d915b9d8104747b249041d3af27246ad85205f Mon Sep 17 00:00:00 2001
From: Nick Muerdter <nick.muerdter@nrel.gov>
Date: Thu, 12 May 2016 22:23:22 -0600
Subject: [PATCH] More thorough distclean.

---
 CMakeLists.txt              |  5 +----
 build/cmake/distclean.cmake | 13 +++----------
 build/scripts/distclean     | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100755 build/scripts/distclean

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4939c74e9..87cbb8c29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,10 +109,7 @@ include(${CMAKE_SOURCE_DIR}/build/cmake/package.cmake)
 # Clean Task
 #
 include(${CMAKE_SOURCE_DIR}/build/cmake/clean-download-archives.cmake)
-add_custom_target(
-  distclean
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/build/cmake/distclean.cmake
-)
+include(${CMAKE_SOURCE_DIR}/build/cmake/distclean.cmake)
 
 #
 # Outdated Dependencies Check
diff --git a/build/cmake/distclean.cmake b/build/cmake/distclean.cmake
index 61029c938..8e9030542 100644
--- a/build/cmake/distclean.cmake
+++ b/build/cmake/distclean.cmake
@@ -1,11 +1,4 @@
-FILE(REMOVE_RECURSE
-  build/package/.bundle
-  build/package/vendor
-  build/scripts/.bundle
-  build/scripts/vendor
-  build/work
-  cmake_install.cmake
-  CMakeCache.txt
-  CMakeFiles
-  test/node_modules
+add_custom_target(
+  distclean
+  COMMAND ${CMAKE_SOURCE_DIR}/build/scripts/distclean
 )
diff --git a/build/scripts/distclean b/build/scripts/distclean
new file mode 100755
index 000000000..fbc93e619
--- /dev/null
+++ b/build/scripts/distclean
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e -u -x
+
+SOURCE_DIR="$(dirname $(dirname $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)))"
+
+if [ ! -f $SOURCE_DIR/CMakeLists.txt ]; then
+  echo "Can't find root source directory"
+  exit 1
+fi
+
+rm -rf $SOURCE_DIR/CMakeCache.txt \
+  $SOURCE_DIR/CMakeFiles \
+  $SOURCE_DIR/Makefile \
+  $SOURCE_DIR/build/package/.bundle \
+  $SOURCE_DIR/build/package/vendor \
+  $SOURCE_DIR/build/scripts/.bundle \
+  $SOURCE_DIR/build/scripts/vendor \
+  $SOURCE_DIR/build/work \
+  $SOURCE_DIR/cmake_install.cmake \
+  $SOURCE_DIR/install_manifest.txt \
+  $SOURCE_DIR/src/api-umbrella/hadoop-analytics/*/dependency-reduced-pom.xml \
+  $SOURCE_DIR/src/api-umbrella/web-app/log \
+  $SOURCE_DIR/src/api-umbrella/web-app/tmp/* \
+  $SOURCE_DIR/test/config/.overrides.yml \
+  $SOURCE_DIR/test/node_modules \
+  $SOURCE_DIR/test/tmp/*