[openjfx] 01/03: Fixed a build failure on slow machines by increasing the timeout for processing the ANTLR grammar

[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 4986c802a412a186693d9fb6ff0235fb3059b6cf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 19 13:49:18 2014 +0200

    Fixed a build failure on slow machines by increasing the timeout for processing the ANTLR grammar
---
 debian/changelog                          |  7 +++++++
 debian/patches/05-set-antlr-timeout.patch | 17 +++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 88c5a50..23b0d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjfx (8u20-b26-3) UNRELEASED; urgency=medium
+
+  * Fixed a build failure on slow machines by increasing the timeout
+    for processing the ANTLR grammar.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 19 Sep 2014 13:47:51 +0200
+
 openjfx (8u20-b26-2) unstable; urgency=medium
 
   * Moved the Gradle user home directory into the local directory to avoid
diff --git a/debian/patches/05-set-antlr-timeout.patch b/debian/patches/05-set-antlr-timeout.patch
new file mode 100644
index 0000000..44a396a
--- /dev/null
+++ b/debian/patches/05-set-antlr-timeout.patch
@@ -0,0 +1,17 @@
+Description: Increase the timeout for processing the ANTLR grammar. This fixes a build failure on slow machines.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+Index: openjfx-8u20-b26/buildSrc/build.gradle
+===================================================================
+--- openjfx-8u20-b26.orig/buildSrc/build.gradle
++++ openjfx-8u20-b26/buildSrc/build.gradle
+@@ -116,7 +116,7 @@ task generateGrammarSource(type: JavaExe
+     def grammars = fileTree(src).include("**/*.g")
+     main = "org.antlr.Tool"
+     classpath = configurations.antlr3
+-    args = ["-o", dest, grammars.files].flatten()
++    args = ["-Xconversiontimeout", "30000", "-o", dest, grammars.files].flatten()
+     // See RT-30955. This should be removed when JDK-8015656 is fixed
+     ignoreExitValue = true
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 4e43f59..7d82053 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-use-system-libraries.patch
 03-buildflags.patch
 04-libav-compatibility.patch
+05-set-antlr-timeout.patch

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