PR#1: port to jflex 1.7.0 - rpms/qdox

rpms / qdox

#1 port to jflex 1.7.0

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

port to jflex 1.7.0

Fabio Valentini • 4 years ago

0510036

.gitignore

file modified

+8 -5

		`@@ -1,8 +1,11 @@`
		`- qdox-1.6.1-src.tar.gz`
		`- qdox-1.9.2-src.tar.gz`
		`- qdox-1.10.1.tar.bz2`
		`- qdox-1.11-project.tar.bz2`
		`- qdox-1.12-project.tar.bz2`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`+ /qdox-1.6.1-src.tar.gz`
		`+ /qdox-1.9.2-src.tar.gz`
		`+ /qdox-1.10.1.tar.bz2`
		`+ /qdox-1.11-project.tar.bz2`
		`+ /qdox-1.12-project.tar.bz2`
		`/qdox-1.12.1-project.tar.bz2`
		`/qdox-2.0-M2-project.tar.gz`
		`/qdox-2.0-M3-project.tar.gz`

0001-Port-to-JFlex-1.7.0.patch

file added

+39

		`@@ -0,0 +1,39 @@`
		`+ From 31f530b26bd4625ffe41aa16c48836455ef81c23 Mon Sep 17 00:00:00 2001`
		`+ From: Mikolaj Izdebski <mizdebsk@redhat.com>`
		`+ Date: Fri, 7 Jun 2019 10:39:34 +0200`
		`+ Subject: [PATCH] Port to JFlex 1.7.0`
		`+`
		`+ ---`
		`+ src/grammar/lexer.flex \| 2 +-`
		`+ .../java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java \| 2 +-`
		`+ 2 files changed, 2 insertions(+), 2 deletions(-)`
		`+`
		`+ diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex`
		`+ index 9b567ff..cd9d5b6 100644`
		`+ --- a/src/grammar/lexer.flex`
		`+ +++ b/src/grammar/lexer.flex`
		`+ @@ -168,7 +168,7 @@ import java.util.*;`
		`+ }`
		`+`
		`+ public JFlexLexer( java.io.InputStream stream, java.io.Writer writer ) {`
		`+ - this( stream );`
		`+ + this( new java.io.InputStreamReader( stream, java.nio.charset.Charset.forName( "UTF-8" ) ) );`
		`+ this.writer = writer;`
		`+ }`
		`+`
		`+ diff --git a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java`
		`+ index c947f9b..5b415c0 100644`
		`+ --- a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java`
		`+ +++ b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java`
		`+ @@ -112,7 +112,7 @@ public class ClassLoaderLibrary`
		`+ if ( sourceStream != null )`
		`+ {`
		`+ Builder builder = getModelBuilder();`
		`+ - JavaLexer lexer = new JFlexLexer( sourceStream );`
		`+ + JavaLexer lexer = new JFlexLexer( new java.io.InputStreamReader( sourceStream, java.nio.charset.Charset.forName( "UTF-8" ) ) );`
		`+ Parser parser = new Parser( lexer, builder );`
		`+ parser.setDebugLexer( debugLexer );`
		`+ parser.setDebugParser( debugParser );`
		`+ --`
		`+ 2.21.0`
		`+`

qdox.spec

file modified

+8 -3

		`@@ -3,7 +3,7 @@`
		`Summary: Extract class/interface/method definitions from sources`
		`Name: qdox`
		`Version: 2.0`
		`- Release: 5.%{vertag}%{?dist}`
		`+ Release: 6.%{vertag}%{?dist}`
		`Epoch: 0`
		`License: ASL 2.0`
		`URL: https://github.com/paul-hammant/qdox`
		`@@ -15,6 +15,7 @@`
		`# Remove bundled binaries which are possibly proprietary`
		`Source2: generate-tarball.sh`

		`+ Patch0: 0001-Port-to-JFlex-1.7.0.patch`

		`BuildRequires: maven-local`
		`BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)`
		`@@ -41,6 +42,7 @@`

		`%prep`
		`%setup -q -n %{name}-%{version}-%{vertag}`
		`+ %patch0 -p1`
		`find -name *.jar -delete`
		`rm -rf bootstrap`

		`@@ -57,8 +59,8 @@`

		`%build`
		`# Generate scanners (upstream does this with maven-jflex-plugin)`
		`- jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex`
		`- jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex`
		`+ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex`
		`+ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex`

		`# Build artifact`
		`%mvn_build -f -- -Dqdox.byaccj.executable=byaccj`
		`@@ -76,6 +78,9 @@`
		`%doc LICENSE.txt`

		`%changelog`
		`+ * Sun Aug 18 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-6.M9`
		`+ - Port to jflex 1.7.0.`
		`+`
		`* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-5.M9`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`