From 2aadd55227ccf0e415f3f82e6f52a9fb7f1e64bb Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Thu, 18 Jan 2018 17:53:59 -0600
Subject: [PATCH] Change archive file names while unpacking, rather than in two
 stages

---
 com.ibm.wala.cast.js.test.data/build.gradle | 23 ++++++++-------------
 com.ibm.wala.cast.js.test/build.gradle      |  2 +-
 com.ibm.wala.core.testdata/build.gradle     | 21 ++++++++++++-------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/com.ibm.wala.cast.js.test.data/build.gradle b/com.ibm.wala.cast.js.test.data/build.gradle
index 76cd5b66c..538712810 100644
--- a/com.ibm.wala.cast.js.test.data/build.gradle
+++ b/com.ibm.wala.cast.js.test.data/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'base'
-
 task downloadAjaxslt(type: de.undercouch.gradle.tasks.download.Download) {
 	def version = '0.8.1'
 	ext {
@@ -15,16 +13,13 @@ task verifyAjaxslt(type: VerifyWithStamp, dependsOn: downloadAjaxslt) {
 	checksum 'c995abe3310a401bb4db7f28a6409756'
 }
 
-task unpackAjaxslt(type: Sync, dependsOn: verifyAjaxslt) {
-	from tarTree(verifyAjaxslt.src)
-	into temporaryDir
-}
-
-task unversionAjaxslt(type: Sync, dependsOn: unpackAjaxslt) {
-	from new File(files(unpackAjaxslt)[0], downloadAjaxslt.versionedArchive)
-	into 'examples-src/ajaxslt'
-	clean { delete unversionAjaxslt }
-}
-
-task processTestResources(dependsOn: unversionAjaxslt) {
+task unpackAjaxslt(type: Copy, dependsOn: verifyAjaxslt) {
+	from(tarTree(verifyAjaxslt.src)) {
+		eachFile {
+			def newSegments = ['ajaxslt'] + it.relativePath.segments[1 .. -1] as String[]
+			def newPath = new RelativePath(!it.directory, newSegments)
+			it.relativePath = newPath
+		}
+	}
+	into 'examples-src'
 }
diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle
index b8345c436..7eee4f639 100644
--- a/com.ibm.wala.cast.js.test/build.gradle
+++ b/com.ibm.wala.cast.js.test/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 		)
 }
 
-processTestResources.dependsOn ':com.ibm.wala.cast.js.test.data:processTestResources'
+processTestResources.dependsOn ':com.ibm.wala.cast.js.test.data:unpackAjaxslt'
 
 test {
 	maxHeapSize = '800M'
diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle
index b3472cf61..a4c7bf8ea 100644
--- a/com.ibm.wala.core.testdata/build.gradle
+++ b/com.ibm.wala.core.testdata/build.gradle
@@ -29,19 +29,24 @@ task verifyBcel(type: VerifyWithStamp, dependsOn: downloadBcel) {
 	checksum '19bffd7f217b0eae415f1ef87af2f0bc'
 }
 
-task extractBcel(type: Sync, dependsOn: verifyBcel) {
-	from tarTree(verifyBcel.src)
-	include 'bcel-5.2/bcel-5.2.jar'
-	into temporaryDir
+task extractBcel(type: Copy, dependsOn: verifyBcel) {
+	from(tarTree(verifyBcel.src)) {
+		include 'bcel-5.2/bcel-5.2.jar'
+		eachFile {
+			relativePath = new RelativePath(!directory, relativePath.lastName)
+		}
+	}
+	into projectDir
+	includeEmptyDirs false
+	outputs.files 'bcel-5.2.jar'
 }
 
-task copyBcel(type: Copy, dependsOn: extractBcel) {
-	from new File(files(extractBcel)[0], extractBcel.includes[0])
-	into projectDir
-	clean { delete 'bcel-5.2.jar' }
+task cleanExtractBcel(type: Delete) {
+	delete files(extractBcel)[0]
 }
 
 
+
 ////////////////////////////////////////////////////////////////////////
 //
 //  download "java-cup-11a.jar"