[gradle-debian-helper] 01/04: Find and remove the build directories when cleaning instead of calling 'gradle clean'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle-debian-helper.

commit acddb7484240e5ddc57c38fa03d94b8da4ee7e12
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 16 15:32:13 2015 +0200

    Find and remove the build directories when cleaning instead of calling 'gradle clean'
---
 debian/changelog                             |  7 +++++++
 gradle-helper-plugin/src/main/perl/gradle.pm | 17 ++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 307ec45..b22d128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gradle-debian-helper (1.1) UNRELEASED; urgency=medium
+
+  * Find and remove the build directories when cleaning instead of
+    calling 'gradle clean'.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 16 Oct 2015 15:30:30 +0200
+
 gradle-debian-helper (1.0) unstable; urgency=medium
 
   * Initial release. (Closes: #801683)
diff --git a/gradle-helper-plugin/src/main/perl/gradle.pm b/gradle-helper-plugin/src/main/perl/gradle.pm
index a5081cd..985e5b7 100644
--- a/gradle-helper-plugin/src/main/perl/gradle.pm
+++ b/gradle-helper-plugin/src/main/perl/gradle.pm
@@ -7,7 +7,6 @@ package Debian::Debhelper::Buildsystem::gradle;
 
 use strict;
 use base 'Debian::Debhelper::Buildsystem';
-use Debian::Debhelper::Dh_Lib qw(%dh doit);
 
 sub DESCRIPTION {
 	"Gradle (build.gradle)"
@@ -31,18 +30,18 @@ sub new {
 		"--refresh-dependencies",
 		"--gradle-user-home", ".gradle",
 	#	"--init-script", "/usr/share/gradle-debian-helper/init.gradle",
-		);
-	
-	# Copy the init script under .gradle/init.d to work around a bug with the --init-script parameter (GRADLE-3197)
-	$this->doit_in_builddir("mkdir", "-p", ".gradle/init.d");
-	$this->doit_in_builddir("cp", "/usr/share/gradle-debian-helper/init.gradle", ".gradle/init.d/");
-	
+		);	
+
 	return $this;
 }
 
 sub build {
 	my $this=shift;
 
+	# Copy the init script under .gradle/init.d to work around a bug with the --init-script parameter (GRADLE-3197)
+	$this->doit_in_builddir("mkdir", "-p", ".gradle/init.d");
+	$this->doit_in_builddir("cp", "/usr/share/gradle-debian-helper/init.gradle", ".gradle/init.d/");
+	
 	if (!@_) {
 		push(@_, "jar");
 	}
@@ -53,8 +52,8 @@ sub build {
 sub clean {
 	my $this=shift;
 
-	doit(@{$this->{gradle_cmd}}, "clean");
-	doit("rm", "-Rf", "$this->{cwd}/.gradle");
+	$this->doit_in_builddir("find . -wholename .*build/tmp | xargs echo | sed -e 's^build/tmp^build^g' | xargs rm -Rf");
+	$this->doit_in_builddir("rm", "-Rf", "$this->{cwd}/.gradle", "$this->{cwd}/buildSrc/.gradle");
 }
 
 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-debian-helper.git