From bb1e06575dd9401406b7bdc50a8763089128393d Mon Sep 17 00:00:00 2001
From: adamopolous <adamopolous@users.noreply.github.com>
Date: Wed, 11 Mar 2020 16:46:42 -0400
Subject: [PATCH] minor tweaks; replaced ant move with gradle copy

---
 GPL/CabExtract/build.gradle | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/GPL/CabExtract/build.gradle b/GPL/CabExtract/build.gradle
index 1c8d50c803..95b36dd4d4 100644
--- a/GPL/CabExtract/build.gradle
+++ b/GPL/CabExtract/build.gradle
@@ -22,14 +22,16 @@ project.ext.cabextract = "cabextract-1.6"
 def currentPlatform = getCurrentPlatformName()
 if (['linux64', 'osx64'].contains(currentPlatform)) {
 		
-	def makeName = "${currentPlatform}CabExtractMake" // native Make task found automatically
+	def makeName = "${currentPlatform}CabExtractMake"
 
 	task (makeName, type: Exec) {
 		group "private"
 		workingDir "build/unpack/${cabextract}"
 		executable "make"
-		inputs.file("data/${cabextract}.tar.gz")
+		
+		// Specify output so cabextract is only built if this is missing
 		outputs.file("build/os/${currentPlatform}/cabextract")
+		
 		// Extract archive and ./configure
 		doFirst {
 			copy {
@@ -45,10 +47,13 @@ if (['linux64', 'osx64'].contains(currentPlatform)) {
 				executable "./configure"
 			}
 		}
+		
 		// Move out the built cabextract and delete the extracted files
 		doLast {
-			ant.move file: "build/unpack/${cabextract}/cabextract",
-				todir: "build/os/${currentPlatform}"
+			copy {
+				from "build/unpack/${cabextract}/cabextract"
+				into "build/os/${currentPlatform}"
+			}
 			delete file("build/unpack/${cabextract}")
 		}
 	}