[gradle] 05/06: d/rules: Exclude userguidePdf since PDF compiling using xhtmlrenderer requires the headful JDK installed.

[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.

commit 304806094d4790af5ed585b0f09acf158bc324e9
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Thu Nov 10 22:44:10 2016 +0800

    d/rules: Exclude userguidePdf since PDF compiling using xhtmlrenderer requires the headful JDK installed.
---
 debian/gradle-doc.doc-base.gradle-userguide |  5 +----
 debian/rules                                | 14 ++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/gradle-doc.doc-base.gradle-userguide b/debian/gradle-doc.doc-base.gradle-userguide
index 21a1b48..7ff7572 100644
--- a/debian/gradle-doc.doc-base.gradle-userguide
+++ b/debian/gradle-doc.doc-base.gradle-userguide
@@ -5,7 +5,4 @@ Section: Programming/Java
 
 Format: HTML
 Files: /usr/share/doc/gradle/userguide/*
-Index: /usr/share/doc/gradle/userguide/userguide.html
-
-Format: PDF
-Files: /usr/share/doc/gradle/userguide.pdf.gz
\ No newline at end of file
+Index: /usr/share/doc/gradle/userguide/userguide.html
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 408205b..5b07381 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,15 @@ export GRADLE_VERSION = $(shell cat version.txt)
 # export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
 
 # Under fakeroot Gradle will show error while creating /root/.gradle, hence
-# specifies the Gradle home location
+# specifying the Gradle home location.
+# Excluding userguidePdf since PDF compiling using xhtmlrenderer requires the
+# headful JDK installed.
+# Excluding :killExistingDaemons since it runs /bin/ps which is not installed in
+# a Buildd.
 GRADLE_FLAGS = --project-prop finalRelease=true --offline --stacktrace \
-               $(patsubst %,-x :%:assemble,$(GRADLE_EXCLUDED_PROJECTS))
                --gradle-user-home debian/.gradlehome --no-daemon \
+               $(patsubst %,-x :%:assemble,$(GRADLE_EXCLUDED_PROJECTS)) \
+               -x userguidePdf -x :killExistingDaemons
 
 # Support for DEB_BUILD_OPTIONS parallel=n
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -32,8 +37,7 @@ override_dh_auto_build:
 	ln -s ../../../../subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/PackageListGenerator.java buildSrc/src/main/java/PackageListGenerator.java
 	ln -s ../../../../subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/Trie.java buildSrc/src/main/java/Trie.java
 	ln -s ../../../../subprojects/core/src/main/java/org/gradle/api/tasks/OrderSensitive.java buildSrc/src/main/java/OrderSensitive.java
-	# Excluding :killExistingDaemons since it runs /bin/ps which is not installed in a Buildd.
-	gradle $(GRADLE_TASKS) $(GRADLE_FLAGS) -x :killExistingDaemons
+	gradle $(GRADLE_TASKS) $(GRADLE_FLAGS) 
 	pandoc -s -o debian/gradle.1 debian/gradle.1.md
 
 override_dh_auto_clean:
@@ -48,8 +52,6 @@ override_dh_install:
 	# Remove lintian warning zero-byte-file-in-doc-directory
 	rm debian/gradle-doc/usr/share/doc/gradle/dsl/dsl-standalone.html
 	rm debian/gradle-doc/usr/share/doc/gradle/dsl/sidebar.js
-	mv debian/gradle-doc/usr/share/doc/gradle/userguide/userguide.pdf \
-	   debian/gradle-doc/usr/share/doc/gradle
 
 get-orig-source:
 	uscan --download-current-version --force-download --repack --compression xz

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