[openjfx] 02/03: Use override_dh_*-{arch, indep} to split the arch all/any operations

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit c4e0de637ea5c50d534cbaae9721c1ae23c9cedf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 15 19:14:48 2015 +0200

    Use override_dh_*-{arch,indep} to split the arch all/any operations
---
 debian/changelog              |  1 +
 debian/gradle.properties.arch |  5 -----
 debian/rules                  | 36 +++++++++++++++---------------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70993cc..fc47ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openjfx (8u60-b27-5) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build with gradle-debian-helper
+  * Use override_dh_*-{arch,indep} to split the arch all/any operations
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 15 Oct 2015 21:56:59 +0200
 
diff --git a/debian/gradle.properties.arch b/debian/gradle.properties.arch
deleted file mode 100644
index 78a5fb1..0000000
--- a/debian/gradle.properties.arch
+++ /dev/null
@@ -1,5 +0,0 @@
-COMPILE_WEBKIT = true
-COMPILE_MEDIA = true
-BUILD_JAVADOC = false
-BUILD_SRC_ZIP = false
-GRADLE_VERSION_CHECK = false
diff --git a/debian/rules b/debian/rules
index ad93734..9428dcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,17 +21,11 @@ jvm_arch_map = \
 
 jvm_arch   := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(jvm_arch_map))))
 
-arch_only = $(shell (dh_listpackages | fgrep -q libopenjfx-java-doc) || echo yes)
-
 %:
 	dh $@ --buildsystem=gradle
 
-override_dh_auto_build:
-ifeq ($(arch_only),yes)
-	cp debian/gradle.properties.arch gradle.properties
-else
+override_dh_auto_build-arch:
 	cp debian/gradle.properties .
-endif
 
 	# replace the non-free JavaScript minifier with a noop equivalent
 	cp debian/jsmin-noop.py modules/web/src/main/native/Source/JavaScriptCore/inspector/scripts/jsmin.py
@@ -44,12 +38,13 @@ endif
 	cp modules/web/src/main/java/com/sun/webkit/dom/JSObject.java    modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/dom/
 	cp modules/web/src/main/java/com/sun/webkit/perf/PerfLogger.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/perf/
 
-	$(SET_JAVA_OPTS) dh_auto_build -- sdk
+	$(SET_JAVA_OPTS) dh_auto_build -- sdk -x javadoc -x src
 
-override_dh_install:
-ifneq ($(arch_only),yes)
-	dh_install -i
-endif
+override_dh_auto_build-indep:
+	$(SET_JAVA_OPTS) dh_auto_build -- javadoc src
+
+override_dh_install-arch:
+	dh_install -a
 
 	gzip -r -v -n --best build/sdk/man/
 	dh_install -popenjfx build/sdk/bin/* $(JAVA_HOME)/bin
@@ -57,13 +52,6 @@ endif
 	dh_link -popenjfx $(JAVA_HOME)/bin/javafxpackager           /usr/bin/javafxpackager
 	dh_link -popenjfx $(JAVA_HOME)/man/man1/javafxpackager.1.gz /usr/share/man/man1/javafxpackager.1.gz
 
-ifneq ($(arch_only),yes)
-	dh_install -plibopenjfx-java build/sdk/lib                  $(OPENJFX_HOME)
-	dh_install -plibopenjfx-java build/sdk/rt/lib/*.jar         $(OPENJFX_HOME)/jre/lib
-	dh_install -plibopenjfx-java build/sdk/rt/lib/*.properties  $(OPENJFX_HOME)/jre/lib
-	dh_install -plibopenjfx-java build/sdk/rt/lib/ext           $(OPENJFX_HOME)/jre/lib
-endif
-
 	dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/jfxswt.jar        $(JAVA_HOME)/jre/lib/jfxswt.jar
 	dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/javafx.properties $(JAVA_HOME)/jre/lib/javafx.properties
 	dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/ext/jfxrt.jar     $(JAVA_HOME)/jre/lib/ext/jfxrt.jar
@@ -73,9 +61,15 @@ endif
 	ls -l build/sdk/rt/lib
 	dh_install -plibopenjfx-jni build/sdk/rt/lib/*/*.so $(JAVA_HOME)/jre/lib/$(jvm_arch)
 
-ifneq ($(arch_only),yes)
+override_dh_install-indep:
+	dh_install -i
+
+	dh_install -plibopenjfx-java build/sdk/lib                  $(OPENJFX_HOME)
+	dh_install -plibopenjfx-java build/sdk/rt/lib/*.jar         $(OPENJFX_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/rt/lib/*.properties  $(OPENJFX_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/rt/lib/ext           $(OPENJFX_HOME)/jre/lib
+
 	dh_install -popenjfx-source build/javafx-src.zip $(JAVA_HOME)
-endif
 
 override_dh_auto_clean:
 	rm -f gradle.properties

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