!5 Fix errors due to wrong path in sqljet-build.xml

From: @DingliZhang 
Reviewed-by: @luo-haibo 
Signed-off-by: @luo-haibo
This commit is contained in:
openeuler-ci-bot 2024-05-10 17:27:52 +00:00 committed by Gitee
commit 74b2f7d9c9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 15 additions and 9 deletions

View File

@ -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">

View File

@ -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