From 57e3dc15fa4e255943c573504c333eba79227515 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Sun, 28 Jan 2018 15:27:35 -0600
Subject: [PATCH] Trigger custom clean tasks whenever running "./gradlew clean"

A cleaned tree is now much closer to a pristine tree that has just
been checked out and never built.  The only extra created files that
are left behind are ".gradle", "buildSrc/.gradle", and
"buildSrc/build".
---
 com.ibm.wala.cast.java.test.data/build.gradle |  1 +
 com.ibm.wala.cast.js.nodejs/build.gradle      |  1 +
 com.ibm.wala.cast.js.rhino.test/build.gradle  |  7 +++++++
 com.ibm.wala.cast/build.gradle                |  1 +
 com.ibm.wala.core.testdata/build.gradle       | 11 +++++++++++
 com.ibm.wala.core.tests/build.gradle          |  6 ++++++
 com.ibm.wala.dalvik.test/build.gradle         |  2 ++
 7 files changed, 29 insertions(+)

diff --git a/com.ibm.wala.cast.java.test.data/build.gradle b/com.ibm.wala.cast.java.test.data/build.gradle
index 39bfdf30b..75fdf2b8a 100644
--- a/com.ibm.wala.cast.java.test.data/build.gradle
+++ b/com.ibm.wala.cast.java.test.data/build.gradle
@@ -25,3 +25,4 @@ task verifyJLex(type: VerifyWithStamp, dependsOn: downloadJLex) {
 }
 
 compileTestJava.dependsOn verifyJLex
+clean.dependsOn cleanDownloadJLex
diff --git a/com.ibm.wala.cast.js.nodejs/build.gradle b/com.ibm.wala.cast.js.nodejs/build.gradle
index e3f16188a..0373dad90 100644
--- a/com.ibm.wala.cast.js.nodejs/build.gradle
+++ b/com.ibm.wala.cast.js.nodejs/build.gradle
@@ -38,6 +38,7 @@ task cleanUnpackNodeJSLib(type: Delete) {
 }
 
 processResources.dependsOn unpackNodeJSLib
+clean.dependsOn cleanUnpackNodeJSLib
 
 sourceSets.main {
 	java.srcDirs = ['src']
diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle
index 5fcfcb5b2..a648b7264 100644
--- a/com.ibm.wala.cast.js.rhino.test/build.gradle
+++ b/com.ibm.wala.cast.js.rhino.test/build.gradle
@@ -24,3 +24,10 @@ test {
 	environment 'TRAVIS', 1
 	maxHeapSize = '800M'
 }
+
+task cleanTest(type: Delete) {
+	delete 'actual.dump'
+	delete 'expected.dump'
+}
+
+clean.dependsOn cleanTest
diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle
index 284f753a2..13742f949 100644
--- a/com.ibm.wala.cast/build.gradle
+++ b/com.ibm.wala.cast/build.gradle
@@ -103,3 +103,4 @@ task copyJarsIntoLib(type: Sync) {
 }
 
 assemble.dependsOn copyJarsIntoLib
+clean.dependsOn cleanCopyJarsIntoLib
diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle
index 24828ec76..05092e419 100644
--- a/com.ibm.wala.core.testdata/build.gradle
+++ b/com.ibm.wala.core.testdata/build.gradle
@@ -45,6 +45,8 @@ task cleanExtractBcel(type: Delete) {
 	delete files(extractBcel)[0]
 }
 
+clean.dependsOn cleanExtractBcel
+
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -67,6 +69,8 @@ task verifyJavaCup(type: VerifyWithStamp, dependsOn: downloadJavaCup) {
 	checksum '2bda8c40abd0cbc295d3038643d6e4ec'
 }
 
+clean.dependsOn cleanDownloadJavaCup
+
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -84,6 +88,8 @@ task cleanCollectJLex(type: Delete) {
 	delete collectJLex
 }
 
+clean.dependsOn cleanCollectJLex
+
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -123,8 +129,11 @@ task generateHelloHash(type: JavaExec, dependsOn: unpackOcamlJava) {
 
 task cleanGenerateHelloHash(type: Delete) {
 	delete generateHelloHash
+	delete fileTree('ocaml') { exclude '*.ml' }
 }
 
+clean.dependsOn cleanGenerateHelloHash
+
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -144,6 +153,8 @@ task cleanCollectTestData(type: Delete) {
 	delete collectTestData
 }
 
+clean.dependsOn cleanCollectTestData
+
 
 ////////////////////////////////////////////////////////////////////////
 //
diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle
index 3ddd2b4b7..b7412fc42 100644
--- a/com.ibm.wala.core.tests/build.gradle
+++ b/com.ibm.wala.core.tests/build.gradle
@@ -41,3 +41,9 @@ test {
 	exclude '**/GetTargetsTest.class'
 	exclude '**/PruneArrayOutOfBoundExceptionEdge.class'
 }
+
+task cleanTest(type: Delete) {
+	delete 'report'
+}
+
+clean.dependsOn cleanTest
diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle
index c42e20f15..32daa39c3 100644
--- a/com.ibm.wala.dalvik.test/build.gradle
+++ b/com.ibm.wala.dalvik.test/build.gradle
@@ -50,6 +50,8 @@ task copyDxJar(type: Sync) {
 	into 'lib'
 }
 
+clean.dependsOn cleanCopyDxJar
+
 processTestResources {
 	dependsOn cloneDroidBench
 	dependsOn copyDxJar