[openjfx] 01/01: * Don't build java docs and sources for arch-only builds.
Matthias Klose
doko at moszumanska.debian.org
Sat Oct 10 20:26:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
doko pushed a commit to branch master
in repository openjfx.
commit b6322a6b18d61c4b140a73663074b6fc5fb1dccd
Author: Matthias Klose <doko at ubuntu.com>
Date: Sat Oct 10 22:25:46 2015 +0200
* Don't build java docs and sources for arch-only builds.
---
debian/changelog | 6 ++++++
debian/gradle.properties.arch | 5 +++++
debian/rules | 12 ++++++++++++
3 files changed, 23 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8534d67..7c5e060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjfx (8u60-b27-4) UNRELEASED; urgency=medium
+
+ * Don't build java docs and sources for arch-only builds.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 10 Oct 2015 14:37:15 +0200
+
openjfx (8u60-b27-3) unstable; urgency=medium
* Kill more -m32 settings.
diff --git a/debian/gradle.properties.arch b/debian/gradle.properties.arch
new file mode 100644
index 0000000..78a5fb1
--- /dev/null
+++ b/debian/gradle.properties.arch
@@ -0,0 +1,5 @@
+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 ae28941..04445bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,12 +26,18 @@ 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 $@
override_dh_auto_build:
dh_auto_build
+ifeq ($(arch_only),yes)
+ cp debian/gradle.properties.arch gradle.properties
+else
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
@@ -47,7 +53,9 @@ override_dh_auto_build:
$(SET_JAVA_OPTS) gradle --offline --stacktrace $(gradle_debug) --refresh-dependencies --gradle-user-home .gradle
override_dh_install:
+ifneq ($(arch_only),yes)
dh_install -i
+endif
gzip -r -v -n --best build/sdk/man/
dh_install -popenjfx build/sdk/bin/* $(JAVA_HOME)/bin
@@ -55,10 +63,12 @@ override_dh_install:
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
@@ -69,7 +79,9 @@ override_dh_install:
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)
dh_install -popenjfx-source build/javafx-src.zip $(JAVA_HOME)
+endif
override_dh_auto_clean:
dh_auto_clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git
More information about the pkg-java-commits
mailing list