From 7d51dd37b9f62fc9ca2fad72b5d3f90344822e01 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dingli@iscas.ac.cn>
Date: Tue, 7 May 2024 16:34:42 +0800
Subject: [PATCH] Fix errors due to wrong path in sqljet-build.xml

(cherry picked from commit ab96ad45266006a5b1985580a3907c0d78534653)
---
 sqljet-build.xml | 18 ++++++++++--------
 sqljet.spec      |  6 +++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sqljet-build.xml b/sqljet-build.xml
index d01454e..10cb376 100644
--- a/sqljet-build.xml
+++ b/sqljet-build.xml
@@ -44,13 +44,15 @@
   </target>
   <target name="antlr">
     <java classname="org.antlr.Tool" fork="true" failonerror="true">
+      <arg value="-Xconversiontimeout"/>
+      <arg value="100000"/>
       <arg value="-report"/>
       <arg value="-fo"/>
       <arg value="sqljet/src/main/antlr/org/tmatesoft/sqljet/core/internal/lang"/>
       <arg value="sqljet/src/main/antlr/org/tmatesoft/sqljet/core/internal/lang/Sql.g"/>
       <classpath>
-        <pathelement location="/usr/share/java/antlr3.jar"/>
-        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
+        <pathelement location="/usr/share/java/antlr32/antlr-3.2.jar"/>
+        <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
         <pathelement location="/usr/share/java/stringtemplate4.jar"/>
         <pathelement path="${java.class.path}"/>
       </classpath>
@@ -73,7 +75,7 @@ public class SqlParser</replacevalue>
     <javac destdir="sqljet/bin" srcdir="sqljet/src/main/java" debug="true" verbose="no">
       <compilerarg value="-O"/>
       <classpath>
-        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
+        <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
       </classpath>
     </javac>
     <javac destdir="sqljet-test/bin" srcdir="sqljet/src/test/" debug="true" verbose="no">
@@ -83,7 +85,7 @@ public class SqlParser</replacevalue>
         <fileset dir="sqljet-test/bin" includes="*.jar"/>
         <pathelement location="/usr/share/java/junit.jar"/>
         <pathelement location="/usr/share/java/easymock2.jar"/>
-        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
+        <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
       </classpath>
     </javac>
   </target>
@@ -110,11 +112,11 @@ public class SqlParser</replacevalue>
     <mkdir dir="build"/>
     <mkdir dir="build/javadoc"/>
     <path id="doc.classpath">
-      <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
+      <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
     </path>
     <javadoc destdir="build/javadoc" packagenames="org.tmatesoft.sqljet" 
 	sourcepath="sqljet/src"  verbose="no" classpathref="doc.classpath" 
-	overview="sqljet/src/overview.html" failonerror="false">
+	overview="sqljet/src/main/javadoc/overview.html" failonerror="false" additionalparam="-Xdoclint:none">
       <packageset dir="sqljet/src/main/java" defaultexcludes="yes">
         <exclude name="**/test/**"/>
       </packageset>
@@ -153,7 +155,7 @@ public class SqlParser</replacevalue>
         <fileset dir="sqljet-test/bin" includes="*.jar"/>
         <pathelement location="/usr/share/java/junit.jar"/>
         <pathelement location="/usr/share/java/easymock2.jar"/>
-        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
+        <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
       </classpath>
     </javac>
     <jar destfile="build/org.tmatesoft.sqljet_${build.number}.jar" manifest="build/osgi-manifest">
@@ -352,7 +354,7 @@ public class SqlParser</replacevalue>
       <classpath>
         <pathelement location="/usr/share/java/junit.jar"/>
         <pathelement location="/usr/share/java/easymock2.jar"/>
-        <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
+        <pathelement location="/usr/share/java/antlr32/antlr-runtime-3.2.jar"/>
       </classpath>
 
       <batchtest fork="yes" todir="sqljet-test/bin">
diff --git a/sqljet.spec b/sqljet.spec
index 92bc65f..585dbeb 100644
--- a/sqljet.spec
+++ b/sqljet.spec
@@ -1,6 +1,6 @@
 Name:                sqljet
 Version:             1.1.10
-Release:             1
+Release:             2
 Summary:             Pure Java SQLite
 License:             GPLv2
 URL:                 http://sqljet.com/
@@ -52,5 +52,9 @@ ant jars osgi javadoc pom
 %license LICENSE.txt
 
 %changelog
+* Tue May 07 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.1.10-2
+- Fix errors due to wrong path in sqljet-build.xml
+- Add -Xconversiontimeout to avoid timeout errors for riscv64.
+
 * Sat May 15 2021 baizhonggui <baizhonggui@huawei.com> - 1.1.10-1
 - package init
-- 
Gitee