[Git][java-team/antlr4][master] 4 commits: Fixed the build failure with icu4j >= 64.1
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jan 5 23:08:56 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / antlr4
Commits:
83e48aca by Emmanuel Bourg at 2021-01-05T23:10:42+01:00
Fixed the build failure with icu4j >= 64.1
- - - - -
c038f2bb by Emmanuel Bourg at 2021-01-05T23:10:56+01:00
Standards-Version updated to 4.5.1
- - - - -
177edbc5 by Emmanuel Bourg at 2021-01-05T23:11:05+01:00
Switch to debhelper level 13
- - - - -
1edd409c by Emmanuel Bourg at 2021-01-06T00:08:37+01:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/icu4j-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+antlr4 (4.7.2-3) unstable; urgency=medium
+
+ * Fixed the build failure with icu4j >= 64.1
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 06 Jan 2021 00:08:27 +0100
+
antlr4 (4.7.2-2) unstable; urgency=medium
* Added the missing dependency on libicu4j-java to antlr4
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends: antlr3-maven-plugin,
- debhelper (>= 11~),
+ debhelper-compat (= 13),
default-jdk,
default-jdk-doc,
libantlr3-runtime-java,
@@ -21,7 +21,7 @@ Build-Depends: antlr3-maven-plugin,
libtreelayout-java,
maven-debian-helper (>= 1.1),
zip
-Standards-Version: 4.1.5
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/antlr4.git
Vcs-Browser: https://salsa.debian.org/java-team/antlr4
Homepage: http://www.antlr4.org
=====================================
debian/patches/icu4j-compatibility.patch
=====================================
@@ -0,0 +1,77 @@
+Description: Split Unicode properties to resolve "code too large" error with icu4j >= 64.1
+Author: Jerry James <loganjerry at gmail.com>
+Bug: https://github.com/antlr/antlr4/pull/2739
+diff --git a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st
+index 0f22c7334d..6c275d276a 100644
+--- a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st
++++ b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st
+@@ -1,4 +1,4 @@
+-unicodedata(propertyCodePointRanges, propertyAliases) ::= <<
++unicodedata(propertyCodePointRanges, propertyAliases1, propertyAliases2) ::= <<
+ package org.antlr.v4.unicode;
+
+ import java.util.Arrays;
+@@ -15,7 +15,7 @@ import org.antlr.v4.runtime.misc.Interval;
+ */
+ public abstract class UnicodeData {
+ private static final Map\<String, IntervalSet> propertyCodePointRanges = new HashMap\<>(<length(propertyCodePointRanges)>);
+- private static final Map\<String, String> propertyAliases = new HashMap\<>(<length(propertyAliases)>);
++ private static final Map\<String, String> propertyAliases = new HashMap\<>(<length(propertyAliases1)> + <length(propertyAliases2)>);
+
+ // Work around Java 64k bytecode method limit by splitting up static
+ // initialization into one method per Unicode property
+@@ -31,14 +31,19 @@ static private void addProperty<i>() {
+ \}}; separator="\n\n">
+
+ // Property aliases
+- static private void addPropertyAliases() {
+- <propertyAliases.keys:{ k | propertyAliases.put("<k>".toLowerCase(Locale.US), "<propertyAliases.(k)>".toLowerCase(Locale.US)); }; separator="\n">
++ static private void addPropertyAliases1() {
++ <propertyAliases1.keys:{ k | propertyAliases.put("<k>".toLowerCase(Locale.US), "<propertyAliases1.(k)>".toLowerCase(Locale.US)); }; separator="\n">
++ }
++
++ static private void addPropertyAliases2() {
++ <propertyAliases2.keys:{ k | propertyAliases.put("<k>".toLowerCase(Locale.US), "<propertyAliases2.(k)>".toLowerCase(Locale.US)); }; separator="\n">
+ }
+
+ // Put it all together
+ static {
+ <propertyCodePointRanges.keys:{ k | addProperty<i>(); }; separator="\n">
+- addPropertyAliases();
++ addPropertyAliases1();
++ addPropertyAliases2();
+ }
+
+ private static String normalize(String propertyCodeOrAlias) {
+diff --git a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java
+index da244a3a85..2f02db05f4 100644
+--- a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java
++++ b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java
+@@ -78,17 +78,19 @@ private static void addPropertyAlias(
+ addTR35ExtendedPictographicPropertyCodesToCodePointRanges(propertyCodePointRanges);
+ addEmojiPresentationPropertyCodesToCodePointRanges(propertyCodePointRanges);
+
+- Map<String, String> propertyAliases = new LinkedHashMap<>();
+- addUnicodeCategoryCodesToNames(propertyAliases);
+- addUnicodeBinaryPropertyCodesToNames(propertyAliases);
+- addUnicodeScriptCodesToNames(propertyAliases);
+- addUnicodeBlocksToNames(propertyAliases);
+- addUnicodeIntPropertyCodesToNames(propertyAliases);
+- propertyAliases.put("EP", "Extended_Pictographic");
++ Map<String, String> propertyAliases1 = new LinkedHashMap<>();
++ addUnicodeCategoryCodesToNames(propertyAliases1);
++ addUnicodeBinaryPropertyCodesToNames(propertyAliases1);
++ addUnicodeScriptCodesToNames(propertyAliases1);
++ addUnicodeBlocksToNames(propertyAliases1);
++ Map<String, String> propertyAliases2 = new LinkedHashMap<>();
++ addUnicodeIntPropertyCodesToNames(propertyAliases2);
++ propertyAliases2.put("EP", "Extended_Pictographic");
+
+ Map<String, Object> properties = new LinkedHashMap<>();
+ properties.put("propertyCodePointRanges", propertyCodePointRanges);
+- properties.put("propertyAliases", propertyAliases);
++ properties.put("propertyAliases1", propertyAliases1);
++ properties.put("propertyAliases2", propertyAliases2);
+ return properties;
+ }
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
02-ignore-modules.patch
fix-unicodedata.st.patch
+icu4j-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/antlr4/-/compare/2eae2bf54624d0f5071c99d9f846ea88bb7befce...1edd409cc83f86a04ae475783d57d302e0dd87fb
--
View it on GitLab: https://salsa.debian.org/java-team/antlr4/-/compare/2eae2bf54624d0f5071c99d9f846ea88bb7befce...1edd409cc83f86a04ae475783d57d302e0dd87fb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210105/821402e5/attachment.html>
More information about the pkg-java-commits
mailing list