diff --git a/qdox-2.0-M9.tar.gz b/qdox-2.0-M9.tar.gz deleted file mode 100644 index 59b8076..0000000 Binary files a/qdox-2.0-M9.tar.gz and /dev/null differ diff --git a/qdox-2.0.3.tar.gz b/qdox-2.0.3.tar.gz new file mode 100644 index 0000000..343dd35 Binary files /dev/null and b/qdox-2.0.3.tar.gz differ diff --git a/qdox.spec b/qdox.spec index 1a89a40..a16a19e 100644 --- a/qdox.spec +++ b/qdox.spec @@ -2,14 +2,14 @@ %global grammar src/grammar Name: qdox -Version: 2.0 -Release: 5.M9 +Version: 2.0.3 +Release: 1 Summary: High speed and small footprint parser Epoch: 0 License: ASL 2.0 URL: https://github.com/paul-hammant/qdox BuildArch: noarch -Source0: qdox-%{version}-M9.tar.gz +Source0: https://github.com/paul-hammant/qdox/archive/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: qdox-MANIFEST.MF BuildRequires: maven-local byaccj jflex BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) @@ -30,24 +30,33 @@ Javadocs for qdox. %prep -%autosetup -n qdox-%{version}-M9 +%autosetup -n %{name}-%{name}-%{version} find -name *.jar -delete -rm -rf bootstrap + +%pom_remove_parent %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-assembly-plugin %pom_remove_plugin :maven-failsafe-plugin -%pom_remove_plugin :maven-jflex-plugin +%pom_remove_plugin :maven-invoker-plugin +%pom_remove_plugin :jflex-maven-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :exec-maven-plugin + %mvn_file : qdox %mvn_alias : qdox:qdox -%pom_xpath_set pom:workingDirectory '${basedir}/%{impl}' %build -for i in lexer commentlexer; do - jflex --inputstreamctor -d %{impl} %{grammar}/$i.flex -done + +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 + +(cd ./src/main/java/com/thoughtworks/qdox/parser/impl + byaccj -v -Jnorun -Jnoconstruct -Jclass=DefaultJavaCommentParser -Jpackage=com.thoughtworks.qdox.parser.impl ../../../../../../../grammar/commentparser.y + byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jimplements=CommentHandler -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl -Jstack=500 ../../../../../../../grammar/parser.y +) -%mvn_build -f -- -Dqdox.byaccj.executable=byaccj +%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 jar ufm target/qdox-%{version}*.jar %{SOURCE1} @@ -61,5 +70,8 @@ jar ufm target/qdox-%{version}*.jar %{SOURCE1} %doc README.md %changelog -* Mon Dec 9 2019 zhujunhao 2.0-5.M9 +* Tue Aug 22 2023 xu_ping <707078654@qq.com> 0:2.0.3-1 +- Upgrade version to 2.0.3 + +* Mon Dec 9 2019 zhujunhao 0:2.0-5.M9 - Package init