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

seamlik-guest pushed a commit to branch master
in repository gradle-1.12.

commit c4161ebcf82853acfc4ab39d171f5984a2c7b4a5
Author: Kai-Chung Yan <[email protected]>
Date:   Sun May 31 19:18:18 2015 +0800

    buildSrc must be prepared well before all Gradle operations
---
 debian/rules | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 848de73..b3e5be4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,18 +28,28 @@ override_dh_auto_build:
        # make the codes available inside buildSrc.
        cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/
 
-       # Rename the test source sets to disable the compiling of tests
-       mv buildSrc/src/test/ buildSrc/src/no-test/
+       # Disable compiling the buildSrc tests
+       mv -T buildSrc/src/test/ buildSrc/src/no-test/
 
        gradle $(GRADLE_TASKS) $(GRADLE_FLAGS)
        pod2man -c '' -r '' debian/gradle.pod > debian/gradle.1
        patch -p1 < debian/patches/90_respect_user_java_home.diff
 
+       rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/ 
buildSrc/src/main/java/
+       mv -T buildSrc/src/no-test/ buildSrc/src/test/
+
 override_dh_auto_clean:
        dh_auto_clean
+
+       # buildSrc must be prepared well before all Gradle operations
+       cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/
+       mv -T buildSrc/src/test/ buildSrc/src/no-test/
+
        gradle clean $(GRADLE_FLAGS)
-       rm -rf .gradle/ .gradlehome/ debian/gradle.1 buildSrc/.gradle/
-       rm -rf buildSrc/src/main/java
+       rm -rf debian/gradle.1
+
+       rm -rf .gradle/ .gradlehome/ buildSrc/.gradle/ buildSrc/build/ 
buildSrc/src/main/java/
+       mv -T buildSrc/src/no-test/ buildSrc/src/test/
 
 get-orig-source:
        cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \

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

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to