The package rpms/antlr4-project.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/antlr4-project.git/commit/?id=899526....
Change: -%ifarch %{arm}
Thanks.
Full change: ============
commit 899526a7ff292a35156c4dab9ea29d47fa0a0991 Author: Jerry James loganjerry@gmail.com Date: Thu Jul 23 13:58:38 2020 -0600
Fix cmake and javadoc issues.
diff --git a/antlr4-javadoc.patch b/antlr4-javadoc.patch new file mode 100644 index 0000000..613c4ac --- /dev/null +++ b/antlr4-javadoc.patch @@ -0,0 +1,163 @@ +--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/MojoUtils.java ++++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/MojoUtils.java +@@ -55,7 +55,7 @@ class MojoUtils { + * directory and reflect the input organization of the grammar files. + * + * @param sourceDirectory The source directory {@link File} object +- * @param grammarFileName The full path to the input grammar file ++ * @param grammarFile The full path to the input grammar file + * + * @return The path to the grammar file relative to the source directory + */ +--- a/runtime/Java/src/org/antlr/v4/runtime/atn/CodePointTransitions.java ++++ b/runtime/Java/src/org/antlr/v4/runtime/atn/CodePointTransitions.java +@@ -13,14 +13,14 @@ import org.antlr.v4.runtime.misc.Interva + * and {@link SetTransition} appropriately based on the range of the input. + * + * To keep the serialized ATN size small, we only inline atom and +- * range transitions for Unicode code points <= U+FFFF. ++ * range transitions for Unicode code points ≤ U+FFFF. + * +- * Whenever we encounter a Unicode code point > U+FFFF, we represent that ++ * Whenever we encounter a Unicode code point > U+FFFF, we represent that + * as a set transition (even if it is logically an atom or a range). + */ + public abstract class CodePointTransitions { + /** +- * If {@code codePoint} is <= U+FFFF, returns a new {@link AtomTransition}. ++ * If {@code codePoint} is ≤ U+FFFF, returns a new {@link AtomTransition}. + * Otherwise, returns a new {@link SetTransition}. + */ + public static Transition createWithCodePoint(ATNState target, int codePoint) { +@@ -34,7 +34,7 @@ public abstract class CodePointTransitio + + /** + * If {@code codePointFrom} and {@code codePointTo} are both +- * <= U+FFFF, returns a new {@link RangeTransition}. ++ * ≤ U+FFFF, returns a new {@link RangeTransition}. + * Otherwise, returns a new {@link SetTransition}. + */ + public static Transition createWithCodePointRange( +--- a/runtime/Java/src/org/antlr/v4/runtime/CharStreams.java ++++ b/runtime/Java/src/org/antlr/v4/runtime/CharStreams.java +@@ -24,7 +24,7 @@ import java.nio.file.Paths; + + /** This class represents the primary interface for creating {@link CharStream}s + * from a variety of sources as of 4.7. The motivation was to support +- * Unicode code points > U+FFFF. {@link ANTLRInputStream} and ++ * Unicode code points > U+FFFF. {@link ANTLRInputStream} and + * {@link ANTLRFileStream} are now deprecated in favor of the streams created + * by this interface. + * +--- a/runtime/Java/src/org/antlr/v4/runtime/CodePointCharStream.java ++++ b/runtime/Java/src/org/antlr/v4/runtime/CodePointCharStream.java +@@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets + * code units. + * + * Use this if you need to parse input which potentially contains +- * Unicode values > U+FFFF. ++ * Unicode values > U+FFFF. + */ + public abstract class CodePointCharStream implements CharStream { + protected final int size; +--- a/runtime/Java/src/org/antlr/v4/runtime/ParserInterpreter.java ++++ b/runtime/Java/src/org/antlr/v4/runtime/ParserInterpreter.java +@@ -69,7 +69,7 @@ public class ParserInterpreter extends P + protected final Deque<Pair<ParserRuleContext, Integer>> _parentContextStack = + new ArrayDeque<Pair<ParserRuleContext, Integer>>(); + +- /** We need a map from (decision,inputIndex)->forced alt for computing ambiguous ++ /** We need a map from (decision,inputIndex)→forced alt for computing ambiguous + * parse trees. For now, we allow exactly one override. + */ + protected int overrideDecision = -1; +--- a/runtime/Java/src/org/antlr/v4/runtime/RuleContext.java ++++ b/runtime/Java/src/org/antlr/v4/runtime/RuleContext.java +@@ -31,10 +31,10 @@ import java.util.List; + * Parser._ctx. + * + * public final SContext s() throws RecognitionException { +- * SContext _localctx = new SContext(_ctx, getState()); <-- create new node +- * enterRule(_localctx, 0, RULE_s); <-- push it ++ * SContext _localctx = new SContext(_ctx, getState()); ← create new node ++ * enterRule(_localctx, 0, RULE_s); ← push it + * ... +- * exitRule(); <-- pop back to _localctx ++ * exitRule(); ← pop back to _localctx + * return _localctx; + * } + * +@@ -48,9 +48,9 @@ import java.util.List; + * symbol s then call r1, which calls r2, the would look like + * this: + * +- * SContext[-1] <- root node (bottom of the stack) +- * R1Context[p] <- p in rule s called r1 +- * R2Context[q] <- q in rule r1 called r2 ++ * SContext[-1] ← root node (bottom of the stack) ++ * R1Context[p] ← p in rule s called r1 ++ * R2Context[q] ← q in rule r1 called r2 + * + * So the top of the stack, _ctx, represents a call to the current + * rule and it holds the return address from another rule that invoke +@@ -163,7 +163,7 @@ public class RuleContext implements Rule + */ + public void setAltNumber(int altNumber) { } + +- /** @since 4.7. {@see ParseTree#setParent} comment */ ++ /** @since 4.7. @see ParseTree#setParent comment */ + @Override + public void setParent(RuleContext parent) { + this.parent = parent; +--- a/runtime/Java/src/org/antlr/v4/runtime/tree/ParseTreeListener.java ++++ b/runtime/Java/src/org/antlr/v4/runtime/tree/ParseTreeListener.java +@@ -12,7 +12,7 @@ import org.antlr.v4.runtime.ParserRuleCo + * by {@link ParseTreeWalker}. E.g., + * + * ParseTreeWalker walker = new ParseTreeWalker(); +- * walker.walk(myParseTreeListener, myParseTree); <-- triggers events in your listener ++ * walker.walk(myParseTreeListener, myParseTree); ← triggers events in your listener + * + * If you want to trigger events in multiple listeners during a single + * tree walk, you can use the ParseTreeDispatcher object available at +--- a/tool/src/org/antlr/v4/semantics/SymbolChecks.java ++++ b/tool/src/org/antlr/v4/semantics/SymbolChecks.java +@@ -373,7 +373,8 @@ public class SymbolChecks { + } + + /** +- * {@return} list of simple string literals for rule {@param rule} ++ * @param rule the rule ++ * @return list of simple string literals for the rule + */ + private List<String> getSingleTokenValues(Rule rule) + { +--- a/tool/src/org/antlr/v4/tool/ErrorType.java ++++ b/tool/src/org/antlr/v4/tool/ErrorType.java +@@ -996,7 +996,7 @@ public enum ErrorType { + * + * <p><em>name</em> is not a recognized token name</p> + * +- * <pre>TOKEN: 'a' -> type(CHANNEL1); // error 175</pre> ++ * <pre>TOKEN: 'a' → type(CHANNEL1); // error 175</pre> + */ + CONSTANT_VALUE_IS_NOT_A_RECOGNIZED_TOKEN_NAME(175, "<arg> is not a recognized token name", ErrorSeverity.ERROR), + /** +@@ -1004,7 +1004,7 @@ public enum ErrorType { + * + * <p><em>name</em>is not a recognized mode name</p> + * +- * <pre>TOKEN: 'a' -> mode(MODE1); // error 176</pre> ++ * <pre>TOKEN: 'a' → mode(MODE1); // error 176</pre> + */ + CONSTANT_VALUE_IS_NOT_A_RECOGNIZED_MODE_NAME(176, "<arg> is not a recognized mode name", ErrorSeverity.ERROR), + /** +@@ -1012,7 +1012,7 @@ public enum ErrorType { + * + * <p><em>name</em> is not a recognized channel name</p> + * +- * <pre>TOKEN: 'a' -> channel(TOKEN1); // error 177</pre> ++ * <pre>TOKEN: 'a' → channel(TOKEN1); // error 177</pre> + */ + CONSTANT_VALUE_IS_NOT_A_RECOGNIZED_CHANNEL_NAME(177, "<arg> is not a recognized channel name", ErrorSeverity.ERROR), + /* diff --git a/antlr4-project.spec b/antlr4-project.spec index 1ed1725..985304b 100644 --- a/antlr4-project.spec +++ b/antlr4-project.spec @@ -11,7 +11,7 @@
Name: antlr4-project Version: 4.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parser generator (ANother Tool for Language Recognition)
License: BSD @@ -23,6 +23,8 @@ Patch0: antlr4-unicode-properties.patch # Fix mono errors due to ambiguous references # Upstream is not yet ready to move to newer mono versions. Patch1: antlr4-mono-ambiguous.patch +# Fix some javadoc problems +Patch2: antlr4-javadoc.patch
BuildRequires: cmake BuildRequires: gcc-c++ @@ -49,11 +51,6 @@ BuildRequires: pkgconfig(uuid) BuildRequires: python3-devel BuildRequires: python3dist(setuptools)
-%ifarch %{arm} -# Speed up builds on 32bit arm -BuildRequires: java-1.8.0-openjdk-aarch32-devel -%endif - %global _desc %{expand: ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured @@ -249,7 +246,7 @@ export JAVA_HOME=%{_jvmdir}/java # Build the C++ runtime cd runtime/Cpp %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . -%make_build +%cmake_build cd -
# Build the Mono runtime @@ -289,8 +286,10 @@ fi %jpackage_script org.antlr.v4.Tool "" "" antlr4/antlr4:antlr3-runtime:antlr4/antlr4-runtime:stringtemplate4:treelayout antlr4 true
# Install the C++ runtime -%make_install -C runtime/Cpp +cd runtime/Cpp +%cmake_install rm -f %{buildroot}%{_libdir}/libantlr4-runtime.a +cd -
# Install the Go runtime %ifarch %go_arches @@ -402,6 +401,9 @@ rm -fr %{buildroot}%{_docdir}/libantlr4 %endif
%changelog +* Thu Jul 23 2020 Jerry James loganjerry@gmail.com - 4.8-4 +- Fix cmake and javadoc issues + * Tue Jul 21 2020 Mat Booth mat.booth@redhat.com - 4.8-3 - Allow building against JDK 11
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org