[gradle-1.12] 107/211: debian/rules: Clean up

[Kai-Chung Yan]

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 3a11d9e7975a986a3f7037ed92c2dd473840923a
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sun May 24 05:44:39 2015 +0800

    debian/rules: Clean up
---
 debian/rules | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4b5fa93..2319ea5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/')
-UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/~m/-milestone-/')
-PLUGINS_JARS := announce antlr build-comparison code-quality cpp diagnostics ear ide ivy javascript jetty maven osgi plugins publish reporting scala signing
+UPSTREAM_VERSION := $(shell cat version.txt)
+PLUGINS_LIST := announce antlr build-comparison code-quality cpp diagnostics ear ide ivy javascript jetty language-base language-jvm maven native osgi plugins publish reporting signing
 export JAVA_HOME=/usr/lib/jvm/default-java
 export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m
-export GRADLE_USER_HOME=$(CURDIR)/.gradlehome
 # Only for debug purpose
 # export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
 DEB_GRADLE_OPTS := --project-prop finalRelease=true --stacktrace --offline
@@ -17,12 +16,11 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 %:
-	dh $@ --with javahelper
+	dh $@ --with javahelper,quilt
 
 override_dh_auto_build:
 	find /usr/share/gradle -type l ! -exec test -r {} \; -print
-	mkdir $(CURDIR)/.gradlehome
-	gradle $(DEB_GRADLE_OPTS) assemble
+	gradle $(DEB_GRADLE_OPTS) assemble --gradle-user-home ./.gradlehome
 	unzip -q -n build/distributions/gradle-*-bin.zip -d build/distributions/bin
 	unzip -q -n build/distributions/gradle-*-all.zip -d build/distributions/all
 	pod2man -c '' -r '' debian/gradle.pod > build/gradle.1
@@ -30,20 +28,20 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	-gradle $(DEB_GRADLE_OPTS) clean
-	-rm -rf .gradle buildSrc/.gradle buildSrc/build $(CURDIR)/.gradlehome build
+	gradle $(DEB_GRADLE_OPTS) clean --gradle-user-home ./.gradlehome
+	rm -rf .gradle buildSrc/.gradle buildSrc/build ./.gradlehome build
 
 override_dh_link:
 	dh_link
 	# plugins symlinks
-	for j in $(PLUGINS_JARS); do \
+	for j in $(PLUGINS_LIST); do \
 		dh_link -plibgradle-plugins-java usr/share/java/gradle-$$j.jar \
 		usr/share/gradle/lib/plugins/gradle-$$j-$(VERSION).jar; \
 	done ;
 	dh_link -plibgradle-core-java usr/share/java/gradle-core-impl.jar \
 		usr/share/gradle/lib/plugins/gradle-core-impl-$(VERSION).jar
 	dh_link -plibgradle-core-java usr/share/java/gradle-wrapper.jar \
-		usr/share/gradle/lib/gradle-wrapper-$(VERSION).jar
+		usr/share/gradle/lib/gradle-wrapp--gradle-user-home ./.gradlehomeer-$(VERSION).jar
 	dh_link -pgradle usr/share/java/gradle-core.jar \
 		usr/share/gradle/lib/gradle-core-$(VERSION).jar
 

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